diff options
author | Simo Sorce <idra@samba.org> | 2005-10-29 13:31:57 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:05:15 -0500 |
commit | 7ec71aa20d43fd45dd9321e42ada93ee10fd1d45 (patch) | |
tree | 829da267bc12da10dbdb2b3cf735d5de27639dd5 /packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch | |
parent | fa75e8c1d482cdbad2ff074eccb2baf8d5bba856 (diff) | |
download | samba-7ec71aa20d43fd45dd9321e42ada93ee10fd1d45.tar.gz samba-7ec71aa20d43fd45dd9321e42ada93ee10fd1d45.tar.bz2 samba-7ec71aa20d43fd45dd9321e42ada93ee10fd1d45.zip |
r11398: Keep s3 in sync with trunk
(This used to be commit 7fc05b79643c93eaf0ef028a7337889ed21c52ba)
Diffstat (limited to 'packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch')
-rw-r--r-- | packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch index 8807148170..f7e9ce4f69 100644 --- a/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch +++ b/packaging/Debian/debian-unstable/patches/smbmount-nomtab.patch @@ -123,7 +123,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) { DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid())); return; -@@ -466,6 +470,9 @@ +@@ -467,6 +471,9 @@ args[i++] = "-s"; args[i++] = svc2; @@ -133,7 +133,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source if (mount_ro) { args[i++] = "-r"; } -@@ -661,7 +668,7 @@ +@@ -662,7 +669,7 @@ ****************************************************************************/ static void usage(void) { @@ -142,7 +142,7 @@ diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source printf("Version %s\n\n",VERSION); -@@ -739,8 +746,13 @@ +@@ -740,8 +747,13 @@ argc -= 2; argv += 2; |