Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83c168bf authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Fix SETCLIENTID fallback if GSS is not available 



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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a3c3cac5

fs/nfs/nfs4client.c

+1 −1
Original line number Diff line number Diff line
@@ -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;