lkml.org 
[lkml]   [2010]   [Aug]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: linux-next: Tree for August 9 (nfs)
    On 08/17/10 14:23, Trond Myklebust wrote:
    > On Thu, 2010-08-12 at 10:36 -0700, Randy Dunlap wrote:
    >> On 08/12/10 10:31, Trond Myklebust wrote:
    >>> On Thu, 2010-08-12 at 09:18 -0700, Randy Dunlap wrote:
    >>>> On Mon, 9 Aug 2010 10:08:56 -0700 Randy Dunlap wrote:
    >>>>
    >>>> ping??
    >>>
    >>> Hi Randy,
    >>>
    >>> I'm sorry. A heavy travel schedule is affecting my response time at the
    >>> moment. I'll try to take care of this by Tuesday (when I get back home)
    >>> if not before.
    >>
    >> No problem. Just wanted to make sure that it's not lost.
    >
    > Hi Randy,
    >
    > How about the following fix?

    Thanks, this fixes the build error.

    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>


    > Cheers
    > Trond
    >
    > ------------------------------------------------------------------------------------
    > Subject: [PATCH] NFS: Fix the selection of security flavours in Kconfig
    > From: Trond Myklebust <Trond.Myklebust@netapp.com>
    >
    > Randy Dunlap reports:
    >
    > ERROR: "svc_gss_principal" [fs/nfs/nfs.ko] undefined!
    >
    >
    > because in fs/nfs/Kconfig, NFS_V4 selects RPCSEC_GSS_KRB5
    > and/or in fs/nfsd/Kconfig, NFSD_V4 selects RPCSEC_GSS_KRB5.
    >
    > RPCSEC_GSS_KRB5 does 5 selects, but none of these is enforced/followed
    > by the fs/nfs[d]/Kconfig configs:
    >
    > select SUNRPC_GSS
    > select CRYPTO
    > select CRYPTO_MD5
    > select CRYPTO_DES
    > select CRYPTO_CBC
    >
    > Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
    > Cc: J. Bruce Fields <bfields@fieldses.org>
    > Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
    > ---
    >
    > fs/nfs/Kconfig | 1 -
    > fs/nfsd/Kconfig | 1 -
    > net/sunrpc/Kconfig | 9 +++++----
    > 3 files changed, 5 insertions(+), 6 deletions(-)
    >
    >
    > diff --git a/fs/nfs/Kconfig b/fs/nfs/Kconfig
    > index cc1bb33..2ddc384 100644
    > --- a/fs/nfs/Kconfig
    > +++ b/fs/nfs/Kconfig
    > @@ -63,7 +63,6 @@ config NFS_V3_ACL
    > config NFS_V4
    > bool "NFS client support for NFS version 4"
    > depends on NFS_FS
    > - select RPCSEC_GSS_KRB5
    > help
    > This option enables support for version 4 of the NFS protocol
    > (RFC 3530) in the kernel's NFS client.
    > diff --git a/fs/nfsd/Kconfig b/fs/nfsd/Kconfig
    > index 503b9da..95932f5 100644
    > --- a/fs/nfsd/Kconfig
    > +++ b/fs/nfsd/Kconfig
    > @@ -69,7 +69,6 @@ config NFSD_V4
    > depends on NFSD && PROC_FS && EXPERIMENTAL
    > select NFSD_V3
    > select FS_POSIX_ACL
    > - select RPCSEC_GSS_KRB5
    > help
    > This option enables support in your system's NFS server for
    > version 4 of the NFS protocol (RFC 3530).
    > diff --git a/net/sunrpc/Kconfig b/net/sunrpc/Kconfig
    > index 443c161..3376d76 100644
    > --- a/net/sunrpc/Kconfig
    > +++ b/net/sunrpc/Kconfig
    > @@ -18,10 +18,11 @@ config SUNRPC_XPRT_RDMA
    > If unsure, say N.
    >
    > config RPCSEC_GSS_KRB5
    > - tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
    > - depends on SUNRPC && EXPERIMENTAL
    > + tristate
    > + depends on SUNRPC && CRYPTO
    > + prompt "Secure RPC: Kerberos V mechanism" if !(NFS_V4 || NFSD_V4)
    > + default y
    > select SUNRPC_GSS
    > - select CRYPTO
    > select CRYPTO_MD5
    > select CRYPTO_DES
    > select CRYPTO_CBC
    > @@ -34,7 +35,7 @@ config RPCSEC_GSS_KRB5
    > available from http://linux-nfs.org/. In addition, user-space
    > Kerberos support should be installed.
    >
    > - If unsure, say N.
    > + If unsure, say Y.
    >
    > config RPCSEC_GSS_SPKM3
    > tristate "Secure RPC: SPKM3 mechanism (EXPERIMENTAL)"
    >
    >


    --
    ~Randy
    *** Remember to use Documentation/SubmitChecklist when testing your code ***


    \
     
     \ /
      Last update: 2010-08-17 23:43    [W:0.046 / U:31.104 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site