summaryrefslogtreecommitdiff
path: root/packaging/Debian/debian-woody/patches/samba.patch
diff options
context:
space:
mode:
authorSimo Sorce <idra@samba.org>2005-10-29 13:19:27 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:15 -0500
commitfa75e8c1d482cdbad2ff074eccb2baf8d5bba856 (patch)
tree51797882a25cfdd23dc653d80cd5cf1723cc6f42 /packaging/Debian/debian-woody/patches/samba.patch
parent3a5c37bfd12781077fe8e7c6ebb23c2cfdb77fd1 (diff)
downloadsamba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.tar.gz
samba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.tar.bz2
samba-fa75e8c1d482cdbad2ff074eccb2baf8d5bba856.zip
r11395: Update the Debian packaging.
Move form stable to stable distribution names based hives. (This used to be commit bb13b3482047b6ab6d84ba9e2839cf8a0fac71aa)
Diffstat (limited to 'packaging/Debian/debian-woody/patches/samba.patch')
-rw-r--r--packaging/Debian/debian-woody/patches/samba.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/packaging/Debian/debian-woody/patches/samba.patch b/packaging/Debian/debian-woody/patches/samba.patch
new file mode 100644
index 0000000000..dd1303ad90
--- /dev/null
+++ b/packaging/Debian/debian-woody/patches/samba.patch
@@ -0,0 +1,65 @@
+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 @@
+ *lp = 0;
+ pstrcpy(password,lp+1);
+ got_pass = True;
+- memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
++ memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password));
+ }
+ if ((lp=strchr_m(username,'/'))) {
+ *lp = 0;
+@@ -775,7 +775,7 @@
+ !strcmp(opts, "password")) {
+ pstrcpy(password,opteq+1);
+ got_pass = True;
+- memset(opteq+1,'X',strlen(password));
++ memset(opteq+1,'\0',strlen(password));
+ } else if(!strcmp(opts, "credentials")) {
+ pstrcpy(credentials,opteq+1);
+ } else if(!strcmp(opts, "netbiosname")) {
+@@ -889,7 +901,7 @@
+ *p = 0;
+ pstrcpy(password,p+1);
+ got_pass = True;
+- memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
++ memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
+ }
+ strupper_m(username);
+ }
+diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh
+--- samba-3.0.0beta1.orig/source/script/installbin.sh 2002-04-22 13:16:20.000000000 -0500
++++ samba-3.0.0beta1/source/script/installbin.sh 2003-06-30 20:12:22.000000000 -0500
+@@ -22,12 +22,14 @@
+ chmod $INSTALLPERMS $BINDIR/$p2
+
+ # this is a special case, mount needs this in a specific location
+- if [ $p2 = smbmount ]; then
+- if [ ! -d $DESTDIR/sbin ]; then
+- mkdir $DESTDIR/sbin
+- fi
+- ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
+- fi
++# Commented out for the Debian Samba package. We take care of this
++# important symlink in debian/rules. (peloy@debian.org)
++# if [ $p2 = smbmount ]; then
++# if [ ! -d $DESTDIR/sbin ]; then
++# mkdir $DESTDIR/sbin
++# fi
++# ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
++# fi
+ done
+
+
+diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
+--- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500
++++ samba-3.0.0beta1/source/web/diagnose.c 2003-06-30 20:12:22.000000000 -0500
+@@ -70,6 +70,7 @@
+ static struct cli_state cli;
+ extern struct in_addr loopback_ip;
+
++ loopback_ip.s_addr = htonl((127 << 24) + 1);
+ if (!cli_initialise(&cli))
+ return False;
+