2008-02-14 20:58:56

by Chuck Lever III

[permalink] [raw]
Subject: [PATCH 8/8] NFS: NFS_V4 and NFSD_V4 should depend on SUNRPC_GSS

There is a guideline in Documentation/kbuild/kconfig-language.txt that
states "In general use select only for non-visible symbols (no prompts
anywhere) and for symbols with no dependencies." Both CONFIG_NFS_V4 and
CONFIG_NFSD_V4 select RPCSEC_GSS_KRB5, which is visible, and has
dependencies.

For the sake of addressing the kconfig-language recommendation,
"select RPCSEC_GSS_KRB5" to "select SUNRPC_GSS".

The server side requires it to build properly, and the client side has it
to provide support for loading GSS capabilities, which RFC 3530 makes
mandatory for NFS version 4.

Signed-off-by: Chuck Lever <[email protected]>
---

fs/Kconfig | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/Kconfig b/fs/Kconfig
index c7ad5b7..048c561 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1629,7 +1629,7 @@ config NFS_V3_ACL
config NFS_V4
bool "NFS client support for NFS version 4 (EXPERIMENTAL)"
depends on NFS_FS && EXPERIMENTAL
- select RPCSEC_GSS_KRB5
+ select SUNRPC_GSS
help
This option enables support for version 4 of the NFS protocol
(RFC 3530) in the kernel's NFS client.
@@ -1720,7 +1720,7 @@ config NFSD_V4
bool "NFS server support for NFS version 4 (EXPERIMENTAL)"
depends on NFSD && PROC_FS && EXPERIMENTAL
select NFSD_V3
- select RPCSEC_GSS_KRB5
+ select SUNRPC_GSS
help
This option enables support in your system's NFS server for
version 4 of the NFS protocol (RFC 3530).