[Pkg-samba-maint] r1477 - in trunk/samba/debian: . patches

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-07-12 06:50:50 +0000 (Thu, 12 Jul 2007)
New Revision: 1477

Added:
   trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
canonicalize mount point names when umount.cifs is called, to avoid
unnecessarily leaving entries behind in /etc/mtab if invoked with a trailing
slash in the mount point name



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-07-12 06:20:17 UTC (rev 1476)
+++ trunk/samba/debian/changelog	2007-07-12 06:50:50 UTC (rev 1477)
@@ -15,8 +15,11 @@
       winbind upgrade
   * linux-cifs-user-perms.patch: also support setting a default uid and gid
     value when mount.cifs is called as non-root
+  * cifs-umount-trailing-slashes.patch: canonicalize mount point names when
+    umount.cifs is called, to avoid unnecessarily leaving entries behind in
+    /etc/mtab if invoked with a trailing slash in the mount point name
 
- -- Steve Langasek <vorlon at debian.org>  Wed, 11 Jul 2007 23:18:55 -0700
+ -- Steve Langasek <vorlon at debian.org>  Wed, 11 Jul 2007 23:49:49 -0700
 
 samba (3.0.25b-1) unstable; urgency=low
 

Added: trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
===================================================================
--- trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	                        (rev 0)
+++ trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	2007-07-12 06:50:50 UTC (rev 1477)
@@ -0,0 +1,21 @@
+Goal: canonicalize mount point names when umount.cifs is called, to avoid
+unnecessarily leaving entries behind in /etc/mtab if invoked with a trailing
+slash in the mount point name
+
+Upstream status: submitted as bugzilla bug #4781
+
+Index: samba-3.0.25b/source/client/umount.cifs.c
+===================================================================
+--- samba-3.0.25b.orig/source/client/umount.cifs.c	2007-07-11 20:33:17.000000000 -0700
++++ samba-3.0.25b/source/client/umount.cifs.c	2007-07-11 20:39:23.000000000 -0700
+@@ -342,6 +342,10 @@
+ 
+ 	/* fixup path if needed */
+ 
++	/* Trim any trailing slashes */
++	while (mountpoint[strlen(mountpoint)-1] == '/')
++		mountpoint[strlen(mountpoint)-1] = '\0';
++
+ 	/* make sure that this is a cifs filesystem */
+ 	rc = statfs(mountpoint, &statbuf);
+ 	

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2007-07-12 06:20:17 UTC (rev 1476)
+++ trunk/samba/debian/patches/series	2007-07-12 06:50:50 UTC (rev 1477)
@@ -18,3 +18,4 @@
 python-examples.patch
 missing_userspace_bugzilla999.patch
 linux-cifs-user-perms.patch
+cifs-umount-trailing-slashes.patch