NFS: Fix SETCLIENTID fallback if GSS is not available
authorChuck Lever <chuck.lever@oracle.com>
Thu, 16 May 2013 02:00:10 +0000 (22:00 -0400)
committerTrond Myklebust <Trond.Myklebust@netapp.com>
Thu, 23 May 2013 22:50:40 +0000 (18:50 -0400)
Commit 79d852bf "NFS: Retry SETCLIENTID with AUTH_SYS instead of
AUTH_NONE" did not take into account commit 23631227 "NFSv4: Fix the
fallback to AUTH_NULL if krb5i is not available".

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
fs/nfs/nfs4client.c

index 947b0c908aa908c643140dd7087b0927753c6d49..4cbad5d6b276f8c481984c166869e2679c2e241e 100644 (file)
@@ -203,7 +203,7 @@ struct nfs_client *nfs4_init_client(struct nfs_client *clp,
        __set_bit(NFS_CS_DISCRTRY, &clp->cl_flags);
        error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_GSS_KRB5I);
        if (error == -EINVAL)
-               error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_NULL);
+               error = nfs_create_rpc_client(clp, timeparms, RPC_AUTH_UNIX);
        if (error < 0)
                goto error;