diff options
| author | Chuck Lever <chuck.lever@oracle.com> | 2013-05-15 22:00:10 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-05-23 18:50:40 -0400 |
| commit | 83c168bf8017212a9d502536f9dcd0b54d24e330 (patch) | |
| tree | aabdca9b6f0e514f7e7980d45a36db2093d07ccd /fs/nfs | |
| parent | a3c3cac5d31879cd9ae2de7874dc6544ca704aec (diff) | |
| download | linux-3.10-83c168bf8017212a9d502536f9dcd0b54d24e330.tar.gz linux-3.10-83c168bf8017212a9d502536f9dcd0b54d24e330.tar.bz2 linux-3.10-83c168bf8017212a9d502536f9dcd0b54d24e330.zip | |
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: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/nfs4client.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 947b0c908aa..4cbad5d6b27 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c @@ -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; |