LU-3289 gss: Add two additional security flavors for sk

[fs/lustre-release.git] / lustre / ptlrpc / sec.c

diff --git a/lustre/ptlrpc/sec.c b/lustre/ptlrpc/sec.c
index 828a161..a4289d3 100644 (file)
--- a/lustre/ptlrpc/sec.c
+++ b/lustre/ptlrpc/sec.c
@@ -171,6 +171,10 @@ __u32 sptlrpc_name2flavor_base(const char *name)
                 return SPTLRPC_FLVR_KRB5I;
         if (!strcmp(name, "krb5p"))
                 return SPTLRPC_FLVR_KRB5P;
                 return SPTLRPC_FLVR_KRB5I;
         if (!strcmp(name, "krb5p"))
                 return SPTLRPC_FLVR_KRB5P;

+       if (!strcmp(name, "skn"))
+               return SPTLRPC_FLVR_SKN;
+       if (!strcmp(name, "ska"))
+               return SPTLRPC_FLVR_SKA;

        if (!strcmp(name, "ski"))
                return SPTLRPC_FLVR_SKI;
        if (!strcmp(name, "skpi"))
        if (!strcmp(name, "ski"))
                return SPTLRPC_FLVR_SKI;
        if (!strcmp(name, "skpi"))


@@ -198,6 +202,10 @@ const char *sptlrpc_flavor2name_base(__u32 flvr)
                 return "krb5i";
         else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5P))
                 return "krb5p";
                 return "krb5i";
         else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_KRB5P))
                 return "krb5p";

+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKN))
+               return "skn";
+       else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKA))
+               return "ska";

        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKI))
                return "ski";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKPI))
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKI))
                return "ski";
        else if (base == SPTLRPC_FLVR_BASE(SPTLRPC_FLVR_SKPI))