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

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2007-11-21 18:33:00 +0000 (Wed, 21 Nov 2007)
New Revision: 1589

Removed:
   trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Patch newly-merged upstream



Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2007-11-21 18:11:33 UTC (rev 1588)
+++ trunk/samba/debian/changelog	2007-11-21 18:33:00 UTC (rev 1589)
@@ -3,10 +3,11 @@
   * New upstream release
     - fix regression with smbfs clients, introduced by the security fix in
       3.0.27.  Closes: #451839.
+    - debian/patches/cifs-umount-trailing-slashes.patch: merged upstream.
   * Drop the deprecated "printer admin" example from the default smb.conf.
     Closes: #451273.
 
- -- Steve Langasek <vorlon at debian.org>  Wed, 21 Nov 2007 09:46:03 -0800
+ -- Steve Langasek <vorlon at debian.org>  Wed, 21 Nov 2007 10:32:06 -0800
 
 samba (3.0.27-1) unstable; urgency=low
 

Deleted: trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch
===================================================================
--- trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	2007-11-21 18:11:33 UTC (rev 1588)
+++ trunk/samba/debian/patches/cifs-umount-trailing-slashes.patch	2007-11-21 18:33:00 UTC (rev 1589)
@@ -1,21 +0,0 @@
-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.25c/source/client/umount.cifs.c
-===================================================================
---- samba-3.0.25c.orig/source/client/umount.cifs.c	2007-08-26 12:07:14.598393722 +0200
-+++ samba-3.0.25c/source/client/umount.cifs.c	2007-08-26 13:09:08.419408730 +0200
-@@ -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-11-21 18:11:33 UTC (rev 1588)
+++ trunk/samba/debian/patches/series	2007-11-21 18:33:00 UTC (rev 1589)
@@ -18,7 +18,6 @@
 autoconf.patch
 missing_userspace_bugzilla999.patch
 linux-cifs-user-perms.patch
-cifs-umount-trailing-slashes.patch
 cifs-umount-same-user.patch
 smbpasswd-syslog.patch
 get_global_sam_sid-non-root.patch