summaryrefslogtreecommitdiff
path: root/patches/samba.patch
blob: bfa5e9a0e780d5b92974f633970ae0168c9556a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
Goal: Seems to be multiple:
      - chunk 1: ?
      - chunk 2: ?
      - chunk 3: installing smbmount and smbumount is done The Debian Way in debian/rules

Fixes: ?

Status wrt upstream: Chunk 3 is Debian specific. Not sure for chunks 1 and 2

Note: 

Index: samba-3.0.25rc2/source/client/smbmount.c
===================================================================
--- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:00.702071823 +0200
+++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:51.451949299 +0200
@@ -768,7 +768,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;
@@ -778,7 +778,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")) {
@@ -892,7 +892,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);
 	}
Index: samba-3.0.25rc2/source/web/diagnose.c
===================================================================
--- samba-3.0.25rc2.orig/source/web/diagnose.c	2007-04-24 11:07:00.722072619 +0200
+++ samba-3.0.25rc2/source/web/diagnose.c	2007-04-24 11:07:51.455949436 +0200
@@ -62,6 +62,7 @@
 {
 	struct cli_state *cli;
 
+ 	loopback_ip.s_addr = htonl((127 << 24) + 1);
 	if ((cli = cli_initialise()) == NULL)
 		return False;
 
Index: samba-3.0.25rc2/source/script/installbin.sh.in
===================================================================
--- samba-3.0.25rc2.orig/source/script/installbin.sh.in	2007-04-24 11:07:00.734073097 +0200
+++ samba-3.0.25rc2/source/script/installbin.sh.in	2007-04-24 11:07:51.523951775 +0200
@@ -21,13 +21,15 @@
  chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
 
  # this is a special case, mount needs this in a specific location
- if [ $p2 = smbmount ]; then
-   if [ ! -d $DESTDIR/@rootsbindir@ ]; then
-      mkdir $DESTDIR/@rootsbindir@
-   fi
-   echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
-   ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/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/@rootsbindir@ ]; then
+ #     mkdir $DESTDIR/@rootsbindir@
+ #  fi
+ #  echo "Creating sym link $DESTDIR/@rootsbindir@/mount.smbfs to $BINDIR/$p2 "
+ #  ln -sf $BINDIR/$p2 $DESTDIR/@rootsbindir@/mount.smbfs
+ # fi
 done