X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmount%2Fnfsmount.c;h=6226f6cf0241c6a99f35bc31a3861927dd976892;hp=f21c81c4a583c077facab4c4b105b0ed84f00c65;hb=afc841a1f2a62645ec2dfaa333baf07e44a03c08;hpb=b1e1c8a05afdbbc3f217ef79c31c3b8ca302f9eb

diff --git a/utils/mount/nfsmount.c b/utils/mount/nfsmount.c
index f21c81c..6226f6c 100644
--- a/utils/mount/nfsmount.c
+++ b/utils/mount/nfsmount.c
@@ -902,7 +902,6 @@ nfsmount(const char *spec, const char *node, int *flags,
 #if NFS_MOUNT_VERSION >= 2
 	data.namlen	= NAME_MAX;
 #endif
-	data.pseudoflavor = AUTH_SYS;
 
 	bg = 0;
 	retry = 10000;		/* 10000 minutes ~ 1 week */
@@ -1090,6 +1089,15 @@ nfsmount(const char *spec, const char *node, int *flags,
 
 		flavor = mountres->auth_flavors.auth_flavors_val;
 		while (--i >= 0) {
+			/* If no flavour requested, use first simple
+			 * flavour that is offered.
+			 */
+			if (! (data.flags & NFS_MOUNT_SECFLAVOUR) &&
+			    (flavor[i] == AUTH_SYS ||
+			     flavor[i] == AUTH_NONE)) {
+				data.pseudoflavor = flavor[i];
+				data.flags |= NFS_MOUNT_SECFLAVOUR;
+			}
 			if (flavor[i] == data.pseudoflavor)
 				yum = 1;
 #ifdef NFS_MOUNT_DEBUG
@@ -1102,7 +1110,7 @@ nfsmount(const char *spec, const char *node, int *flags,
 				"mount: %s:%s failed, "
 				"security flavor not supported\n",
 				hostname, dirname);
-			/* server has registered us in mtab, send umount */
+			/* server has registered us in rmtab, send umount */
 			nfs_call_umount(&mnt_server, &dirname);
 			goto fail;
 		}