r11398: Keep s3 in sync with trunk

[ira/wip.git] / packaging / Debian / debian-unstable / patches / samba.patch

diff --git a/packaging/Debian/debian-unstable/patches/samba.patch b/packaging/Debian/debian-unstable/patches/samba.patch
index 06d436408f5f3e08f1adc9392c2de0927d27fb47..f4c8ca8742c2c5cf54924278387522ef16727390 100644 (file)
--- a/packaging/Debian/debian-unstable/patches/samba.patch
+++ b/packaging/Debian/debian-unstable/patches/samba.patch
@@ -1,7 +1,7 @@
 diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c
 --- samba-3.0.0beta1.orig/source/client/smbmount.c     2003-06-07 12:57:32.000000000 -0500
 +++ samba-3.0.0beta1/source/client/smbmount.c  2003-06-30 20:12:22.000000000 -0500
-@@ -765,7 +765,7 @@
+@@ -766,7 +766,7 @@
                                        *lp = 0;
                                        pstrcpy(password,lp+1);
                                        got_pass = True;
@@ -10,7 +10,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source
                                }
                                if ((lp=strchr_m(username,'/'))) {
                                        *lp = 0;
-@@ -775,7 +775,7 @@
+@@ -776,7 +776,7 @@
                                  !strcmp(opts, "password")) {
                                pstrcpy(password,opteq+1);
                                got_pass = True;
@@ -19,7 +19,7 @@ diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source
                        } else if(!strcmp(opts, "credentials")) {
                                pstrcpy(credentials,opteq+1);
                        } else if(!strcmp(opts, "netbiosname")) {
-@@ -889,7 +901,7 @@
+@@ -890,7 +902,7 @@
                        *p = 0;
                        pstrcpy(password,p+1);
                        got_pass = True;