Commit 0dab5c04 authored by Petr Vandrovec's avatar Petr Vandrovec Committed by Linus Torvalds

[PATCH] Fix ncpfs and rpcgss order in fs/Kconfig

RPCSEC_GSS options are related to (only) nfs/nfsd, so it is
more logical to ask RPCSEC_GSS questions immediately after
nfs/nfsd, not after half of screen more questions.

NCPFS related options should appear immediately below
ncpfs question, not after Coda and RPCSEC...
parent 2d91f0c6
...@@ -1357,6 +1357,35 @@ config EXPORTFS ...@@ -1357,6 +1357,35 @@ config EXPORTFS
tristate tristate
default NFSD default NFSD
config SUNRPC
tristate
default m if NFS_FS!=y && NFSD!=y && (NFS_FS=m || NFSD=m)
default y if NFS_FS=y || NFSD=y
config SUNRPC_GSS
tristate "Provide RPCSEC_GSS authentication (EXPERIMENTAL)"
depends on SUNRPC && EXPERIMENTAL
default SUNRPC if NFS_V4=y
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
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: If you select this option, please ensure that you also
enable the MD5 and DES crypto ciphers.
config SMB_FS config SMB_FS
tristate "SMB file system support (to mount Windows shares etc.)" tristate "SMB file system support (to mount Windows shares etc.)"
depends on INET depends on INET
...@@ -1460,6 +1489,8 @@ config NCP_FS ...@@ -1460,6 +1489,8 @@ config NCP_FS
will be called ncpfs. Say N unless you are connected to a Novell will be called ncpfs. Say N unless you are connected to a Novell
network. network.
source "fs/ncpfs/Kconfig"
config CODA_FS config CODA_FS
tristate "Coda file system support (advanced network fs)" tristate "Coda file system support (advanced network fs)"
depends on INET depends on INET
...@@ -1497,37 +1528,6 @@ config INTERMEZZO_FS ...@@ -1497,37 +1528,6 @@ config INTERMEZZO_FS
support. You will also need a file server daemon, which you can get support. You will also need a file server daemon, which you can get
from <http://www.inter-mezzo.org/>. from <http://www.inter-mezzo.org/>.
config SUNRPC
tristate
default m if NFS_FS!=y && NFSD!=y && (NFS_FS=m || NFSD=m)
default y if NFS_FS=y || NFSD=y
config SUNRPC_GSS
tristate "Provide RPCSEC_GSS authentication (EXPERIMENTAL)"
depends on SUNRPC && EXPERIMENTAL
default SUNRPC if NFS_V4=y
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
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: If you select this option, please ensure that you also
enable the MD5 and DES crypto ciphers.
source "fs/ncpfs/Kconfig"
config AFS_FS config AFS_FS
# for fs/nls/Config.in # for fs/nls/Config.in
tristate "Andrew File System support (AFS) (Experimental)" tristate "Andrew File System support (AFS) (Experimental)"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment