diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-08-22 20:06:14 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-09-22 23:24:38 -0400 |
| commit | 36b15c54cd0d6f707a3ac03e4a2a60bb530a95b9 (patch) | |
| tree | 09aa1cff411f9a26c1da9255241a865b13d738f3 /fs/nfs | |
| parent | 738a35195941ecf604d3070e2a053e1df3de350b (diff) | |
| download | linux-3.10-36b15c54cd0d6f707a3ac03e4a2a60bb530a95b9.tar.gz linux-3.10-36b15c54cd0d6f707a3ac03e4a2a60bb530a95b9.tar.bz2 linux-3.10-36b15c54cd0d6f707a3ac03e4a2a60bb530a95b9.zip | |
NFS: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/super.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 867b5dcd3a4..97cfb143e09 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -471,12 +471,14 @@ static int nfs_validate_mount_data(struct nfs_mount_data *data, data->version); return -EINVAL; } - /* Fill in pseudoflavor for mount version < 5 */ - data->pseudoflavor = RPC_AUTH_UNIX; case 5: memset(data->context, 0, sizeof(data->context)); } + /* Set the pseudoflavor */ + if (!(data->flags & NFS_MOUNT_SECFLAVOUR)) + data->pseudoflavor = RPC_AUTH_UNIX; + #ifndef CONFIG_NFS_V3 /* If NFSv3 is not compiled in, return -EPROTONOSUPPORT */ if (data->flags & NFS_MOUNT_VER3) { |