Kill SPKM3: Remove spkm3 support from nfs.mount
authorSimo Sorce <simo@redhat.com>
Mon, 12 Mar 2012 19:48:50 +0000 (15:48 -0400)
committerSteve Dickson <steved@redhat.com>
Mon, 12 Mar 2012 19:56:07 +0000 (15:56 -0400)
Signed-off-by: Simo Sorce <simo@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
utils/mount/nfs.man
utils/mount/nfs_mount.h
utils/mount/nfsmount.c

index 2ad92d1..810bfc0 100644 (file)
@@ -375,11 +375,8 @@ Valid security flavors are
 .BR krb5p ,
 .BR lkey ,
 .BR lkeyi ,
-.BR lkeyp ,
-.BR spkm ,
-.BR spkmi ,
 and
-.BR spkmp .
+.BR lkeyp ,
 Refer to the SECURITY CONSIDERATIONS section for details.
 .TP 1.5i
 .BR sharecache " / " nosharecache
@@ -1416,7 +1413,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 and SPKM3)
+Similar support for other forms of cryptographic security (such as lipkey)
 is also available.
 .P
 The NFS version 4 protocol allows
index 2becfb1..ec30c9b 100644 (file)
@@ -75,9 +75,6 @@ struct nfs_mount_data {
 #define AUTH_GSS_LKEY          390006
 #define AUTH_GSS_LKEYI         390007
 #define AUTH_GSS_LKEYP         390008
-#define AUTH_GSS_SPKM          390009
-#define AUTH_GSS_SPKMI         390010
-#define AUTH_GSS_SPKMP         390011
 #endif
 
 int    nfsmount(const char *, const char *, int , char **, int, int);
index 1298fe4..7bd1c97 100644 (file)
@@ -300,12 +300,6 @@ parse_options(char *old_opts, struct nfs_mount_data *data,
                                        data->pseudoflavor = AUTH_GSS_LKEYI;
                                else if (!strcmp(secflavor, "lipkey-p"))
                                        data->pseudoflavor = AUTH_GSS_LKEYP;
-                               else if (!strcmp(secflavor, "spkm3"))
-                                       data->pseudoflavor = AUTH_GSS_SPKM;
-                               else if (!strcmp(secflavor, "spkm3i"))
-                                       data->pseudoflavor = AUTH_GSS_SPKMI;
-                               else if (!strcmp(secflavor, "spkm3p"))
-                                       data->pseudoflavor = AUTH_GSS_SPKMP;
                                else if (sloppy)
                                        continue;
                                else {