~vcs-imports/samba/main

« back to all changes in this revision

Viewing changes to packaging/Debian/debian-woody/patches/samba.patch

  • Committer: jerry
  • Date: 2006-07-14 21:48:39 UTC
  • Revision ID: vcs-imports@canonical.com-20060714214839-586d8c489a8fcead
gutting trunk to move to svn:externals

Show diffs side-by-side

added added

removed removed

Lines of Context:
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,12 +22,14 @@
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
 
-   if [ ! -d $DESTDIR/sbin ]; then
40
 
-      mkdir $DESTDIR/sbin
41
 
-   fi
42
 
-   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
43
 
- fi
44
 
+# Commented out for the Debian Samba package. We take care of this
45
 
+#      important symlink in debian/rules. (peloy@debian.org)
46
 
+# if [ $p2 = smbmount ]; then
47
 
+#   if [ ! -d $DESTDIR/sbin ]; then
48
 
+#      mkdir $DESTDIR/sbin
49
 
+#   fi
50
 
+#   ln -sf $BINDIR/$p2 $DESTDIR/sbin/mount.smbfs
51
 
+# fi
52
 
 done
53
 
 
54
 
 
55
 
diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
56
 
--- samba-3.0.0beta1.orig/source/web/diagnose.c 2003-06-07 12:57:41.000000000 -0500
57
 
+++ samba-3.0.0beta1/source/web/diagnose.c      2003-06-30 20:12:22.000000000 -0500
58
 
@@ -70,6 +70,7 @@
59
 
        static struct cli_state cli;
60
 
        extern struct in_addr loopback_ip;
61
 
 
62
 
+       loopback_ip.s_addr = htonl((127 << 24) + 1);
63
 
        if (!cli_initialise(&cli))
64
 
                return False;
65