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

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2008-03-09 09:06:32 +0000 (Sun, 09 Mar 2008)
New Revision: 1748

Removed:
   trunk/samba/debian/patches/cifs-umount-same-user.patch
Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/patches/series
Log:
Yet another patch that was applied upstream


Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2008-03-09 09:04:55 UTC (rev 1747)
+++ trunk/samba/debian/changelog	2008-03-09 09:06:32 UTC (rev 1748)
@@ -6,6 +6,7 @@
   * Debian patches dropped as applied upstream:
     - make-distclean.patch
     - linux-cifs-user-perms.patch
+    - cifs-umount-same-user.patch
 
  -- Christian Perrier <bubulle at debian.org>  Sun, 09 Mar 2008 08:57:28 +0100
 

Deleted: trunk/samba/debian/patches/cifs-umount-same-user.patch
===================================================================
--- trunk/samba/debian/patches/cifs-umount-same-user.patch	2008-03-09 09:04:55 UTC (rev 1747)
+++ trunk/samba/debian/patches/cifs-umount-same-user.patch	2008-03-09 09:06:32 UTC (rev 1748)
@@ -1,22 +0,0 @@
-Goal: the CIFS_IOC_CHECKMOUNT ioctl check assumed that errors would return a
-value > 0, when in fact the return value on failure is -1.  Correct this
-assumption, which was allowing any user to unmount shares mounted by other
-users.
-
-Author: Steve Langasek <vorlon at debian.org>
-
-Upstream status: submitted as bugzilla bug #4784. Will be in 3.0.28a
-
-Index: samba-3.0.25c/source/client/umount.cifs.c
-===================================================================
---- samba-3.0.25c.orig/source/client/umount.cifs.c	2007-08-26 13:09:08.419408730 +0200
-+++ samba-3.0.25c/source/client/umount.cifs.c	2007-08-26 13:09:08.919384334 +0200
-@@ -131,7 +131,7 @@
- 		printf("user unmounting via %s is an optional feature of",thisprogram);
- 		printf(" the cifs filesystem driver (cifs.ko)");
- 		printf("\n\tand requires cifs.ko version 1.32 or later\n");
--	} else if (rc > 0)
-+	} else if (rc != 0)
- 		printf("user unmount of %s failed with %d %s\n",dir,errno,strerror(errno));
- 	close(fileid);
- 

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2008-03-09 09:04:55 UTC (rev 1747)
+++ trunk/samba/debian/patches/series	2008-03-09 09:06:32 UTC (rev 1748)
@@ -12,7 +12,6 @@
 VERSION.patch
 adapt_machine_creation_script.patch
 autoconf.patch
-cifs-umount-same-user.patch
 smbpasswd-syslog.patch
 get_global_sam_sid-non-root.patch
 usershare.patch