Commit 36b15c54 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag

parent 738a3519
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -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) {