Refresh patches for 3.0.25rc2

git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba/debian@1336 fc4039ab-9d04-0410-8cac-899223bdd6b0

18 files changed, 166 insertions, 166 deletions

diff --git a/patches/README_nosmbldap-tools.patch b/patches/README_nosmbldap-tools.patch
index 643f3641c6..eb75419cc0 100644
--- a/patches/README_nosmbldap-tools.patch
+++ b/patches/README_nosmbldap-tools.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/examples/LDAP/README
+Index: samba-3.0.25rc2/examples/LDAP/README
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/examples/LDAP/README	2007-04-24 11:07:00.794075484 +0200
++++ samba-3.0.25rc2/examples/LDAP/README	2007-04-24 11:07:50.515917059 +0200
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/
diff --git a/patches/VERSION.patch b/patches/VERSION.patch
index cb744f2304..cc420e8bad 100644
--- a/patches/VERSION.patch
+++ b/patches/VERSION.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/VERSION
+Index: samba-3.0.25rc2/source/VERSION
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/VERSION	2007-04-24 11:06:59.962042371 +0200
++++ samba-3.0.25rc2/source/VERSION	2007-04-24 11:07:56.384117797 +0200
 @@ -95,5 +95,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
diff --git a/patches/adapt_machine_creation_script.patch b/patches/adapt_machine_creation_script.patch
index 289b31582e..35c6c42325 100644
--- a/patches/adapt_machine_creation_script.patch
+++ b/patches/adapt_machine_creation_script.patch
@@ -3,10 +3,10 @@ Fixes: #346234
 
 Status wrt upstream: Debian specific
 
-Index: samba-3.0.25rc1/docs/manpages/smb.conf.5
+Index: samba-3.0.25rc2/docs/manpages/smb.conf.5
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/smb.conf.5	2007-04-24 11:06:59.846037741 +0200
++++ samba-3.0.25rc2/docs/manpages/smb.conf.5	2007-04-24 11:07:56.944136792 +0200
 @@ -542,7 +542,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 
diff --git a/patches/cups.patch b/patches/cups.patch
index 02df0e81e3..fa320de5c8 100644
--- a/patches/cups.patch
+++ b/patches/cups.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/include/includes.h
+Index: samba-3.0.25rc2/source/include/includes.h
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/include/includes.h	2007-04-24 11:07:02.626148126 +0200
++++ samba-3.0.25rc2/source/include/includes.h	2007-04-24 11:07:46.491777495 +0200
 @@ -809,10 +809,7 @@
  #endif
  
diff --git a/patches/documentation.patch b/patches/documentation.patch
index 47ec631a94..05d58be8aa 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/docs/manpages/swat.8
+Index: samba-3.0.25rc2/docs/manpages/swat.8
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/swat.8	2007-04-24 11:07:02.502143220 +0200
++++ samba-3.0.25rc2/docs/manpages/swat.8	2007-04-24 11:07:46.831789353 +0200
 @@ -81,51 +81,6 @@
  \-h|\-\-help
  Print a summary of command line options\&.
@@ -65,10 +65,10 @@ Index: samba-3.0.25rc1/docs/manpages/swat.8
  
  .SH "WARNINGS"
  
-Index: samba-3.0.25rc1/docs/manpages/nmbd.8
+Index: samba-3.0.25rc2/docs/manpages/nmbd.8
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/nmbd.8	2007-04-24 11:07:02.510143537 +0200
++++ samba-3.0.25rc2/docs/manpages/nmbd.8	2007-04-24 11:07:46.835789493 +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\&.
@@ -98,10 +98,10 @@ Index: samba-3.0.25rc1/docs/manpages/nmbd.8
  
  .PP
  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
+Index: samba-3.0.25rc2/docs/manpages/smbd.8
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/smbd.8	2007-04-24 11:07:02.518143853 +0200
++++ samba-3.0.25rc2/docs/manpages/smbd.8	2007-04-24 11:07:46.863790469 +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)\&.
  
@@ -113,10 +113,10 @@ Index: samba-3.0.25rc1/docs/manpages/smbd.8
  
  This file describes all the services the server is to make available to clients\&. See \fBsmb\&.conf\fR(5) for more information\&.
  
-Index: samba-3.0.25rc1/docs/manpages/lmhosts.5
+Index: samba-3.0.25rc2/docs/manpages/lmhosts.5
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/lmhosts.5	2007-04-24 11:07:02.526144170 +0200
++++ samba-3.0.25rc2/docs/manpages/lmhosts.5	2007-04-24 11:07:46.927792702 +0200
 @@ -75,7 +75,7 @@
  .SH "FILES"
  
@@ -126,10 +126,10 @@ Index: samba-3.0.25rc1/docs/manpages/lmhosts.5
  
  .SH "VERSION"
  
-Index: samba-3.0.25rc1/docs/manpages/ntlm_auth.1
+Index: samba-3.0.25rc2/docs/manpages/ntlm_auth.1
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/ntlm_auth.1	2007-04-24 11:07:02.534144486 +0200
++++ samba-3.0.25rc2/docs/manpages/ntlm_auth.1	2007-04-24 11:07:46.967794097 +0200
 @@ -42,7 +42,7 @@
  The \fBwinbindd\fR(8) daemon must be operational for many of these commands to function\&.
  
@@ -157,10 +157,10 @@ Index: samba-3.0.25rc1/docs/manpages/ntlm_auth.1
  
  .TP
  gss\-spnego\-client
-Index: samba-3.0.25rc1/docs/manpages/tdbbackup.8
+Index: samba-3.0.25rc2/docs/manpages/tdbbackup.8
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/tdbbackup.8	2007-04-24 11:07:02.550145119 +0200
++++ samba-3.0.25rc2/docs/manpages/tdbbackup.8	2007-04-24 11:07:46.999795213 +0200
 @@ -72,13 +72,13 @@
  
  .TP 3
@@ -178,10 +178,10 @@ Index: samba-3.0.25rc1/docs/manpages/tdbbackup.8
  .LP
  
  .SH "VERSION"
-Index: samba-3.0.25rc1/docs/manpages/winbindd.8
+Index: samba-3.0.25rc2/docs/manpages/winbindd.8
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/docs/manpages/winbindd.8	2007-04-24 11:07:02.562145594 +0200
++++ samba-3.0.25rc2/docs/manpages/winbindd.8	2007-04-24 11:07:47.035796465 +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\&.
  
diff --git a/patches/fhs.patch b/patches/fhs.patch
index b8ab749e06..e99b4bf342 100644
--- a/patches/fhs.patch
+++ b/patches/fhs.patch
@@ -1,8 +1,8 @@
-Index: samba-3.0.25rc1/source/Makefile.in
+Index: samba-3.0.25rc2/source/Makefile.in
 ===================================================================
---- 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 @@
+--- samba-3.0.25rc2.orig/source/Makefile.in	2007-04-24 11:07:02.194131035 +0200
++++ samba-3.0.25rc2/source/Makefile.in	2007-04-24 11:07:47.427810099 +0200
+@@ -106,6 +106,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
  
@@ -16,7 +16,7 @@ Index: samba-3.0.25rc1/source/Makefile.in
  # the directory where pid files go
  PIDDIR = @piddir@
  
-@@ -138,7 +145,7 @@
+@@ -139,7 +146,7 @@
  PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
  PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
  	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
@@ -25,7 +25,7 @@ Index: samba-3.0.25rc1/source/Makefile.in
  PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
  
  # Note that all executable programs now provide for an optional executable suffix.
-@@ -1603,10 +1610,10 @@
+@@ -1608,10 +1615,10 @@
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -38,10 +38,10 @@ Index: samba-3.0.25rc1/source/Makefile.in
  
  installswat: installdirs installmsg
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25rc1/source/configure.in
+Index: samba-3.0.25rc2/source/configure.in
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/configure.in	2007-04-24 11:07:02.202131352 +0200
++++ samba-3.0.25rc2/source/configure.in	2007-04-24 11:07:47.435810377 +0200
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -72,10 +72,10 @@ Index: samba-3.0.25rc1/source/configure.in
  AC_SUBST(rootsbindir)
  AC_SUBST(pammodulesdir)
  
-Index: samba-3.0.25rc1/source/dynconfig.c
+Index: samba-3.0.25rc2/source/dynconfig.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/dynconfig.c	2007-04-24 11:07:02.210131668 +0200
++++ samba-3.0.25rc2/source/dynconfig.c	2007-04-24 11:07:47.487812186 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -118,10 +118,10 @@ Index: samba-3.0.25rc1/source/dynconfig.c
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.25rc1/source/include/dynconfig.h
+Index: samba-3.0.25rc2/source/include/dynconfig.h
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/include/dynconfig.h	2007-04-24 11:07:02.222132143 +0200
++++ samba-3.0.25rc2/source/include/dynconfig.h	2007-04-24 11:07:47.515813159 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -135,10 +135,10 @@ Index: samba-3.0.25rc1/source/include/dynconfig.h
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
-Index: samba-3.0.25rc1/source/intl/lang_tdb.c
+Index: samba-3.0.25rc2/source/intl/lang_tdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/intl/lang_tdb.c	2007-04-24 11:07:02.238132776 +0200
++++ samba-3.0.25rc2/source/intl/lang_tdb.c	2007-04-24 11:07:47.539813994 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -148,10 +148,10 @@ Index: samba-3.0.25rc1/source/intl/lang_tdb.c
  	if (stat(msg_path, &st) != 0) {
  		/* the msg file isn't available */
  		DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path, 
-Index: samba-3.0.25rc1/source/lib/util.c
+Index: samba-3.0.25rc2/source/lib/util.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/lib/util.c	2007-04-24 11:07:02.246133092 +0200
++++ samba-3.0.25rc2/source/lib/util.c	2007-04-24 11:07:47.571815107 +0200
 @@ -2618,6 +2618,61 @@
  }
  
@@ -214,10 +214,10 @@ Index: samba-3.0.25rc1/source/lib/util.c
   * @brief Returns the platform specific shared library extension.
   *
   * @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.25rc1/source/lib/util_unistr.c
+Index: samba-3.0.25rc2/source/lib/util_unistr.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/lib/util_unistr.c	2007-04-24 11:07:02.254133409 +0200
++++ samba-3.0.25rc2/source/lib/util_unistr.c	2007-04-24 11:07:47.611816498 +0200
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -241,10 +241,10 @@ Index: samba-3.0.25rc1/source/lib/util_unistr.c
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.25rc1/source/libsmb/samlogon_cache.c
+Index: samba-3.0.25rc2/source/libsmb/samlogon_cache.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/libsmb/samlogon_cache.c	2007-04-24 11:07:02.270134042 +0200
++++ samba-3.0.25rc2/source/libsmb/samlogon_cache.c	2007-04-24 11:07:47.639817472 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -263,10 +263,10 @@ Index: samba-3.0.25rc1/source/libsmb/samlogon_cache.c
  				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
-Index: samba-3.0.25rc1/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.25rc2/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/nmbd/nmbd_serverlistdb.c	2007-04-24 11:07:02.278134358 +0200
++++ samba-3.0.25rc2/source/nmbd/nmbd_serverlistdb.c	2007-04-24 11:07:47.699819559 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -276,10 +276,10 @@ Index: samba-3.0.25rc1/source/nmbd/nmbd_serverlistdb.c
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.25rc1/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.25rc2/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/nmbd/nmbd_winsserver.c	2007-04-24 11:07:02.294134991 +0200
++++ samba-3.0.25rc2/source/nmbd/nmbd_winsserver.c	2007-04-24 11:07:47.727820533 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -298,10 +298,10 @@ Index: samba-3.0.25rc1/source/nmbd/nmbd_winsserver.c
  	all_string_sub(fname,"//", "/", 0);
  	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-Index: samba-3.0.25rc1/source/passdb/login_cache.c
+Index: samba-3.0.25rc2/source/passdb/login_cache.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/passdb/login_cache.c	2007-04-24 11:07:02.306135466 +0200
++++ samba-3.0.25rc2/source/passdb/login_cache.c	2007-04-24 11:07:47.771822063 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -311,11 +311,11 @@ Index: samba-3.0.25rc1/source/passdb/login_cache.c
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.25rc1/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.25rc2/source/nsswitch/winbindd_cache.c
 ===================================================================
---- 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 @@
+--- samba-3.0.25rc2.orig/source/nsswitch/winbindd_cache.c	2007-04-24 11:07:02.330136415 +0200
++++ samba-3.0.25rc2/source/nsswitch/winbindd_cache.c	2007-04-24 11:07:47.799823037 +0200
+@@ -2163,7 +2163,7 @@
  		return True;
  
  	/* when working offline we must not clear the cache on restart */
@@ -324,7 +324,7 @@ Index: samba-3.0.25rc1/source/nsswitch/winbindd_cache.c
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-@@ -2372,7 +2372,7 @@
+@@ -2470,7 +2470,7 @@
  		return;
  
  	/* when working offline we must not clear the cache on restart */
@@ -333,10 +333,10 @@ Index: samba-3.0.25rc1/source/nsswitch/winbindd_cache.c
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
  				O_RDWR|O_CREAT, 0600);
-Index: samba-3.0.25rc1/source/param/loadparm.c
+Index: samba-3.0.25rc2/source/param/loadparm.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/param/loadparm.c	2007-04-24 11:07:02.358137523 +0200
++++ samba-3.0.25rc2/source/param/loadparm.c	2007-04-24 11:07:47.831824150 +0200
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -361,10 +361,10 @@ Index: samba-3.0.25rc1/source/param/loadparm.c
  	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED}, 
  #ifdef WITH_UTMP
  	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
-Index: samba-3.0.25rc1/source/passdb/secrets.c
+Index: samba-3.0.25rc2/source/passdb/secrets.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/passdb/secrets.c	2007-04-24 11:07:02.310135624 +0200
++++ samba-3.0.25rc2/source/passdb/secrets.c	2007-04-24 11:07:47.871825541 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -375,10 +375,10 @@ Index: samba-3.0.25rc1/source/passdb/secrets.c
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.25rc1/source/printing/nt_printing.c
+Index: samba-3.0.25rc2/source/printing/nt_printing.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/printing/nt_printing.c	2007-04-24 11:07:02.366137840 +0200
++++ samba-3.0.25rc2/source/printing/nt_printing.c	2007-04-24 11:07:47.903826654 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -423,10 +423,10 @@ Index: samba-3.0.25rc1/source/printing/nt_printing.c
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25rc1/source/printing/printing.c
+Index: samba-3.0.25rc2/source/printing/printing.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/printing/printing.c	2007-04-24 11:07:02.374138156 +0200
++++ samba-3.0.25rc2/source/printing/printing.c	2007-04-24 11:07:47.971829019 +0200
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -438,10 +438,10 @@ Index: samba-3.0.25rc1/source/printing/printing.c
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.25rc1/source/printing/printing_db.c
+Index: samba-3.0.25rc2/source/printing/printing_db.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/printing/printing_db.c	2007-04-24 11:07:02.382138473 +0200
++++ samba-3.0.25rc2/source/printing/printing_db.c	2007-04-24 11:07:47.999829993 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -451,10 +451,10 @@ Index: samba-3.0.25rc1/source/printing/printing_db.c
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25rc1/source/smbd/lanman.c
+Index: samba-3.0.25rc2/source/smbd/lanman.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/smbd/lanman.c	2007-04-24 11:07:02.390138789 +0200
++++ samba-3.0.25rc2/source/smbd/lanman.c	2007-04-24 11:07:48.031831103 +0200
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -467,10 +467,10 @@ Index: samba-3.0.25rc1/source/smbd/lanman.c
  		return 0;
  	}
  
-Index: samba-3.0.25rc1/source/registry/reg_db.c
+Index: samba-3.0.25rc2/source/registry/reg_db.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/registry/reg_db.c	2007-04-24 11:07:02.406139422 +0200
++++ samba-3.0.25rc2/source/registry/reg_db.c	2007-04-24 11:07:48.055831935 +0200
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -501,10 +501,10 @@ Index: samba-3.0.25rc1/source/registry/reg_db.c
  	}
  
  	unbecome_root();
-Index: samba-3.0.25rc1/source/lib/account_pol.c
+Index: samba-3.0.25rc2/source/lib/account_pol.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/lib/account_pol.c	2007-04-24 11:07:02.262133725 +0200
++++ samba-3.0.25rc2/source/lib/account_pol.c	2007-04-24 11:07:48.087833045 +0200
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -517,10 +517,10 @@ Index: samba-3.0.25rc1/source/lib/account_pol.c
  		if (!tdb) {
  			DEBUG(0,("Failed to open account policy database\n"));
  			return False;
-Index: samba-3.0.25rc1/source/registry/reg_perfcount.c
+Index: samba-3.0.25rc2/source/registry/reg_perfcount.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/registry/reg_perfcount.c	2007-04-24 11:07:02.418139897 +0200
++++ samba-3.0.25rc2/source/registry/reg_perfcount.c	2007-04-24 11:07:48.115834016 +0200
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -539,10 +539,10 @@ Index: samba-3.0.25rc1/source/registry/reg_perfcount.c
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.25rc1/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.25rc2/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/rpc_server/srv_eventlog_lib.c	2007-04-24 11:07:02.426140213 +0200
++++ samba-3.0.25rc2/source/rpc_server/srv_eventlog_lib.c	2007-04-24 11:07:48.143834987 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -561,10 +561,10 @@ Index: samba-3.0.25rc1/source/rpc_server/srv_eventlog_lib.c
  	if ( !directory_exist( eventlogdir, NULL ) )
  		mkdir( eventlogdir, 0755 );	
  	
-Index: samba-3.0.25rc1/source/passdb/pdb_tdb.c
+Index: samba-3.0.25rc2/source/passdb/pdb_tdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/passdb/pdb_tdb.c	2007-04-24 11:07:02.322136099 +0200
++++ samba-3.0.25rc2/source/passdb/pdb_tdb.c	2007-04-24 11:07:48.187836513 +0200
 @@ -1623,7 +1623,7 @@
  	/* save the path for later */
  			   
@@ -574,10 +574,10 @@ Index: samba-3.0.25rc1/source/passdb/pdb_tdb.c
  		pfile = tdbfile;
  	}
  	pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.25rc1/source/groupdb/mapping_tdb.c
+Index: samba-3.0.25rc2/source/groupdb/mapping_tdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/groupdb/mapping_tdb.c	2007-04-24 11:07:02.438140688 +0200
++++ samba-3.0.25rc2/source/groupdb/mapping_tdb.c	2007-04-24 11:07:48.215837485 +0200
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -587,10 +587,10 @@ Index: samba-3.0.25rc1/source/groupdb/mapping_tdb.c
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.25rc1/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.25rc2/source/nsswitch/idmap_tdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/nsswitch/idmap_tdb.c	2007-04-24 11:07:02.338136732 +0200
++++ samba-3.0.25rc2/source/nsswitch/idmap_tdb.c	2007-04-24 11:07:48.247838594 +0200
 @@ -247,7 +247,7 @@
  	}
  
diff --git a/patches/installswat.sh.patch b/patches/installswat.sh.patch
index 58c49990ea..8c5006a9bc 100644
--- a/patches/installswat.sh.patch
+++ b/patches/installswat.sh.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/script/installswat.sh
+Index: samba-3.0.25rc2/source/script/installswat.sh
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/script/installswat.sh	2007-04-24 11:07:01.214092173 +0200
++++ samba-3.0.25rc2/source/script/installswat.sh	2007-04-24 11:07:48.931862317 +0200
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)
diff --git a/patches/make-distclean.patch b/patches/make-distclean.patch
index 7f96195e93..3393540537 100644
--- a/patches/make-distclean.patch
+++ b/patches/make-distclean.patch
@@ -1,8 +1,8 @@
-Index: samba-3.0.25rc1/source/Makefile.in
+Index: samba-3.0.25rc2/source/Makefile.in
 ===================================================================
---- 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 @@
+--- samba-3.0.25rc2.orig/source/Makefile.in	2007-04-24 11:07:47.427810099 +0200
++++ samba-3.0.25rc2/source/Makefile.in	2007-04-24 11:07:49.231872700 +0200
+@@ -1683,6 +1683,7 @@
  
  python_clean:
  	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -10,7 +10,7 @@ Index: samba-3.0.25rc1/source/Makefile.in
  
  # revert to the previously installed version
  revert:
-@@ -1866,6 +1867,7 @@
+@@ -1871,6 +1872,7 @@
  
  distclean: realclean
  	-rm -f include/stamp-h
diff --git a/patches/nmbd-signalling.patch b/patches/nmbd-signalling.patch
index e4b839ce7c..0a9c60c40c 100644
--- a/patches/nmbd-signalling.patch
+++ b/patches/nmbd-signalling.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.25rc2/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/nmbd/nmbd_subnetdb.c	2007-04-24 11:07:01.050085666 +0200
++++ samba-3.0.25rc2/source/nmbd/nmbd_subnetdb.c	2007-04-24 11:07:49.543883491 +0200
 @@ -185,12 +185,16 @@
  	struct in_addr unicast_ip, ipzero;
  
diff --git a/patches/non-linux-ports.patch b/patches/non-linux-ports.patch
index 85304bdd1e..820eeb2bb3 100644
--- a/patches/non-linux-ports.patch
+++ b/patches/non-linux-ports.patch
@@ -1,8 +1,8 @@
-Index: samba-3.0.25rc1/source/configure.in
+Index: samba-3.0.25rc2/source/configure.in
 ===================================================================
---- 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 @@
+--- samba-3.0.25rc2.orig/source/configure.in	2007-04-24 11:07:47.435810377 +0200
++++ samba-3.0.25rc2/source/configure.in	2007-04-24 11:07:49.843893867 +0200
+@@ -758,6 +758,15 @@
        fi
      ;;
  
@@ -18,7 +18,7 @@ Index: samba-3.0.25rc1/source/configure.in
  # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
  #
      *linux*)
-@@ -1379,7 +1388,7 @@
+@@ -1380,7 +1389,7 @@
  #
  #
  case "$host_os" in
@@ -27,7 +27,7 @@ Index: samba-3.0.25rc1/source/configure.in
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1680,7 +1689,10 @@
+@@ -1681,7 +1690,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -39,7 +39,7 @@ Index: samba-3.0.25rc1/source/configure.in
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5376,7 +5388,7 @@
+@@ -5398,7 +5410,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -48,7 +48,7 @@ Index: samba-3.0.25rc1/source/configure.in
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5681,11 +5693,11 @@
+@@ -5703,11 +5715,11 @@
  SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
  
  case "$host_os" in
diff --git a/patches/pam-examples.patch b/patches/pam-examples.patch
index d0ee8365f8..577a0f8e08 100644
--- a/patches/pam-examples.patch
+++ b/patches/pam-examples.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/pam_smbpass/README
+Index: samba-3.0.25rc2/source/pam_smbpass/README
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/pam_smbpass/README	2007-04-24 11:07:00.878078827 +0200
++++ samba-3.0.25rc2/source/pam_smbpass/README	2007-04-24 11:07:50.199906160 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.
diff --git a/patches/samba.patch b/patches/samba.patch
index 725a17f5d7..a2231a8dfe 100644
--- a/patches/samba.patch
+++ b/patches/samba.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/client/smbmount.c
+Index: samba-3.0.25rc2/source/client/smbmount.c
 ===================================================================
---- 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
+--- 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);
@@ -29,10 +29,10 @@ Index: samba-3.0.25rc1/source/client/smbmount.c
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.25rc1/source/web/diagnose.c
+Index: samba-3.0.25rc2/source/web/diagnose.c
 ===================================================================
---- 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
+--- 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;
@@ -41,10 +41,10 @@ Index: samba-3.0.25rc1/source/web/diagnose.c
  	if ((cli = cli_initialise()) == NULL)
  		return False;
  
-Index: samba-3.0.25rc1/source/script/installbin.sh.in
+Index: samba-3.0.25rc2/source/script/installbin.sh.in
 ===================================================================
---- 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
+--- 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
  
diff --git a/patches/smbclient-pager.patch b/patches/smbclient-pager.patch
index 00d3fb1225..f280ed77aa 100644
--- a/patches/smbclient-pager.patch
+++ b/patches/smbclient-pager.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/include/local.h
+Index: samba-3.0.25rc2/source/include/local.h
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/include/local.h	2007-04-24 11:07:00.526064819 +0200
++++ samba-3.0.25rc2/source/include/local.h	2007-04-24 11:07:51.847962919 +0200
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */
diff --git a/patches/smbmount-mtab-flags.patch b/patches/smbmount-mtab-flags.patch
index f7a389878f..b6cf51b38a 100644
--- a/patches/smbmount-mtab-flags.patch
+++ b/patches/smbmount-mtab-flags.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/client/smbmnt.c
+Index: samba-3.0.25rc2/source/client/smbmnt.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/client/smbmnt.c	2007-04-24 11:07:00.470062591 +0200
++++ samba-3.0.25rc2/source/client/smbmnt.c	2007-04-24 11:07:52.143973086 +0200
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;
diff --git a/patches/smbmount-nomtab.patch b/patches/smbmount-nomtab.patch
index c906a7641e..e557fa54b4 100644
--- a/patches/smbmount-nomtab.patch
+++ b/patches/smbmount-nomtab.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/client/smbmnt.c
+Index: samba-3.0.25rc2/source/client/smbmnt.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/client/smbmnt.c	2007-04-24 11:07:52.143973086 +0200
++++ samba-3.0.25rc2/source/client/smbmnt.c	2007-04-24 11:07:53.912033639 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,10 +103,10 @@ Index: samba-3.0.25rc1/source/client/smbmnt.c
  
  	return 0;
  }	
-Index: samba-3.0.25rc1/source/client/smbmount.c
+Index: samba-3.0.25rc2/source/client/smbmount.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:51.451949299 +0200
++++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:54.208043743 +0200
 @@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
diff --git a/patches/smbmount-unix-caps.patch b/patches/smbmount-unix-caps.patch
index 42e6e2d39c..4e60fefe34 100644
--- a/patches/smbmount-unix-caps.patch
+++ b/patches/smbmount-unix-caps.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/client/smbmount.c
+Index: samba-3.0.25rc2/source/client/smbmount.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/client/smbmount.c	2007-04-24 11:07:54.208043743 +0200
++++ samba-3.0.25rc2/source/client/smbmount.c	2007-04-24 11:07:54.772062980 +0200
 @@ -213,6 +213,10 @@
    		c->capabilities &= ~CAP_STATUS32;
  		c->force_dos_errors = True;
diff --git a/patches/smbstatus-locking.patch b/patches/smbstatus-locking.patch
index 390dbd35f1..45af72420f 100644
--- a/patches/smbstatus-locking.patch
+++ b/patches/smbstatus-locking.patch
@@ -1,7 +1,7 @@
-Index: samba-3.0.25rc1/source/utils/status.c
+Index: samba-3.0.25rc2/source/utils/status.c
 ===================================================================
---- 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
+--- samba-3.0.25rc2.orig/source/utils/status.c	2007-04-24 11:07:00.162050334 +0200
++++ samba-3.0.25rc2/source/utils/status.c	2007-04-24 11:07:55.332082050 +0200
 @@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;
diff --git a/patches/undefined-symbols.patch b/patches/undefined-symbols.patch
index 8d3bb034c2..f4dae74f82 100644
--- a/patches/undefined-symbols.patch
+++ b/patches/undefined-symbols.patch
@@ -1,8 +1,8 @@
-Index: samba-3.0.25rc1/source/Makefile.in
+Index: samba-3.0.25rc2/source/Makefile.in
 ===================================================================
---- 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 @@
+--- samba-3.0.25rc2.orig/source/Makefile.in	2007-04-24 11:07:49.231872700 +0200
++++ samba-3.0.25rc2/source/Makefile.in	2007-04-24 11:07:55.864100146 +0200
+@@ -1161,7 +1161,7 @@
  
  bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)
  	@echo Linking libsmbclient shared library $@