LU-3289 gss: Add Shared key and GSS Null functionality

[fs/lustre-release.git] / lustre / include / lustre_sec.h

diff --git a/lustre/include/lustre_sec.h b/lustre/include/lustre_sec.h
index 11a1b41..524421e 100644 (file)
--- a/lustre/include/lustre_sec.h
+++ b/lustre/include/lustre_sec.h
@@ -237,7 +237,7 @@ enum sptlrpc_bulk_service {
                  SPTLRPC_MECH_GSS_SK,                  \
                  SPTLRPC_SVC_INTG,                     \
                  SPTLRPC_BULK_DEFAULT,                 \
-                 SPTLRPC_BULK_SVC_PRIV)
+                 SPTLRPC_BULK_SVC_INTG)
 #define SPTLRPC_FLVR_SKPI                               \
        MAKE_FLVR(SPTLRPC_POLICY_GSS,                   \
                  SPTLRPC_MECH_GSS_SK,                  \
@@ -865,6 +865,20 @@ struct ptlrpc_sec {
        cfs_time_t                      ps_gc_next;     /* in seconds */
 };
 
+static inline int flvr_is_rootonly(__u32 flavor)
+{
+       return (SPTLRPC_FLVR_POLICY(flavor) == SPTLRPC_POLICY_GSS &&
+               (SPTLRPC_FLVR_MECH(flavor) == SPTLRPC_MECH_GSS_NULL ||
+                SPTLRPC_FLVR_MECH(flavor) == SPTLRPC_MECH_GSS_SK));
+}
+
+static inline int flvr_allows_user_desc(__u32 flavor)
+{
+       return (SPTLRPC_FLVR_POLICY(flavor) == SPTLRPC_POLICY_GSS &&
+               (SPTLRPC_FLVR_MECH(flavor) == SPTLRPC_MECH_GSS_NULL ||
+                SPTLRPC_FLVR_MECH(flavor) == SPTLRPC_MECH_GSS_SK));
+}
+
 static inline int sec_is_reverse(struct ptlrpc_sec *sec)
 {
         return (sec->ps_flvr.sf_flags & PTLRPC_SEC_FL_REVERSE);