Configuration: simplify configuration options. Automatically select RPCSEC_GSS

      if NFSv4 is selected. Remove need for user to select SUNRPC_GSS, and the
      crypto options.
      Make NFSv3 a recommended option.

diff --git a/fs/Kconfig b/fs/Kconfig
index c15342186b59f9c4cbb969eb4d1dd423513a82f3..eb14422c9769c2fec88d2bfe663d742e8d3533be 100644 (file)
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1305,15 +1305,18 @@ config NFS_V3
          Say Y here if you want your NFS client to be able to speak the newer
          version 3 of the NFS protocol.
 
-         If unsure, say N.
+         If unsure, say Y.
 
 config NFS_V4
        bool "Provide NFSv4 client support (EXPERIMENTAL)"
        depends on NFS_FS && EXPERIMENTAL
+       select RPCSEC_GSS_KRB5
        help
          Say Y here if you want your NFS client to be able to speak the newer
-         version 4 of the NFS protocol.  This feature is experimental, and
-         should only be used if you are interested in helping to test NFSv4.
+         version 4 of the NFS protocol.
+
+         Note: Requires auxiliary userspace daemons which may be found on
+               http://www.citi.umich.edu/projects/nfsv4/
 
          If unsure, say N.
 
@@ -1422,28 +1425,24 @@ config SUNRPC
        tristate
 
 config SUNRPC_GSS
-       tristate "Provide RPCSEC_GSS authentication (EXPERIMENTAL)"
+       tristate
+
+config RPCSEC_GSS_KRB5
+       tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
        depends on SUNRPC && EXPERIMENTAL
-       default SUNRPC if NFS_V4=y
+       select SUNRPC_GSS
+       select CRYPTO
+       select CRYPTO_MD5
+       select CRYPTO_DES
        help
-         Provides cryptographic authentication for NFS rpc requests.  To
-         make this useful, you must also select at least one rpcsec_gss
-         mechanism.
-         Note: You should always select this option if you wish to use
+         Provides for secure RPC calls by means of a gss-api
+         mechanism based on Kerberos V5. This is required for
          NFSv4.
 
-config RPCSEC_GSS_KRB5
-       tristate "Kerberos V mechanism for RPCSEC_GSS (EXPERIMENTAL)"
-       depends on SUNRPC_GSS && CRYPTO_DES && CRYPTO_MD5
-       default SUNRPC_GSS if NFS_V4=y
-       help
-         Provides a gss-api mechanism based on Kerberos V5 (this is
-         mandatory for RFC3010-compliant NFSv4 implementations).
-         Requires a userspace daemon;
-               see http://www.citi.umich.edu/projects/nfsv4/.
+         Note: Requires an auxiliary userspace daemon which may be found on
+               http://www.citi.umich.edu/projects/nfsv4/
 
-         Note: If you select this option, please ensure that you also
-         enable the MD5 and DES crypto ciphers.
+         If unsure, say N.
 
 config SMB_FS
        tristate "SMB file system support (to mount Windows shares etc.)"