Skip to content

Commit

Permalink
NFSv4: Fix the fallback to AUTH_NULL if krb5i is not available
Browse files Browse the repository at this point in the history
If the rpcsec_gss_krb5 module cannot be loaded, the attempt to create
an rpc_client in nfs4_init_client will currently fail with an EINVAL.
Fix is to retry with AUTH_NULL.

Regression introduced by the commit "NFS: Use "krb5i" to establish NFSv4
state whenever possible"

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Cc: Bryan Schumaker <bjschuma@netapp.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Apr 4, 2013
1 parent 4580a92 commit 2363122
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions fs/nfs/nfs4client.c
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ 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);
if (error < 0)
goto error;

Expand Down

0 comments on commit 2363122

Please sign in to comment.