Kill SPKM3: Remove also the dependent lipkey mechanism
authorSimo Sorce <simo@redhat.com>
Mon, 12 Mar 2012 21:06:41 +0000 (17:06 -0400)
committerSteve Dickson <steved@redhat.com>
Mon, 12 Mar 2012 21:09:41 +0000 (17:09 -0400)
Signed-off-by: Simo Sorce <simo@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
support/nfs/exports.c
utils/gssd/svcgssd_mech2file.c
utils/mount/nfs.man
utils/mount/nfsmount.c

index 6e7ed69..84a2b08 100644 (file)
@@ -39,9 +39,6 @@ struct flav_info flav_map[] = {
        { "krb5",       RPC_AUTH_GSS_KRB5       },
        { "krb5i",      RPC_AUTH_GSS_KRB5I      },
        { "krb5p",      RPC_AUTH_GSS_KRB5P      },
-       { "lipkey",     RPC_AUTH_GSS_LKEY       },
-       { "lipkey-i",   RPC_AUTH_GSS_LKEYI      },
-       { "lipkey-p",   RPC_AUTH_GSS_LKEYP      },
        { "unix",       AUTH_UNIX               },
        { "sys",        AUTH_SYS                },
        { "null",       AUTH_NULL               },
index a3177f6..ecd908b 100644 (file)
@@ -53,7 +53,6 @@ struct mech2file {
 
 struct mech2file m2f[] = {
        {{9, "\052\206\110\206\367\022\001\002\002"}, "krb5"},
-       {{7, "\053\006\001\005\005\001\009"}, "lipkey"},
        {{0,0},""},
 };
 
index 810bfc0..0d20cf0 100644 (file)
@@ -372,11 +372,8 @@ Valid security flavors are
 .BR sys ,
 .BR krb5 ,
 .BR krb5i ,
-.BR krb5p ,
-.BR lkey ,
-.BR lkeyi ,
 and
-.BR lkeyp ,
+.BR krb5p ,
 Refer to the SECURITY CONSIDERATIONS section for details.
 .TP 1.5i
 .BR sharecache " / " nosharecache
@@ -1413,7 +1410,7 @@ security flavor encrypts every RPC request
 to prevent data exposure during network transit; however,
 expect some performance impact
 when using integrity checking or encryption.
-Similar support for other forms of cryptographic security (such as lipkey)
+Similar support for other forms of cryptographic security
 is also available.
 .P
 The NFS version 4 protocol allows
index 7bd1c97..930622d 100644 (file)
@@ -294,12 +294,6 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                        data->pseudoflavor = AUTH_GSS_KRB5I;
                                else if (!strcmp(secflavor, "krb5p"))
                                        data->pseudoflavor = AUTH_GSS_KRB5P;
-                               else if (!strcmp(secflavor, "lipkey"))
-                                       data->pseudoflavor = AUTH_GSS_LKEY;
-                               else if (!strcmp(secflavor, "lipkey-i"))
-                                       data->pseudoflavor = AUTH_GSS_LKEYI;
-                               else if (!strcmp(secflavor, "lipkey-p"))
-                                       data->pseudoflavor = AUTH_GSS_LKEYP;
                                else if (sloppy)
                                        continue;
                                else {