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

Christian Perrier bubulle at alioth.debian.org
Tue Apr 10 08:03:00 UTC 2007 

Author: bubulle
Date: 2007-04-10 08:02:59 +0000 (Tue, 10 Apr 2007)
New Revision: 1327

Modified:
   trunk/samba/debian/patches/README_nosmbldap-tools.patch
   trunk/samba/debian/patches/VERSION.patch
   trunk/samba/debian/patches/adapt_machine_creation_script.patch
   trunk/samba/debian/patches/cups.patch
   trunk/samba/debian/patches/documentation.patch
   trunk/samba/debian/patches/fhs.patch
   trunk/samba/debian/patches/installswat.sh.patch
   trunk/samba/debian/patches/make-distclean.patch
   trunk/samba/debian/patches/nmbd-signalling.patch
   trunk/samba/debian/patches/non-linux-ports.patch
   trunk/samba/debian/patches/pam-examples.patch
   trunk/samba/debian/patches/python-examples.patch
   trunk/samba/debian/patches/samba.patch
   trunk/samba/debian/patches/smbclient-pager.patch
   trunk/samba/debian/patches/smbmount-mtab-flags.patch
   trunk/samba/debian/patches/smbmount-nomtab.patch
   trunk/samba/debian/patches/smbmount-unix-caps.patch
   trunk/samba/debian/patches/smbstatus-locking.patch
   trunk/samba/debian/patches/undefined-symbols.patch
Log:
Refresh all patches for 3.0.25rc1
(just running "quilt push ; quilt refresh")


Modified: trunk/samba/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/samba/debian/patches/README_nosmbldap-tools.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/README_nosmbldap-tools.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/examples/LDAP/README
+Index: samba-3.0.25rc1/examples/LDAP/README
 ===================================================================
---- samba-3.0.23c.orig/examples/LDAP/README	2006-09-02 10:08:46.316561641 +0200
-+++ samba-3.0.23c/examples/LDAP/README	2006-09-02 10:09:29.340909275 +0200
+--- samba-3.0.25rc1.orig/examples/LDAP/README	2007-04-10 10:00:42.034393866 +0200
++++ samba-3.0.25rc1/examples/LDAP/README	2007-04-10 10:01:42.318891757 +0200
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/

Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/VERSION.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/VERSION
+Index: samba-3.0.25rc1/source/VERSION
 ===================================================================
---- samba-3.0.23c.orig/source/VERSION	2006-09-02 10:08:44.848549777 +0200
-+++ samba-3.0.23c/source/VERSION	2006-09-02 10:09:35.448958614 +0200
-@@ -96,5 +96,5 @@
+--- samba-3.0.25rc1.orig/source/VERSION	2007-04-10 10:00:40.998385301 +0200
++++ samba-3.0.25rc1/source/VERSION	2007-04-10 10:01:45.634919119 +0200
+@@ -95,5 +95,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
  ########################################################

Modified: trunk/samba/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/samba/debian/patches/adapt_machine_creation_script.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/adapt_machine_creation_script.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -5,8 +5,8 @@
 
 Index: samba-3.0.25rc1/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/smb.conf.5	2007-04-09 19:47:39.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/smb.conf.5	2007-04-10 09:48:33.664382470 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/smb.conf.5	2007-04-10 10:00:40.906384541 +0200
++++ samba-3.0.25rc1/docs/manpages/smb.conf.5	2007-04-10 10:01:46.018922287 +0200
 @@ -542,7 +542,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 

Modified: trunk/samba/debian/patches/cups.patch
===================================================================
--- trunk/samba/debian/patches/cups.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/cups.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/include/includes.h
+Index: samba-3.0.25rc1/source/include/includes.h
 ===================================================================
---- samba-3.0.23c.orig/source/include/includes.h	2006-09-02 10:08:49.224585143 +0200
-+++ samba-3.0.23c/source/include/includes.h	2006-09-02 10:09:13.060777752 +0200
-@@ -1084,10 +1084,7 @@
+--- samba-3.0.25rc1.orig/source/include/includes.h	2007-04-10 10:00:44.158411423 +0200
++++ samba-3.0.25rc1/source/include/includes.h	2007-04-10 10:01:36.746845773 +0200
+@@ -809,10 +809,7 @@
  #endif
  
  #ifndef DEFAULT_PRINTING

Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/documentation.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
 Index: samba-3.0.25rc1/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/swat.8	2007-04-09 19:48:06.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/swat.8	2007-04-10 09:09:22.505402093 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/swat.8	2007-04-10 10:00:43.970409869 +0200
++++ samba-3.0.25rc1/docs/manpages/swat.8	2007-04-10 10:01:38.014856238 +0200
 @@ -81,51 +81,6 @@
  \-h|\-\-help
  Print a summary of command line options\&.
@@ -67,8 +67,8 @@
  
 Index: samba-3.0.25rc1/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/nmbd.8	2007-04-09 19:47:22.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/nmbd.8	2007-04-10 09:07:58.964761675 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/nmbd.8	2007-04-10 10:00:43.986410001 +0200
++++ samba-3.0.25rc1/docs/manpages/nmbd.8	2007-04-10 10:01:38.018856271 +0200
 @@ -74,7 +74,7 @@
  \-H <filename>
  NetBIOS lmhosts file\&. The lmhosts file is a list of NetBIOS names to IP addresses that is loaded by the nmbd server and used via the name resolution mechanism name resolve order described in \fBsmb\&.conf\fR(5) to resolve any NetBIOS name queries needed by the server\&. Note that the contents of this file are \fBNOT\fR used by \fBnmbd\fR to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host \fBONLY\fR\&.
@@ -100,8 +100,8 @@
  The debug log level of nmbd may be raised or lowered using \fBsmbcontrol\fR(1) (SIGUSR[1|2] signals are no longer used since Samba 2\&.2)\&. This is to allow transient problems to be diagnosed, whilst still running at a normally low log level\&.
 Index: samba-3.0.25rc1/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/smbd.8	2007-04-09 19:47:44.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/smbd.8	2007-04-10 09:04:41.163247187 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/smbd.8	2007-04-10 10:00:43.998410101 +0200
++++ samba-3.0.25rc1/docs/manpages/smbd.8	2007-04-10 10:01:38.042856469 +0200
 @@ -119,8 +119,8 @@
  If running the server via the meta\-daemon \fBinetd\fR, this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
  
@@ -115,8 +115,8 @@
  
 Index: samba-3.0.25rc1/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/lmhosts.5	2007-04-09 19:47:16.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/lmhosts.5	2007-04-10 09:03:13.458576726 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/lmhosts.5	2007-04-10 10:00:44.010410200 +0200
++++ samba-3.0.25rc1/docs/manpages/lmhosts.5	2007-04-10 10:01:38.102856965 +0200
 @@ -75,7 +75,7 @@
  .SH "FILES"
  
@@ -128,8 +128,8 @@
  
 Index: samba-3.0.25rc1/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/ntlm_auth.1	2007-04-09 19:47:26.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/ntlm_auth.1	2007-04-10 09:02:20.382171373 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/ntlm_auth.1	2007-04-10 10:00:44.018410266 +0200
++++ samba-3.0.25rc1/docs/manpages/ntlm_auth.1	2007-04-10 10:01:38.126857163 +0200
 @@ -42,7 +42,7 @@
  The \fBwinbindd\fR(8) daemon must be operational for many of these commands to function\&.
  
@@ -159,8 +159,8 @@
  gss\-spnego\-client
 Index: samba-3.0.25rc1/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/tdbbackup.8	2007-04-09 19:48:08.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/tdbbackup.8	2007-04-10 09:01:04.301590927 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/tdbbackup.8	2007-04-10 10:00:44.038410431 +0200
++++ samba-3.0.25rc1/docs/manpages/tdbbackup.8	2007-04-10 10:01:38.158857427 +0200
 @@ -72,13 +72,13 @@
  
  .TP 3
@@ -180,8 +180,8 @@
  .SH "VERSION"
 Index: samba-3.0.25rc1/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25rc1.orig/docs/manpages/winbindd.8	2007-04-09 19:48:45.000000000 +0200
-+++ samba-3.0.25rc1/docs/manpages/winbindd.8	2007-04-10 08:58:44.608527331 +0200
+--- samba-3.0.25rc1.orig/docs/manpages/winbindd.8	2007-04-10 10:00:44.054410563 +0200
++++ samba-3.0.25rc1/docs/manpages/winbindd.8	2007-04-10 10:01:38.214857889 +0200
 @@ -308,19 +308,19 @@
  The UNIX pipe over which clients communicate with the \fBwinbindd\fR program\&. For security reasons, the winbind client will only attempt to connect to the winbindd daemon if both the \fI/tmp/\&.winbindd\fR directory and \fI/tmp/\&.winbindd/pipe\fR file are owned by root\&.
  

Modified: trunk/samba/debian/patches/fhs.patch
===================================================================
--- trunk/samba/debian/patches/fhs.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/fhs.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
 Index: samba-3.0.25rc1/source/Makefile.in
 ===================================================================
---- samba-3.0.25rc1.orig/source/Makefile.in	2007-04-09 19:31:00.000000000 +0200
-+++ samba-3.0.25rc1/source/Makefile.in	2007-04-10 09:10:27.397903141 +0200
+--- samba-3.0.25rc1.orig/source/Makefile.in	2007-04-10 10:00:43.470405736 +0200
++++ samba-3.0.25rc1/source/Makefile.in	2007-04-10 10:01:38.710861982 +0200
 @@ -105,6 +105,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -40,8 +40,8 @@
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
 Index: samba-3.0.25rc1/source/configure.in
 ===================================================================
---- samba-3.0.25rc1.orig/source/configure.in	2007-04-09 19:31:00.000000000 +0200
-+++ samba-3.0.25rc1/source/configure.in	2007-04-10 09:10:27.633904966 +0200
+--- samba-3.0.25rc1.orig/source/configure.in	2007-04-10 10:00:43.478405802 +0200
++++ samba-3.0.25rc1/source/configure.in	2007-04-10 10:01:38.742862246 +0200
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -74,8 +74,8 @@
  
 Index: samba-3.0.25rc1/source/dynconfig.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/dynconfig.c	2006-06-09 21:30:32.000000000 +0200
-+++ samba-3.0.25rc1/source/dynconfig.c	2007-04-10 09:10:27.677905306 +0200
+--- samba-3.0.25rc1.orig/source/dynconfig.c	2007-04-10 10:00:43.502406001 +0200
++++ samba-3.0.25rc1/source/dynconfig.c	2007-04-10 10:01:38.790862643 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -120,8 +120,8 @@
 +}
 Index: samba-3.0.25rc1/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.25rc1.orig/source/include/dynconfig.h	2006-06-09 21:30:31.000000000 +0200
-+++ samba-3.0.25rc1/source/include/dynconfig.h	2007-04-10 09:10:27.733905739 +0200
+--- samba-3.0.25rc1.orig/source/include/dynconfig.h	2007-04-10 10:00:43.534406265 +0200
++++ samba-3.0.25rc1/source/include/dynconfig.h	2007-04-10 10:01:38.818862874 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -137,8 +137,8 @@
 +char *dyn_CACHEDIR(void);
 Index: samba-3.0.25rc1/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/intl/lang_tdb.c	2007-03-01 05:54:31.000000000 +0100
-+++ samba-3.0.25rc1/source/intl/lang_tdb.c	2007-04-10 09:10:27.761905955 +0200
+--- samba-3.0.25rc1.orig/source/intl/lang_tdb.c	2007-04-10 10:00:43.558406463 +0200
++++ samba-3.0.25rc1/source/intl/lang_tdb.c	2007-04-10 10:01:38.842863072 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -150,8 +150,8 @@
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
 Index: samba-3.0.25rc1/source/lib/util.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/lib/util.c	2007-04-09 19:30:57.000000000 +0200
-+++ samba-3.0.25rc1/source/lib/util.c	2007-04-10 09:10:27.793906203 +0200
+--- samba-3.0.25rc1.orig/source/lib/util.c	2007-04-10 10:00:43.574406596 +0200
++++ samba-3.0.25rc1/source/lib/util.c	2007-04-10 10:01:38.874863336 +0200
 @@ -2618,6 +2618,61 @@
  }
  
@@ -216,8 +216,8 @@
   * @retval Pointer to a static #fstring containing the extension.
 Index: samba-3.0.25rc1/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/lib/util_unistr.c	2007-03-01 05:54:30.000000000 +0100
-+++ samba-3.0.25rc1/source/lib/util_unistr.c	2007-04-10 09:14:06.155593512 +0200
+--- samba-3.0.25rc1.orig/source/lib/util_unistr.c	2007-04-10 10:00:43.586406695 +0200
++++ samba-3.0.25rc1/source/lib/util_unistr.c	2007-04-10 10:01:38.902863567 +0200
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -243,8 +243,8 @@
  		mapped_file = 1;
 Index: samba-3.0.25rc1/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/libsmb/samlogon_cache.c	2007-04-09 19:30:58.000000000 +0200
-+++ samba-3.0.25rc1/source/libsmb/samlogon_cache.c	2007-04-10 09:16:44.392815437 +0200
+--- samba-3.0.25rc1.orig/source/libsmb/samlogon_cache.c	2007-04-10 10:00:43.618406959 +0200
++++ samba-3.0.25rc1/source/libsmb/samlogon_cache.c	2007-04-10 10:01:38.958864029 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -265,8 +265,8 @@
  		if (!tdb) {
 Index: samba-3.0.25rc1/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/nmbd/nmbd_serverlistdb.c	2006-07-10 18:27:52.000000000 +0200
-+++ samba-3.0.25rc1/source/nmbd/nmbd_serverlistdb.c	2007-04-10 09:10:27.937907316 +0200
+--- samba-3.0.25rc1.orig/source/nmbd/nmbd_serverlistdb.c	2007-04-10 10:00:43.638407125 +0200
++++ samba-3.0.25rc1/source/nmbd/nmbd_serverlistdb.c	2007-04-10 10:01:38.990864293 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -278,8 +278,8 @@
  	pstrcat(fname,SERVER_LIST);
 Index: samba-3.0.25rc1/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/nmbd/nmbd_winsserver.c	2007-03-01 05:54:45.000000000 +0100
-+++ samba-3.0.25rc1/source/nmbd/nmbd_winsserver.c	2007-04-10 09:10:27.965907532 +0200
+--- samba-3.0.25rc1.orig/source/nmbd/nmbd_winsserver.c	2007-04-10 10:00:43.650407224 +0200
++++ samba-3.0.25rc1/source/nmbd/nmbd_winsserver.c	2007-04-10 10:01:39.018864524 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -300,8 +300,8 @@
  
 Index: samba-3.0.25rc1/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/passdb/login_cache.c	2007-03-01 05:54:42.000000000 +0100
-+++ samba-3.0.25rc1/source/passdb/login_cache.c	2007-04-10 09:10:27.989907718 +0200
+--- samba-3.0.25rc1.orig/source/passdb/login_cache.c	2007-04-10 10:00:43.670407389 +0200
++++ samba-3.0.25rc1/source/passdb/login_cache.c	2007-04-10 10:01:39.046864755 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -313,8 +313,8 @@
  	else {
 Index: samba-3.0.25rc1/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/nsswitch/winbindd_cache.c	2007-03-01 05:54:16.000000000 +0100
-+++ samba-3.0.25rc1/source/nsswitch/winbindd_cache.c	2007-04-10 09:10:28.037908089 +0200
+--- samba-3.0.25rc1.orig/source/nsswitch/winbindd_cache.c	2007-04-10 10:00:43.702407654 +0200
++++ samba-3.0.25rc1/source/nsswitch/winbindd_cache.c	2007-04-10 10:01:39.078865019 +0200
 @@ -2130,7 +2130,7 @@
  		return True;
  
@@ -335,8 +335,8 @@
  				O_RDWR|O_CREAT, 0600);
 Index: samba-3.0.25rc1/source/param/loadparm.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/param/loadparm.c	2007-03-21 21:56:14.000000000 +0100
-+++ samba-3.0.25rc1/source/param/loadparm.c	2007-04-10 09:10:28.145908924 +0200
+--- samba-3.0.25rc1.orig/source/param/loadparm.c	2007-04-10 10:00:43.754408084 +0200
++++ samba-3.0.25rc1/source/param/loadparm.c	2007-04-10 10:01:39.110865283 +0200
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -363,8 +363,8 @@
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
 Index: samba-3.0.25rc1/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/passdb/secrets.c	2007-03-01 05:54:41.000000000 +0100
-+++ samba-3.0.25rc1/source/passdb/secrets.c	2007-04-10 09:10:28.177909171 +0200
+--- samba-3.0.25rc1.orig/source/passdb/secrets.c	2007-04-10 10:00:43.678407455 +0200
++++ samba-3.0.25rc1/source/passdb/secrets.c	2007-04-10 10:01:39.162865713 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -377,8 +377,8 @@
  
 Index: samba-3.0.25rc1/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/printing/nt_printing.c	2007-03-20 23:25:37.000000000 +0100
-+++ samba-3.0.25rc1/source/printing/nt_printing.c	2007-04-10 09:10:28.217909480 +0200
+--- samba-3.0.25rc1.orig/source/printing/nt_printing.c	2007-04-10 10:00:43.766408183 +0200
++++ samba-3.0.25rc1/source/printing/nt_printing.c	2007-04-10 10:01:39.194865977 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -425,8 +425,8 @@
  
 Index: samba-3.0.25rc1/source/printing/printing.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/printing/printing.c	2007-03-01 05:54:09.000000000 +0100
-+++ samba-3.0.25rc1/source/printing/printing.c	2007-04-10 09:10:28.249909728 +0200
+--- samba-3.0.25rc1.orig/source/printing/printing.c	2007-04-10 10:00:43.778408282 +0200
++++ samba-3.0.25rc1/source/printing/printing.c	2007-04-10 10:01:39.218866175 +0200
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -440,8 +440,8 @@
  	/* handle a Samba upgrade */
 Index: samba-3.0.25rc1/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/printing/printing_db.c	2006-06-23 15:16:50.000000000 +0200
-+++ samba-3.0.25rc1/source/printing/printing_db.c	2007-04-10 09:10:28.277909944 +0200
+--- samba-3.0.25rc1.orig/source/printing/printing_db.c	2007-04-10 10:00:43.798408447 +0200
++++ samba-3.0.25rc1/source/printing/printing_db.c	2007-04-10 10:01:39.246866406 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -453,8 +453,8 @@
  
 Index: samba-3.0.25rc1/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/smbd/lanman.c	2007-04-09 19:30:56.000000000 +0200
-+++ samba-3.0.25rc1/source/smbd/lanman.c	2007-04-10 09:10:28.313910223 +0200
+--- samba-3.0.25rc1.orig/source/smbd/lanman.c	2007-04-10 10:00:43.818408613 +0200
++++ samba-3.0.25rc1/source/smbd/lanman.c	2007-04-10 10:01:39.278866670 +0200
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -469,8 +469,8 @@
  
 Index: samba-3.0.25rc1/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/registry/reg_db.c	2007-03-01 05:55:05.000000000 +0100
-+++ samba-3.0.25rc1/source/registry/reg_db.c	2007-04-10 09:10:28.409910965 +0200
+--- samba-3.0.25rc1.orig/source/registry/reg_db.c	2007-04-10 10:00:43.854408910 +0200
++++ samba-3.0.25rc1/source/registry/reg_db.c	2007-04-10 10:01:39.306866901 +0200
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -503,8 +503,8 @@
  	unbecome_root();
 Index: samba-3.0.25rc1/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/lib/account_pol.c	2007-03-01 05:54:30.000000000 +0100
-+++ samba-3.0.25rc1/source/lib/account_pol.c	2007-04-10 09:15:41.576330435 +0200
+--- samba-3.0.25rc1.orig/source/lib/account_pol.c	2007-04-10 10:00:43.598406794 +0200
++++ samba-3.0.25rc1/source/lib/account_pol.c	2007-04-10 10:01:39.362867363 +0200
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -519,8 +519,8 @@
  			return False;
 Index: samba-3.0.25rc1/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/registry/reg_perfcount.c	2007-03-01 05:55:05.000000000 +0100
-+++ samba-3.0.25rc1/source/registry/reg_perfcount.c	2007-04-10 09:10:28.469911429 +0200
+--- samba-3.0.25rc1.orig/source/registry/reg_perfcount.c	2007-04-10 10:00:43.866409009 +0200
++++ samba-3.0.25rc1/source/registry/reg_perfcount.c	2007-04-10 10:01:39.390867594 +0200
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -541,8 +541,8 @@
  	
 Index: samba-3.0.25rc1/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/rpc_server/srv_eventlog_lib.c	2007-03-01 05:54:40.000000000 +0100
-+++ samba-3.0.25rc1/source/rpc_server/srv_eventlog_lib.c	2007-04-10 09:10:28.509911738 +0200
+--- samba-3.0.25rc1.orig/source/rpc_server/srv_eventlog_lib.c	2007-04-10 10:00:43.882409142 +0200
++++ samba-3.0.25rc1/source/rpc_server/srv_eventlog_lib.c	2007-04-10 10:01:39.418867825 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -563,8 +563,8 @@
  	
 Index: samba-3.0.25rc1/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/passdb/pdb_tdb.c	2007-03-01 05:54:41.000000000 +0100
-+++ samba-3.0.25rc1/source/passdb/pdb_tdb.c	2007-04-10 09:10:28.537911954 +0200
+--- samba-3.0.25rc1.orig/source/passdb/pdb_tdb.c	2007-04-10 10:00:43.690407555 +0200
++++ samba-3.0.25rc1/source/passdb/pdb_tdb.c	2007-04-10 10:01:39.450868089 +0200
 @@ -1623,7 +1623,7 @@
  	/* save the path for later */
  			   
@@ -576,8 +576,8 @@
  	pstrcpy( tdbsam_filename, pfile );
 Index: samba-3.0.25rc1/source/groupdb/mapping_tdb.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/groupdb/mapping_tdb.c	2007-04-10 09:19:49.530263850 +0200
-+++ samba-3.0.25rc1/source/groupdb/mapping_tdb.c	2007-04-10 09:20:04.122379041 +0200
+--- samba-3.0.25rc1.orig/source/groupdb/mapping_tdb.c	2007-04-10 10:00:43.522406166 +0200
++++ samba-3.0.25rc1/source/groupdb/mapping_tdb.c	2007-04-10 10:01:39.478868320 +0200
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -589,8 +589,8 @@
  		return False;
 Index: samba-3.0.25rc1/source/nsswitch/idmap_tdb.c
 ===================================================================
---- samba-3.0.25rc1.orig/source/nsswitch/idmap_tdb.c	2007-04-10 09:21:05.450862753 +0200
-+++ samba-3.0.25rc1/source/nsswitch/idmap_tdb.c	2007-04-10 09:21:33.159081077 +0200
+--- samba-3.0.25rc1.orig/source/nsswitch/idmap_tdb.c	2007-04-10 10:00:43.734407918 +0200
++++ samba-3.0.25rc1/source/nsswitch/idmap_tdb.c	2007-04-10 10:01:39.506868552 +0200
 @@ -247,7 +247,7 @@
  	}
  

Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/installswat.sh.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/script/installswat.sh
+Index: samba-3.0.25rc1/source/script/installswat.sh
 ===================================================================
---- samba-3.0.23c.orig/source/script/installswat.sh	2006-09-02 10:08:47.448570790 +0200
-+++ samba-3.0.23c/source/script/installswat.sh	2006-09-02 10:09:19.024825937 +0200
-@@ -194,7 +194,11 @@
+--- samba-3.0.25rc1.orig/source/script/installswat.sh	2007-04-10 10:00:42.510397800 +0200
++++ samba-3.0.25rc1/source/script/installswat.sh	2007-04-10 10:01:40.362875616 +0200
+@@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)
  

Modified: trunk/samba/debian/patches/make-distclean.patch
===================================================================
--- trunk/samba/debian/patches/make-distclean.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/make-distclean.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/Makefile.in
+Index: samba-3.0.25rc1/source/Makefile.in
 ===================================================================
---- samba-3.0.23c.orig/source/Makefile.in	2006-09-02 10:09:15.160794719 +0200
-+++ samba-3.0.23c/source/Makefile.in	2006-09-02 10:09:19.872832788 +0200
-@@ -1521,6 +1521,7 @@
+--- samba-3.0.25rc1.orig/source/Makefile.in	2007-04-10 10:01:38.710861982 +0200
++++ samba-3.0.25rc1/source/Makefile.in	2007-04-10 10:01:40.754878851 +0200
+@@ -1678,6 +1678,7 @@
  
  python_clean:
  	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -10,7 +10,7 @@
  
  # revert to the previously installed version
  revert:
-@@ -1698,6 +1699,7 @@
+@@ -1866,6 +1867,7 @@
  
  distclean: realclean
  	-rm -f include/stamp-h

Modified: trunk/samba/debian/patches/nmbd-signalling.patch
===================================================================
--- trunk/samba/debian/patches/nmbd-signalling.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/nmbd-signalling.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.25rc1/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- samba-3.0.23c.orig/source/nmbd/nmbd_subnetdb.c	2006-09-02 10:08:46.896566329 +0200
-+++ samba-3.0.23c/source/nmbd/nmbd_subnetdb.c	2006-09-02 10:09:20.660839154 +0200
+--- samba-3.0.25rc1.orig/source/nmbd/nmbd_subnetdb.c	2007-04-10 10:00:42.258395717 +0200
++++ samba-3.0.25rc1/source/nmbd/nmbd_subnetdb.c	2007-04-10 10:01:41.138882019 +0200
 @@ -185,12 +185,16 @@
  	struct in_addr unicast_ip, ipzero;
  

Modified: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/non-linux-ports.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/configure.in
+Index: samba-3.0.25rc1/source/configure.in
 ===================================================================
---- samba-3.0.23c.orig/source/configure.in	2006-09-02 10:09:15.180794880 +0200
-+++ samba-3.0.23c/source/configure.in	2006-09-02 10:09:21.456845584 +0200
-@@ -755,6 +755,15 @@
+--- samba-3.0.25rc1.orig/source/configure.in	2007-04-10 10:01:38.742862246 +0200
++++ samba-3.0.25rc1/source/configure.in	2007-04-10 10:01:41.538885320 +0200
+@@ -757,6 +757,15 @@
        fi
      ;;
  
@@ -18,16 +18,16 @@
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1409,7 +1418,7 @@
- # 
+@@ -1379,7 +1388,7 @@
  #
+ #
  case "$host_os" in
 -    *linux*)
 +    linux*-gnu* | gnu* | k*bsd*-gnu)
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1661,7 +1670,10 @@
+@@ -1680,7 +1689,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -38,8 +38,8 @@
 +			esac
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
- 				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined" 
-@@ -5028,7 +5040,7 @@
+ 				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
+@@ -5376,7 +5388,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -48,17 +48,17 @@
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5291,10 +5303,10 @@
- WINBIND_NSS_LDSHFLAGS=$LDSHFLAGS
+@@ -5681,11 +5693,11 @@
+ SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
  
  case "$host_os" in
 -	*linux*)
 +	linux*-gnu* | gnu* | k*bsd*-gnu)
-		NSSSONAMEVERSIONSUFFIX=".2"
+ 		NSSSONAMEVERSIONSUFFIX=".2"
  		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
  		;;
 -	*freebsd[[5-9]]*)
 +	freebsd5*|*freebsd[[6-9]]*)
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
-		NSSSONAMEVERSIONSUFFIX=".1"
+ 		NSSSONAMEVERSIONSUFFIX=".1"

Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/pam-examples.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/source/pam_smbpass/README
+Index: samba-3.0.25rc1/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.23c.orig/source/pam_smbpass/README	2006-09-02 10:08:46.444562676 +0200
-+++ samba-3.0.23c/source/pam_smbpass/README	2006-09-02 10:09:22.952857670 +0200
+--- samba-3.0.25rc1.orig/source/pam_smbpass/README	2007-04-10 10:00:42.110394494 +0200
++++ samba-3.0.25rc1/source/pam_smbpass/README	2007-04-10 10:01:41.934888588 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Modified: trunk/samba/debian/patches/python-examples.patch
===================================================================
--- trunk/samba/debian/patches/python-examples.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/python-examples.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,17 +1,17 @@
-Index: samba-3.0.23c/source/python/examples/tdbpack/tdbtimetrial.py
+Index: samba-3.0.25rc1/source/python/examples/tdbpack/tdbtimetrial.py
 ===================================================================
---- samba-3.0.23c.orig/source/python/examples/tdbpack/tdbtimetrial.py	2006-09-02 10:08:44.380545994 +0200
-+++ samba-3.0.23c/source/python/examples/tdbpack/tdbtimetrial.py	2006-09-02 10:09:38.884986367 +0200
+--- samba-3.0.25rc1.orig/source/python/examples/tdbpack/tdbtimetrial.py	2007-04-10 10:00:40.790383582 +0200
++++ samba-3.0.25rc1/source/python/examples/tdbpack/tdbtimetrial.py	2007-04-10 10:01:46.426925654 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python2.2
 +#! /usr/bin/python
  
  def run_trial():
      # import tdbutil
-Index: samba-3.0.23c/source/python/examples/tdbpack/test_tdbpack.py
+Index: samba-3.0.25rc1/source/python/examples/tdbpack/test_tdbpack.py
 ===================================================================
---- samba-3.0.23c.orig/source/python/examples/tdbpack/test_tdbpack.py	2006-09-02 10:08:44.428546382 +0200
-+++ samba-3.0.23c/source/python/examples/tdbpack/test_tdbpack.py	2006-09-02 10:09:38.884986367 +0200
+--- samba-3.0.25rc1.orig/source/python/examples/tdbpack/test_tdbpack.py	2007-04-10 10:00:40.806383714 +0200
++++ samba-3.0.25rc1/source/python/examples/tdbpack/test_tdbpack.py	2007-04-10 10:01:46.462925951 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python2.2
 +#! /usr/bin/env python

Modified: trunk/samba/debian/patches/samba.patch
===================================================================
--- trunk/samba/debian/patches/samba.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/samba.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
 Index: samba-3.0.25rc1/source/client/smbmount.c
 ===================================================================
---- 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
+--- samba-3.0.25rc1.orig/source/client/smbmount.c	2007-04-10 10:00:41.914392874 +0200
++++ samba-3.0.25rc1/source/client/smbmount.c	2007-04-10 10:01:42.722895091 +0200
 @@ -768,7 +768,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -31,8 +31,8 @@
  	}
 Index: samba-3.0.25rc1/source/web/diagnose.c
 ===================================================================
---- 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
+--- samba-3.0.25rc1.orig/source/web/diagnose.c	2007-04-10 10:00:41.926392973 +0200
++++ samba-3.0.25rc1/source/web/diagnose.c	2007-04-10 10:01:42.726895124 +0200
 @@ -62,6 +62,7 @@
  {
  	struct cli_state *cli;
@@ -43,8 +43,8 @@
  
 Index: samba-3.0.25rc1/source/script/installbin.sh.in
 ===================================================================
---- 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
+--- samba-3.0.25rc1.orig/source/script/installbin.sh.in	2007-04-10 10:00:41.942393105 +0200
++++ samba-3.0.25rc1/source/script/installbin.sh.in	2007-04-10 10:01:42.762895421 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  

Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/smbclient-pager.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/source/include/local.h
+Index: samba-3.0.25rc1/source/include/local.h
 ===================================================================
---- samba-3.0.23c.orig/source/include/local.h	2006-09-02 10:08:45.912558376 +0200
-+++ samba-3.0.23c/source/include/local.h	2006-09-02 10:09:30.884921747 +0200
+--- samba-3.0.25rc1.orig/source/include/local.h	2007-04-10 10:00:41.754391551 +0200
++++ samba-3.0.25rc1/source/include/local.h	2007-04-10 10:01:43.182898887 +0200
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */

Modified: trunk/samba/debian/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-mtab-flags.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/smbmount-mtab-flags.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/source/client/smbmnt.c
+Index: samba-3.0.25rc1/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23c.orig/source/client/smbmnt.c	2006-09-02 10:08:45.692556598 +0200
-+++ samba-3.0.23c/source/client/smbmnt.c	2006-09-02 10:09:31.684928210 +0200
+--- samba-3.0.25rc1.orig/source/client/smbmnt.c	2007-04-10 10:00:41.662390790 +0200
++++ samba-3.0.25rc1/source/client/smbmnt.c	2007-04-10 10:01:43.566902055 +0200
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;

Modified: trunk/samba/debian/patches/smbmount-nomtab.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-nomtab.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/smbmount-nomtab.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23c/source/client/smbmnt.c
+Index: samba-3.0.25rc1/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23c.orig/source/client/smbmnt.c	2006-09-02 10:09:31.684928210 +0200
-+++ samba-3.0.23c/source/client/smbmnt.c	2006-09-02 10:09:32.396933961 +0200
+--- samba-3.0.25rc1.orig/source/client/smbmnt.c	2007-04-10 10:01:43.566902055 +0200
++++ samba-3.0.25rc1/source/client/smbmnt.c	2007-04-10 10:01:43.950905224 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,11 +103,11 @@
  
  	return 0;
  }	
-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:09:30.072915188 +0200
-+++ samba-3.0.23c/source/client/smbmount.c	2006-09-02 10:09:32.432934252 +0200
-@@ -46,6 +46,7 @@
+--- samba-3.0.25rc1.orig/source/client/smbmount.c	2007-04-10 10:01:42.722895091 +0200
++++ samba-3.0.25rc1/source/client/smbmount.c	2007-04-10 10:01:43.998905620 +0200
+@@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
  static unsigned mount_dmask;
@@ -115,7 +115,7 @@
  static BOOL use_kerberos;
  /* TODO: Add code to detect smbfs version in kernel */
  static BOOL status32_smbfs = False;
-@@ -271,6 +272,9 @@
+@@ -273,6 +274,9 @@
                  return;
          }
  
@@ -125,7 +125,7 @@
          if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
                  DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
                  return;
-@@ -468,6 +472,9 @@
+@@ -470,6 +474,9 @@
  	args[i++] = "-s";
  	args[i++] = svc2;
  
@@ -135,7 +135,7 @@
  	if (mount_ro) {
  		args[i++] = "-r";
  	}
-@@ -663,7 +670,7 @@
+@@ -665,7 +672,7 @@
  ****************************************************************************/
  static void usage(void)
  {
@@ -144,7 +144,7 @@
  
  	printf("Version %s\n\n",SAMBA_VERSION_STRING);
  
-@@ -741,8 +748,13 @@
+@@ -742,8 +749,13 @@
  	argc -= 2;
  	argv += 2;
  

Modified: trunk/samba/debian/patches/smbmount-unix-caps.patch
===================================================================
--- trunk/samba/debian/patches/smbmount-unix-caps.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/smbmount-unix-caps.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -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:09:32.432934252 +0200
-+++ samba-3.0.23c/source/client/smbmount.c	2006-09-02 10:09:33.220940617 +0200
-@@ -211,6 +211,10 @@
+--- samba-3.0.25rc1.orig/source/client/smbmount.c	2007-04-10 10:01:43.998905620 +0200
++++ samba-3.0.25rc1/source/client/smbmount.c	2007-04-10 10:01:44.474909548 +0200
+@@ -213,6 +213,10 @@
    		c->capabilities &= ~CAP_STATUS32;
  		c->force_dos_errors = True;
  	}
@@ -11,5 +11,5 @@
 +	if (mount_uid || mount_gid || mount_fmask || mount_dmask)
 +		c->capabilities &= ~CAP_UNIX;
  
- 	if (!cli_session_setup(c, username, 
- 			       password, strlen(password),
+ 	if (!NT_STATUS_IS_OK(cli_session_setup(c, username, 
+ 					       password, strlen(password),

Modified: trunk/samba/debian/patches/smbstatus-locking.patch
===================================================================
--- trunk/samba/debian/patches/smbstatus-locking.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/smbstatus-locking.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23c/source/utils/status.c
+Index: samba-3.0.25rc1/source/utils/status.c
 ===================================================================
---- samba-3.0.23c.orig/source/utils/status.c	2006-09-02 10:08:45.104551846 +0200
-+++ samba-3.0.23c/source/utils/status.c	2006-09-02 10:09:33.940946433 +0200
-@@ -714,6 +714,16 @@
+--- samba-3.0.25rc1.orig/source/utils/status.c	2007-04-10 10:00:41.170386723 +0200
++++ samba-3.0.25rc1/source/utils/status.c	2007-04-10 10:01:44.854912683 +0200
+@@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;
  

Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch	2007-04-10 08:00:15 UTC (rev 1326)
+++ trunk/samba/debian/patches/undefined-symbols.patch	2007-04-10 08:02:59 UTC (rev 1327)
@@ -1,7 +1,7 @@
 Index: samba-3.0.25rc1/source/Makefile.in
 ===================================================================
---- samba-3.0.25rc1.orig/source/Makefile.in	2007-04-10 09:35:05.501779580 +0200
-+++ samba-3.0.25rc1/source/Makefile.in	2007-04-10 09:44:53.170594444 +0200
+--- samba-3.0.25rc1.orig/source/Makefile.in	2007-04-10 10:01:40.754878851 +0200
++++ samba-3.0.25rc1/source/Makefile.in	2007-04-10 10:01:45.246915918 +0200
 @@ -1158,7 +1158,7 @@
  
  bin/libsmbclient. at SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)

More information about the Pkg-samba-maint mailing list