From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 4 Apr 2013 20:14:11 +0000 (-0400)
Subject: NFSv4: Fix the fallback to AUTH_NULL if krb5i is not available
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=23631227;p=openwrt%2Fstaging%2Fblogic.git

NFSv4: Fix the fallback to AUTH_NULL if krb5i is not available

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>
---

diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index bb9789ef1d49..a4f2100fd9c2 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -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;