From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 23 Aug 2006 00:06:14 +0000 (-0400)
Subject: NFS: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag
X-Git-Tag: v2.6.19-rc1~1271^2~49
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=36b15c54cd0d6f707a3ac03e4a2a60bb530a95b9;p=karo-tx-linux.git

NFS: Ensure NFSv2/v3 mounts respect the NFS_MOUNT_SECFLAVOUR flag

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 867b5dcd3a40..97cfb143e09f 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) {