[Glibc-bsd-commits] r3877 - in trunk/freebsd-utils/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-11-18 21:17:07 +0000 (Fri, 18 Nov 2011)
New Revision: 3877

Added:
   trunk/freebsd-utils/debian/patches/044_mount_exec.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
Log:
044_mount_exec.diff: Fix mount_smbfs execution.

Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-11-18 21:08:23 UTC (rev 3876)
+++ trunk/freebsd-utils/debian/changelog	2011-11-18 21:17:07 UTC (rev 3877)
@@ -1,3 +1,9 @@
+freebsd-utils (8.2+ds2-12) UNRELEASED; urgency=low
+
+  * 044_mount_exec.diff: Fix mount_smbfs execution.
+
+ -- Robert Millan <rmh at debian.org>  Fri, 18 Nov 2011 22:14:49 +0100
+
 freebsd-utils (8.2+ds2-11) unstable; urgency=low
 
   * Unify all __unused fixes into a single patch.

Added: trunk/freebsd-utils/debian/patches/044_mount_exec.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/044_mount_exec.diff	                        (rev 0)
+++ trunk/freebsd-utils/debian/patches/044_mount_exec.diff	2011-11-18 21:17:07 UTC (rev 3877)
@@ -0,0 +1,24 @@
+
+mount_smbfs is not in /sbin
+
+--- a/sbin/mount/mount.c
++++ b/sbin/mount/mount.c
+@@ -160,7 +160,6 @@
+ static int
+ exec_mountprog(const char *name, const char *execname, char *const argv[])
+ {
+-	char buf[256];
+ 	pid_t pid;
+ 	int status;
+ 
+@@ -169,9 +168,7 @@
+ 		warn("fork");
+ 		exit (1);
+ 	case 0:					/* Child. */
+-		/* Mount programs are located in /sbin. */
+-		snprintf(buf, sizeof(buf), "/sbin/%s", execname);
+-		execv(buf, argv);
++		execvp(execname, argv);
+ 		if (errno == ENOENT) {
+ 			warn("exec %s not found", execname);
+ 		}

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2011-11-18 21:08:23 UTC (rev 3876)
+++ trunk/freebsd-utils/debian/patches/series	2011-11-18 21:17:07 UTC (rev 3877)
@@ -40,3 +40,4 @@
 040_kdump_multiarch.diff
 041_delete_key.diff
 043_ppp.diff
+044_mount_exec.diff