packaging/Debian/debian/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 @@ -765,7 +765,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 @@ -775,7 +775,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 @@ -889,7 +901,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/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh
  32 --- samba-3.0.0beta1.orig/source/script/installbin.sh   2002-04-22 13:16:20.000000000 -0500
  33 +++ samba-3.0.0beta1/source/script/installbin.sh        2003-06-30 20:12:22.000000000 -0500
  34 @@ -22,9 +22,11 @@
  35   chmod $INSTALLPERMS $BINDIR/$p2
  36
  37   # this is a special case, mount needs this in a specific location
  38 - if [ $p2 = smbmount ]; then
  39 -   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
  40 - fi
  41 +# Commented out for the Debian Samba package. We take care of this
  42 +#      important symlink in debian/rules. (peloy@debian.org)
  43 +# if [ $p2 = smbmount ]; then
  44 +#   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
  45 +# fi
  46  done
  47
  48
  49 diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c
  50 --- samba-3.0.0beta1.orig/source/smbd/service.c 2003-06-07 12:57:39.000000000 -0500
  51 +++ samba-3.0.0beta1/source/smbd/service.c      2003-06-30 20:12:57.000000000 -0500
  52 @@ -885,6 +885,9 @@
  53         file_close_conn(conn);
  54         dptr_closecnum(conn);
  55
  56 +       /* make sure we leave the directory available for unmount */
  57 +       vfs_ChDir(conn, "/");
  58 +
  59         /* execute any "postexec = " line */
  60         if (*lp_postexec(SNUM(conn)) &&
  61             change_to_user(conn, vuid))  {
  62 @@ -904,8 +907,5 @@
  63                 smbrun(cmd,NULL);
  64         }
  65
  66 -       /* make sure we leave the directory available for unmount */
  67 -       vfs_ChDir(conn, "/");
  68 -
  69         conn_free(conn);
  70  }
  71 diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c
  72 --- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c     2003-06-07 12:57:40.000000000 -0500
  73 +++ samba-3.0.0beta1/source/smbwrapper/smbsh.c  2003-06-30 20:12:22.000000000 -0500
  74 @@ -36,7 +36,7 @@
  75  int main(int argc, char *argv[])
  76  {
  77         char *p, *u;
  78 -       const char *libd = dyn_BINDIR;
  79 +       const char *libd = dyn_LIBDIR;
  80         pstring line, wd;
  81         int opt;
  82         extern char *optarg;
  83 diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
  84 --- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500
  85 +++ samba-3.0.0beta1/source/web/diagnose.c      2003-06-30 20:12:22.000000000 -0500
  86 @@ -70,6 +70,7 @@
  87         static struct cli_state cli;
  88         extern struct in_addr loopback_ip;
  89
  90 +       loopback_ip.s_addr = htonl((127 << 24) + 1);
  91         if (!cli_initialise(&cli))
  92                 return False;
  93