[Pkg-samba-maint] r1323 - trunk/samba/debian/patches

[Christian Perrier]

Author: bubulle
Date: 2007-04-10 07:38:30 +0000 (Tue, 10 Apr 2007)
New Revision: 1323

Modified:
   trunk/samba/debian/patches/samba.patch
Log:
Modified for 3.0.25rc1


Modified: trunk/samba/debian/patches/samba.patch
===================================================================
--- trunk/samba/debian/patches/samba.patch	2007-04-10 07:36:36 UTC (rev 1322)
+++ trunk/samba/debian/patches/samba.patch	2007-04-10 07:38:30 UTC (rev 1323)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/client/smbmount.c
+Index: samba-3.0.25rc1/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23c.orig/source/client/smbmount.c	2006-09-02 10:08:46.104559928 +0200
-+++ samba-3.0.23c/source/client/smbmount.c	2006-09-02 10:09:30.072915188 +0200
-@@ -767,7 +767,7 @@
+--- samba-3.0.25rc1.orig/source/client/smbmount.c	2007-03-01 05:55:16.000000000 +0100
++++ samba-3.0.25rc1/source/client/smbmount.c	2007-04-10 09:36:52.574664241 +0200
+@@ -768,7 +768,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
  					got_pass = True;
@@ -11,7 +11,7 @@
  				}
  				if ((lp=strchr_m(username,'/'))) {
  					*lp = 0;
-@@ -777,7 +777,7 @@
+@@ -778,7 +778,7 @@
  				  !strcmp(opts, "password")) {
  				pstrcpy(password,opteq+1);
  				got_pass = True;
@@ -20,7 +20,7 @@
  			} else if(!strcmp(opts, "credentials")) {
  				pstrcpy(credentials,opteq+1);
  			} else if(!strcmp(opts, "netbiosname")) {
-@@ -893,7 +893,7 @@
+@@ -892,7 +892,7 @@
  			*p = 0;
  			pstrcpy(password,p+1);
  			got_pass = True;
@@ -29,22 +29,22 @@
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.23c/source/web/diagnose.c
+Index: samba-3.0.25rc1/source/web/diagnose.c
 ===================================================================
---- samba-3.0.23c.orig/source/web/diagnose.c	2006-09-02 10:08:46.136560187 +0200
-+++ samba-3.0.23c/source/web/diagnose.c	2006-09-02 10:09:30.072915188 +0200
+--- samba-3.0.25rc1.orig/source/web/diagnose.c	2007-03-01 05:54:42.000000000 +0100
++++ samba-3.0.25rc1/source/web/diagnose.c	2007-04-10 09:38:09.619297657 +0200
 @@ -62,6 +62,7 @@
  {
- 	static struct cli_state cli;
+ 	struct cli_state *cli;
  
-+	loopback_ip.s_addr = htonl((127 << 24) + 1);
- 	if (!cli_initialise(&cli))
++ 	loopback_ip.s_addr = htonl((127 << 24) + 1);
+ 	if ((cli = cli_initialise()) == NULL)
  		return False;
  
-Index: samba-3.0.23c/source/script/installbin.sh.in
+Index: samba-3.0.25rc1/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.23c.orig/source/script/installbin.sh.in	2006-09-02 10:08:46.188560607 +0200
-+++ samba-3.0.23c/source/script/installbin.sh.in	2006-09-02 10:09:30.072915188 +0200
+--- samba-3.0.25rc1.orig/source/script/installbin.sh.in	2006-06-13 03:52:17.000000000 +0200
++++ samba-3.0.25rc1/source/script/installbin.sh.in	2007-04-10 09:36:52.714665393 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2