diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-07 12:58:57 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-09-07 16:18:30 -0400 |
| commit | 5e6b19901b763f502e62b5fd4f583778df983ce7 (patch) | |
| tree | f407c8014634062f1f02a7528801dd1b4868e6ba /fs/nfs/nfs4super.c | |
| parent | 19e7b8d240702297d837891694f463435910f718 (diff) | |
| download | blackbird-obmc-linux-5e6b19901b763f502e62b5fd4f583778df983ce7.tar.gz blackbird-obmc-linux-5e6b19901b763f502e62b5fd4f583778df983ce7.zip | |
NFSv4: Fix security auto-negotiation
NFSv4 security auto-negotiation has been broken since
commit 4580a92d44e2b21c2254fa5fef0f1bfb43c82318 (NFS:
Use server-recommended security flavor by default (NFSv3))
because nfs4_try_mount() will automatically select AUTH_SYS
if it sees no auth flavours.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Chuck Lever <chuck.lever@oracle.com>
Diffstat (limited to 'fs/nfs/nfs4super.c')
| -rw-r--r-- | fs/nfs/nfs4super.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/nfs4super.c b/fs/nfs/nfs4super.c index 4ad837cf4786..e26acdd1a645 100644 --- a/fs/nfs/nfs4super.c +++ b/fs/nfs/nfs4super.c @@ -253,10 +253,6 @@ struct dentry *nfs4_try_mount(int flags, const char *dev_name, dfprintk(MOUNT, "--> nfs4_try_mount()\n"); - if (data->auth_flavor_len < 1) { - data->auth_flavors[0] = RPC_AUTH_UNIX; - data->auth_flavor_len = 1; - } export_path = data->nfs_server.export_path; data->nfs_server.export_path = "/"; root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info, |
