packaging/Debian/debian-sarge/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  {
  36         struct cli_state *cli;
  37
  38 +       loopback_ip.s_addr = htonl((127 << 24) + 1);
  39         if ((cli = cli_initialise()) == NULL)
  40                 return False;
  41
  42 --- samba-3.0.23/source/script/installbin.sh.in.orig    2006-07-15 09:08:36.000000000 -0400
  43 +++ samba-3.0.23/source/script/installbin.sh.in 2006-07-15 09:51:45.000000000 -0400
  44 @@ -21,13 +21,14 @@
  45   chmod $INSTALLPERMS $DESTDIR/$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/@rootsbindir@ ]; then
  50 -      mkdir $DESTDIR/@rootsbindir@
  51 -   fi
  52 -   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
  53 -   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
  54 - fi
  55 +# Commented out for the Debian Samba package. We take care of this
  56 +# important symlink in debian/rules. (peloy@debian.org)
  57 +# if [ $p2 = smbmount ]; then
  58 +#   if [ ! -d $DESTDIR/sbin ]; then
  59 +#      mkdir $DESTDIR/sbin
  60 +#   fi
  61 +#   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
  62 +# fi
  63  done
  64
  65