r11398: Keep s3 in sync with trunk
[samba.git] / packaging / Debian / debian-unstable / patches / samba.patch
1 diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c
2 --- samba-3.0.0beta1.orig/source/client/smbmount.c      2003-06-07 12:57:32.000000000 -0500
3 +++ samba-3.0.0beta1/source/client/smbmount.c   2003-06-30 20:12:22.000000000 -0500
4 @@ -766,7 +766,7 @@
5                                         *lp = 0;
6                                         pstrcpy(password,lp+1);
7                                         got_pass = True;
8 -                                       memset(strchr_m(opteq+1,'%')+1,'X',strlen(password));
9 +                                       memset(strchr_m(opteq+1,'%')+1,'\0',strlen(password));
10                                 }
11                                 if ((lp=strchr_m(username,'/'))) {
12                                         *lp = 0;
13 @@ -776,7 +776,7 @@
14                                   !strcmp(opts, "password")) {
15                                 pstrcpy(password,opteq+1);
16                                 got_pass = True;
17 -                               memset(opteq+1,'X',strlen(password));
18 +                               memset(opteq+1,'\0',strlen(password));
19                         } else if(!strcmp(opts, "credentials")) {
20                                 pstrcpy(credentials,opteq+1);
21                         } else if(!strcmp(opts, "netbiosname")) {
22 @@ -890,7 +902,7 @@
23                         *p = 0;
24                         pstrcpy(password,p+1);
25                         got_pass = True;
26 -                       memset(strchr_m(getenv("USER"),'%')+1,'X',strlen(password));
27 +                       memset(strchr_m(getenv("USER"),'%')+1,'\0',strlen(password));
28                 }
29                 strupper_m(username);
30         }
31 diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
32 --- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500
33 +++ samba-3.0.0beta1/source/web/diagnose.c      2003-06-30 20:12:22.000000000 -0500
34 @@ -66,6 +66,7 @@
35         static struct cli_state cli;
36         extern struct in_addr loopback_ip;
37  
38 +       loopback_ip.s_addr = htonl((127 << 24) + 1);
39         if (!cli_initialise(&cli))
40                 return False;
41  
42 --- samba-3.0.1/source/script/installbin.sh.orig        2003-10-10 14:08:36.000000000 -0400
43 +++ samba-3.0.1/source/script/installbin.sh     2003-12-17 10:51:45.000000000 -0500
44 @@ -24,12 +24,14 @@
45   chmod $INSTALLPERMS $BINDIR/$p2
46  
47   # this is a special case, mount needs this in a specific location
48 - if [ $p2 = smbmount ]; then
49 -   if [ ! -d $DESTDIR/sbin ]; then
50 -      mkdir $DESTDIR/sbin
51 -   fi 
52 -   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
53 - fi
54 +# Commented out for the Debian Samba package. We take care of this
55 +# important symlink in debian/rules. (peloy@debian.org)
56 +# if [ $p2 = smbmount ]; then
57 +#   if [ ! -d $DESTDIR/sbin ]; then
58 +#      mkdir $DESTDIR/sbin
59 +#   fi 
60 +#   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
61 +# fi
62  done
63  
64