[PATCH] nfs-utils umount command does not use correct TCP/UDP protocol

[Wei Yongjun <yjwei@nanjing-fnst.com>]

After I install nfs-utils-1.0.12, the least release, I found that umount
command can not use the correct TCP/UDP protocol as which it been mount.

You can test this used following commands:
#mount -t nfs -o proto=udp 127.0.0.1:/nfsroot /mnt
#umount /mnt
umount will use TCP protocol to do the umount process.

Following is my patch to fix this BUG.

Signed-off-by: Wei Yongjun <yjwei@nanjing-fnst.com>

--- utils/mount/nfsumount.c.orig	2007-03-05 03:11:48.000000000 -0500
+++ utils/mount/nfsumount.c	2007-03-05 03:06:25.000000000 -0500
@@ -103,31 +103,35 @@ int nfs_call_umount(clnt_addr_t *mnt_ser
 	return 0;
 }
 
+static int
+contains(const char *list, const char *s) {
+	int n = strlen(s);
+	char *p, *rest = list;
+
+	while ((p = strstr(rest, s)) != NULL) {
+		if ((p == rest || p[-1] == ',' || p[-1] == '=')
+			&& (p[n] == '\0' || p[n] == ','))
+			return 1;
+
+                while (*rest && *rest++ != ',');
+		if(rest == NULL) break;
+        }
+        return 0;
+}
+
 u_int get_mntproto(const char *);
 u_int
 get_mntproto(const char *dirname)
 {
-	FILE *mtab;
-	struct mntent mntbuf;
-	char tmpbuf[BUFSIZ];
+	struct mntentchn *mc;
 	u_int proto = IPPROTO_TCP; /* assume tcp */
 
-	 mtab = setmntent ("/proc/mounts", "r");
-	 if (mtab == NULL)
-	 	mtab = setmntent (_PATH_MOUNTED, "r");
-	if (mtab == NULL)
-		return proto;
-
-	while(getmntent_r(mtab, &mntbuf, tmpbuf, sizeof (tmpbuf))) {
-		if (strcmp(mntbuf.mnt_type, "nfs"))
-			continue;
-		if (strcmp(dirname,  mntbuf.mnt_fsname))
-			continue;
-		if (hasmntopt(&mntbuf, "udp"))
-			proto = IPPROTO_UDP;
-		break;
-	}
-	endmntent (mtab);
+	mc = getmntdirbackward(dirname, NULL);
+	if (!mc)
+		mc = getmntdevbackward(dirname, NULL);
+
+	if(mc && contains(mc->m.mnt_opts, "udp"))
+		proto = IPPROTO_UDP;
 
 	return proto;
 }



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
NFS maillist  -  NFS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/nfs