diff options
| author | bubulle <bubulle@alioth.debian.org> | 2008-03-09 09:06:32 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2008-03-09 09:06:32 +0000 |
| commit | 1ac45258b830893c160cf57d09e9c7eade693761 (patch) | |
| tree | fa303e05f06b4e57d8600446fd7e216870225d27 | |
| parent | 29eb1ee76babb4e9dffe2359e3080f127039bdbb (diff) | |
| download | samba-1ac45258b830893c160cf57d09e9c7eade693761.tar.gz | |
Yet another patch that was applied upstream
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1748 fc4039ab-9d04-0410-8cac-899223bdd6b0
| -rw-r--r-- | changelog | 1 | ||||
| -rw-r--r-- | patches/cifs-umount-same-user.patch | 22 | ||||
| -rw-r--r-- | patches/series | 1 |
3 files changed, 1 insertions, 23 deletions
@@ -6,6 +6,7 @@ samba (3.0.28a-1) unstable; urgency=low * Debian patches dropped as applied upstream: - make-distclean.patch - linux-cifs-user-perms.patch + - cifs-umount-same-user.patch -- Christian Perrier <bubulle@debian.org> Sun, 09 Mar 2008 08:57:28 +0100 diff --git a/patches/cifs-umount-same-user.patch b/patches/cifs-umount-same-user.patch deleted file mode 100644 index 81d6ba9ef3..0000000000 --- a/patches/cifs-umount-same-user.patch +++ /dev/null @@ -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@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); - diff --git a/patches/series b/patches/series index e0b77509a5..bc29bbdf58 100644 --- a/patches/series +++ b/patches/series @@ -12,7 +12,6 @@ undefined-symbols.patch 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 |