Refresh all patches for 3.0.25b

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

19 files changed, 155 insertions, 155 deletions

diff --git a/patches/README_nosmbldap-tools.patch b/patches/README_nosmbldap-tools.patch
index f2aa97badb..7be4b42fd2 100644
--- a/patches/README_nosmbldap-tools.patch
+++ b/patches/README_nosmbldap-tools.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25a/examples/LDAP/README
+Index: samba-3.0.25b/examples/LDAP/README
 ===================================================================
---- samba-3.0.25a.orig/examples/LDAP/README	2007-05-26 07:45:39.860217151 +0200
-+++ samba-3.0.25a/examples/LDAP/README	2007-05-26 07:46:32.312635012 +0200
+--- samba-3.0.25b.orig/examples/LDAP/README	2007-06-27 09:25:37.744135712 +0200
++++ samba-3.0.25b/examples/LDAP/README	2007-06-27 09:28:26.736125563 +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 6589ff17bf..7f903860d2 100644
--- a/patches/VERSION.patch
+++ b/patches/VERSION.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Should be kept
 
-Index: samba-3.0.25a/source/VERSION
+Index: samba-3.0.25b/source/VERSION
 ===================================================================
---- samba-3.0.25a.orig/source/VERSION	2007-05-26 07:45:38.780208554 +0200
-+++ samba-3.0.25a/source/VERSION	2007-05-26 07:46:35.332659088 +0200
+--- samba-3.0.25b.orig/source/VERSION	2007-06-27 09:25:31.744419574 +0200
++++ samba-3.0.25b/source/VERSION	2007-06-27 09:28:46.235199543 +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 e091a4c837..7e708fd9aa 100644
--- a/patches/adapt_machine_creation_script.patch
+++ b/patches/adapt_machine_creation_script.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25a/docs/manpages/smb.conf.5
+Index: samba-3.0.25b/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.25a.orig/docs/manpages/smb.conf.5	2007-05-26 07:45:38.688207821 +0200
-+++ samba-3.0.25a/docs/manpages/smb.conf.5	2007-05-26 07:46:35.684661895 +0200
+--- samba-3.0.25b.orig/docs/manpages/smb.conf.5	2007-06-27 09:25:31.244443227 +0200
++++ samba-3.0.25b/docs/manpages/smb.conf.5	2007-06-27 09:28:53.734843287 +0200
 @@ -662,8 +662,8 @@
  Default:
  \fB\fIadd machine script\fR = \fR
diff --git a/patches/autoconf.patch b/patches/autoconf.patch
index 495b4aede7..53fd0936b9 100644
--- a/patches/autoconf.patch
+++ b/patches/autoconf.patch
@@ -25,10 +25,10 @@ Note: This patch will normally have to be updated by hand after every
  quilt refresh
  find . -name '*.rej' | xargs rm
 
-Index: samba-3.0.25a/source/configure
+Index: samba-3.0.25b/source/configure
 ===================================================================
---- samba-3.0.25a.orig/source/configure	2007-05-26 07:45:38.604207153 +0200
-+++ samba-3.0.25a/source/configure	2007-05-26 07:46:36.104665243 +0200
+--- samba-3.0.25b.orig/source/configure	2007-06-27 09:25:30.244490534 +0200
++++ samba-3.0.25b/source/configure	2007-06-27 09:28:56.734700771 +0200
 @@ -671,6 +671,9 @@
  logfilebase
  privatedir
@@ -189,10 +189,10 @@ Index: samba-3.0.25a/source/configure
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.0.25a/source/include/config.h.in
+Index: samba-3.0.25b/source/include/config.h.in
 ===================================================================
---- samba-3.0.25a.orig/source/include/config.h.in	2007-05-26 07:45:38.616207248 +0200
-+++ samba-3.0.25a/source/include/config.h.in	2007-05-26 07:46:36.112665307 +0200
+--- samba-3.0.25b.orig/source/include/config.h.in	2007-06-27 09:25:30.244490534 +0200
++++ samba-3.0.25b/source/include/config.h.in	2007-06-27 09:28:56.734700771 +0200
 @@ -57,6 +57,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC
diff --git a/patches/cups.patch b/patches/cups.patch
index 325a3b2748..15dc07326c 100644
--- a/patches/cups.patch
+++ b/patches/cups.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Debian specific
 Note: We need to decide whether it's still reasonable to use "printing=bsd"
       as a default. Probably provide a debconf-supported way to upgrade
 
-Index: samba-3.0.25a/source/include/includes.h
+Index: samba-3.0.25b/source/include/includes.h
 ===================================================================
---- samba-3.0.25a.orig/source/include/includes.h	2007-05-26 07:45:42.088234889 +0200
-+++ samba-3.0.25a/source/include/includes.h	2007-05-26 07:46:27.748598629 +0200
+--- samba-3.0.25b.orig/source/include/includes.h	2007-06-27 09:25:45.243780834 +0200
++++ samba-3.0.25b/source/include/includes.h	2007-06-27 09:28:00.237383426 +0200
 @@ -809,10 +809,7 @@
  #endif
  
diff --git a/patches/documentation.patch b/patches/documentation.patch
index 48dca80b67..3eb561dcc5 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -8,8 +8,8 @@ Note: Some part should maybe go in the FHS patch
 
 Index: samba-3.0.25b/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/swat.8	2007-06-19 10:03:04.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/swat.8	2007-06-27 08:34:45.893162839 +0200
+--- samba-3.0.25b.orig/docs/manpages/swat.8	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/swat.8	2007-06-27 09:28:03.237241060 +0200
 @@ -111,60 +111,6 @@
  .RS 3n
  Print a summary of command line options.
@@ -90,8 +90,8 @@ Index: samba-3.0.25b/docs/manpages/swat.8
  .PP
 Index: samba-3.0.25b/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/nmbd.8	2007-06-19 10:02:10.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/nmbd.8	2007-06-27 08:35:53.389847479 +0200
+--- samba-3.0.25b.orig/docs/manpages/nmbd.8	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/nmbd.8	2007-06-27 09:28:03.237241060 +0200
 @@ -113,11 +113,9 @@
  to answer any name queries. Adding a line to this file affects name NetBIOS resolution from this host
  \fBONLY\fR.
@@ -139,8 +139,8 @@ Index: samba-3.0.25b/docs/manpages/nmbd.8
  \fIlog.nmb\fR
 Index: samba-3.0.25b/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/smbd.8	2007-06-19 10:02:38.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/smbd.8	2007-06-27 08:34:13.894734502 +0200
+--- samba-3.0.25b.orig/docs/manpages/smbd.8	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/smbd.8	2007-06-27 09:28:03.237241060 +0200
 @@ -168,14 +168,11 @@
  inetd, 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).
  .RE
@@ -160,8 +160,8 @@ Index: samba-3.0.25b/docs/manpages/smbd.8
  \fBsmb.conf\fR(5)
 Index: samba-3.0.25b/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/lmhosts.5	2007-06-19 10:02:02.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/lmhosts.5	2007-06-27 08:34:14.394709945 +0200
+--- samba-3.0.25b.orig/docs/manpages/lmhosts.5	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/lmhosts.5	2007-06-27 09:28:03.237241060 +0200
 @@ -77,10 +77,8 @@
  file.
  .SH "FILES"
@@ -177,8 +177,8 @@ Index: samba-3.0.25b/docs/manpages/lmhosts.5
  This man page is correct for version 3.0 of the Samba suite.
 Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1	2007-06-19 10:02:14.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/ntlm_auth.1	2007-06-27 08:34:14.394709945 +0200
+--- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/ntlm_auth.1	2007-06-27 09:28:03.237241060 +0200
 @@ -43,7 +43,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -208,8 +208,8 @@ Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
  gss-spnego-client
 Index: samba-3.0.25b/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/tdbbackup.8	2007-06-19 10:03:06.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/tdbbackup.8	2007-06-27 08:37:03.886384577 +0200
+--- samba-3.0.25b.orig/docs/manpages/tdbbackup.8	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/tdbbackup.8	2007-06-27 09:28:03.237241060 +0200
 @@ -70,17 +70,17 @@
  \(bu
  
@@ -233,8 +233,8 @@ Index: samba-3.0.25b/docs/manpages/tdbbackup.8
  This man page is correct for version 3.0 of the Samba suite.
 Index: samba-3.0.25b/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/winbindd.8	2007-06-19 10:03:56.000000000 +0200
-+++ samba-3.0.25b/docs/manpages/winbindd.8	2007-06-27 08:38:55.880882830 +0200
+--- samba-3.0.25b.orig/docs/manpages/winbindd.8	2007-06-27 09:25:44.243828154 +0200
++++ samba-3.0.25b/docs/manpages/winbindd.8	2007-06-27 09:28:03.237241060 +0200
 @@ -440,16 +440,16 @@
  file are owned by root.
  .RE
diff --git a/patches/fhs.patch b/patches/fhs.patch
index ea8da0ab58..8f4ee9f92c 100644
--- a/patches/fhs.patch
+++ b/patches/fhs.patch
@@ -15,10 +15,10 @@ Note: Use dedicated directories for:
       That patch may need some work to check that files still go where they should go
       It also needs work to be cleaner wrt people who want to run multiple instances of samba
 
-Index: samba-3.0.25a/source/Makefile.in
+Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:45:41.564230717 +0200
-+++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:28.752606632 +0200
+--- samba-3.0.25b.orig/source/Makefile.in	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/Makefile.in	2007-06-27 09:28:06.237098685 +0200
 @@ -106,6 +106,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -55,10 +55,10 @@ Index: samba-3.0.25a/source/Makefile.in
  
  installswat: installdirs installmsg
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25a/source/configure.in
+Index: samba-3.0.25b/source/configure.in
 ===================================================================
---- samba-3.0.25a.orig/source/configure.in	2007-05-26 07:45:41.572230781 +0200
-+++ samba-3.0.25a/source/configure.in	2007-05-26 07:46:28.764606728 +0200
+--- samba-3.0.25b.orig/source/configure.in	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/configure.in	2007-06-27 09:28:06.237098685 +0200
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -89,10 +89,10 @@ Index: samba-3.0.25a/source/configure.in
  AC_SUBST(rootsbindir)
  AC_SUBST(pammodulesdir)
  
-Index: samba-3.0.25a/source/dynconfig.c
+Index: samba-3.0.25b/source/dynconfig.c
 ===================================================================
---- samba-3.0.25a.orig/source/dynconfig.c	2007-05-26 07:45:41.580230845 +0200
-+++ samba-3.0.25a/source/dynconfig.c	2007-05-26 07:46:28.792606951 +0200
+--- samba-3.0.25b.orig/source/dynconfig.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/dynconfig.c	2007-06-27 09:28:06.237098685 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -135,10 +135,10 @@ Index: samba-3.0.25a/source/dynconfig.c
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.25a/source/include/dynconfig.h
+Index: samba-3.0.25b/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.25a.orig/source/include/dynconfig.h	2007-05-26 07:45:41.588230908 +0200
-+++ samba-3.0.25a/source/include/dynconfig.h	2007-05-26 07:46:28.820607175 +0200
+--- samba-3.0.25b.orig/source/include/dynconfig.h	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/include/dynconfig.h	2007-06-27 09:28:06.737074955 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -152,10 +152,10 @@ Index: samba-3.0.25a/source/include/dynconfig.h
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
-Index: samba-3.0.25a/source/intl/lang_tdb.c
+Index: samba-3.0.25b/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/intl/lang_tdb.c	2007-05-26 07:45:41.608231068 +0200
-+++ samba-3.0.25a/source/intl/lang_tdb.c	2007-05-26 07:46:28.848607398 +0200
+--- samba-3.0.25b.orig/source/intl/lang_tdb.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/intl/lang_tdb.c	2007-06-27 09:28:06.737074955 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -165,10 +165,10 @@ Index: samba-3.0.25a/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.25a/source/lib/util.c
+Index: samba-3.0.25b/source/lib/util.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/util.c	2007-05-26 07:45:41.616231131 +0200
-+++ samba-3.0.25a/source/lib/util.c	2007-05-26 07:46:28.892607749 +0200
+--- samba-3.0.25b.orig/source/lib/util.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/lib/util.c	2007-06-27 09:28:07.237051225 +0200
 @@ -2630,6 +2630,61 @@
  }
  
@@ -231,10 +231,10 @@ Index: samba-3.0.25a/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.25a/source/lib/util_unistr.c
+Index: samba-3.0.25b/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/util_unistr.c	2007-05-26 07:45:41.624231195 +0200
-+++ samba-3.0.25a/source/lib/util_unistr.c	2007-05-26 07:46:28.932608067 +0200
+--- samba-3.0.25b.orig/source/lib/util_unistr.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/lib/util_unistr.c	2007-06-27 09:28:07.237051225 +0200
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -258,10 +258,10 @@ Index: samba-3.0.25a/source/lib/util_unistr.c
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.25a/source/libsmb/samlogon_cache.c
+Index: samba-3.0.25b/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/libsmb/samlogon_cache.c	2007-05-26 07:45:41.644231354 +0200
-+++ samba-3.0.25a/source/libsmb/samlogon_cache.c	2007-05-26 07:46:29.004608641 +0200
+--- samba-3.0.25b.orig/source/libsmb/samlogon_cache.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/libsmb/samlogon_cache.c	2007-06-27 09:28:07.237051225 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -280,10 +280,10 @@ Index: samba-3.0.25a/source/libsmb/samlogon_cache.c
  				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
-Index: samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/nmbd/nmbd_serverlistdb.c	2007-05-26 07:45:41.652231418 +0200
-+++ samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c	2007-05-26 07:46:29.032608865 +0200
+--- samba-3.0.25b.orig/source/nmbd/nmbd_serverlistdb.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c	2007-06-27 09:28:07.237051225 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -293,10 +293,10 @@ Index: samba-3.0.25a/source/nmbd/nmbd_serverlistdb.c
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.25a/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.25b/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.25a.orig/source/nmbd/nmbd_winsserver.c	2007-05-26 07:45:41.672231577 +0200
-+++ samba-3.0.25a/source/nmbd/nmbd_winsserver.c	2007-05-26 07:46:29.064609120 +0200
+--- samba-3.0.25b.orig/source/nmbd/nmbd_winsserver.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/nmbd/nmbd_winsserver.c	2007-06-27 09:28:07.237051225 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -306,7 +306,7 @@ Index: samba-3.0.25a/source/nmbd/nmbd_winsserver.c
  		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
  			WINS_LIST, strerror(errno) ));
  		return True;
-@@ -2337,7 +2337,7 @@
+@@ -2338,7 +2338,7 @@
  		}
  	}
  
@@ -315,10 +315,10 @@ Index: samba-3.0.25a/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.25a/source/passdb/login_cache.c
+Index: samba-3.0.25b/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/login_cache.c	2007-05-26 07:45:41.680231641 +0200
-+++ samba-3.0.25a/source/passdb/login_cache.c	2007-05-26 07:46:29.104609438 +0200
+--- samba-3.0.25b.orig/source/passdb/login_cache.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/passdb/login_cache.c	2007-06-27 09:28:07.237051225 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -328,10 +328,10 @@ Index: samba-3.0.25a/source/passdb/login_cache.c
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.25a/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.25b/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.25a.orig/source/nsswitch/winbindd_cache.c	2007-05-26 07:45:41.708231864 +0200
-+++ samba-3.0.25a/source/nsswitch/winbindd_cache.c	2007-05-26 07:46:29.136609694 +0200
+--- samba-3.0.25b.orig/source/nsswitch/winbindd_cache.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/nsswitch/winbindd_cache.c	2007-06-27 09:28:07.237051225 +0200
 @@ -2180,7 +2180,7 @@
  		return True;
  
@@ -362,10 +362,10 @@ Index: samba-3.0.25a/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.25a/source/param/loadparm.c
+Index: samba-3.0.25b/source/param/loadparm.c
 ===================================================================
---- samba-3.0.25a.orig/source/param/loadparm.c	2007-05-26 07:45:41.736232087 +0200
-+++ samba-3.0.25a/source/param/loadparm.c	2007-05-26 07:46:29.184610076 +0200
+--- samba-3.0.25b.orig/source/param/loadparm.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/param/loadparm.c	2007-06-27 09:28:07.237051225 +0200
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -390,10 +390,10 @@ Index: samba-3.0.25a/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.25a/source/passdb/secrets.c
+Index: samba-3.0.25b/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/secrets.c	2007-05-26 07:45:41.688231705 +0200
-+++ samba-3.0.25a/source/passdb/secrets.c	2007-05-26 07:46:29.220610363 +0200
+--- samba-3.0.25b.orig/source/passdb/secrets.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/passdb/secrets.c	2007-06-27 09:28:07.237051225 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -404,10 +404,10 @@ Index: samba-3.0.25a/source/passdb/secrets.c
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.25a/source/printing/nt_printing.c
+Index: samba-3.0.25b/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/nt_printing.c	2007-05-26 07:45:41.744232150 +0200
-+++ samba-3.0.25a/source/printing/nt_printing.c	2007-05-26 07:46:29.252610618 +0200
+--- samba-3.0.25b.orig/source/printing/nt_printing.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/printing/nt_printing.c	2007-06-27 09:28:07.737027494 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -452,10 +452,10 @@ Index: samba-3.0.25a/source/printing/nt_printing.c
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25a/source/printing/printing.c
+Index: samba-3.0.25b/source/printing/printing.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/printing.c	2007-05-26 07:45:41.752232214 +0200
-+++ samba-3.0.25a/source/printing/printing.c	2007-05-26 07:46:29.320611160 +0200
+--- samba-3.0.25b.orig/source/printing/printing.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/printing/printing.c	2007-06-27 09:28:07.737027494 +0200
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -467,10 +467,10 @@ Index: samba-3.0.25a/source/printing/printing.c
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.25a/source/printing/printing_db.c
+Index: samba-3.0.25b/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.25a.orig/source/printing/printing_db.c	2007-05-26 07:45:41.772232373 +0200
-+++ samba-3.0.25a/source/printing/printing_db.c	2007-05-26 07:46:29.364611511 +0200
+--- samba-3.0.25b.orig/source/printing/printing_db.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/printing/printing_db.c	2007-06-27 09:28:07.737027494 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -480,10 +480,10 @@ Index: samba-3.0.25a/source/printing/printing_db.c
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25a/source/smbd/lanman.c
+Index: samba-3.0.25b/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.25a.orig/source/smbd/lanman.c	2007-05-26 07:45:41.784232469 +0200
-+++ samba-3.0.25a/source/smbd/lanman.c	2007-05-26 07:46:29.396611766 +0200
+--- samba-3.0.25b.orig/source/smbd/lanman.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/smbd/lanman.c	2007-06-27 09:28:07.737027494 +0200
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -496,10 +496,10 @@ Index: samba-3.0.25a/source/smbd/lanman.c
  		return 0;
  	}
  
-Index: samba-3.0.25a/source/registry/reg_db.c
+Index: samba-3.0.25b/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.25a.orig/source/registry/reg_db.c	2007-05-26 07:45:41.792232532 +0200
-+++ samba-3.0.25a/source/registry/reg_db.c	2007-05-26 07:46:29.436612085 +0200
+--- samba-3.0.25b.orig/source/registry/reg_db.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/registry/reg_db.c	2007-06-27 09:28:07.737027494 +0200
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -530,10 +530,10 @@ Index: samba-3.0.25a/source/registry/reg_db.c
  	}
  
  	unbecome_root();
-Index: samba-3.0.25a/source/lib/account_pol.c
+Index: samba-3.0.25b/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.25a.orig/source/lib/account_pol.c	2007-05-26 07:45:41.636231291 +0200
-+++ samba-3.0.25a/source/lib/account_pol.c	2007-05-26 07:46:29.464612308 +0200
+--- samba-3.0.25b.orig/source/lib/account_pol.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/lib/account_pol.c	2007-06-27 09:28:07.737027494 +0200
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -546,10 +546,10 @@ Index: samba-3.0.25a/source/lib/account_pol.c
  		if (!tdb) {
  			DEBUG(0,("Failed to open account policy database\n"));
  			return False;
-Index: samba-3.0.25a/source/registry/reg_perfcount.c
+Index: samba-3.0.25b/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.25a.orig/source/registry/reg_perfcount.c	2007-05-26 07:45:41.800232596 +0200
-+++ samba-3.0.25a/source/registry/reg_perfcount.c	2007-05-26 07:46:29.492612531 +0200
+--- samba-3.0.25b.orig/source/registry/reg_perfcount.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/registry/reg_perfcount.c	2007-06-27 09:28:07.737027494 +0200
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -568,10 +568,10 @@ Index: samba-3.0.25a/source/registry/reg_perfcount.c
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.25a.orig/source/rpc_server/srv_eventlog_lib.c	2007-05-26 07:45:41.808232660 +0200
-+++ samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c	2007-05-26 07:46:29.520612755 +0200
+--- samba-3.0.25b.orig/source/rpc_server/srv_eventlog_lib.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c	2007-06-27 09:28:07.737027494 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -590,10 +590,10 @@ Index: samba-3.0.25a/source/rpc_server/srv_eventlog_lib.c
  	if ( !directory_exist( eventlogdir, NULL ) )
  		mkdir( eventlogdir, 0755 );	
  	
-Index: samba-3.0.25a/source/passdb/pdb_tdb.c
+Index: samba-3.0.25b/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/passdb/pdb_tdb.c	2007-05-26 07:45:41.700231800 +0200
-+++ samba-3.0.25a/source/passdb/pdb_tdb.c	2007-05-26 07:46:29.580613233 +0200
+--- samba-3.0.25b.orig/source/passdb/pdb_tdb.c	2007-06-27 09:25:42.743899133 +0200
++++ samba-3.0.25b/source/passdb/pdb_tdb.c	2007-06-27 09:28:07.737027494 +0200
 @@ -1623,7 +1623,7 @@
  	/* save the path for later */
  			   
@@ -603,10 +603,10 @@ Index: samba-3.0.25a/source/passdb/pdb_tdb.c
  		pfile = tdbfile;
  	}
  	pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.25a/source/groupdb/mapping_tdb.c
+Index: samba-3.0.25b/source/groupdb/mapping_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/groupdb/mapping_tdb.c	2007-05-26 07:45:41.832232851 +0200
-+++ samba-3.0.25a/source/groupdb/mapping_tdb.c	2007-05-26 07:46:29.608613456 +0200
+--- samba-3.0.25b.orig/source/groupdb/mapping_tdb.c	2007-06-27 09:25:43.743851814 +0200
++++ samba-3.0.25b/source/groupdb/mapping_tdb.c	2007-06-27 09:28:07.737027494 +0200
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -616,10 +616,10 @@ Index: samba-3.0.25a/source/groupdb/mapping_tdb.c
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.25a/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.25b/source/nsswitch/idmap_tdb.c
 ===================================================================
---- samba-3.0.25a.orig/source/nsswitch/idmap_tdb.c	2007-05-26 07:45:41.728232023 +0200
-+++ samba-3.0.25a/source/nsswitch/idmap_tdb.c	2007-05-26 07:46:29.636613679 +0200
+--- samba-3.0.25b.orig/source/nsswitch/idmap_tdb.c	2007-06-27 09:25:43.243875474 +0200
++++ samba-3.0.25b/source/nsswitch/idmap_tdb.c	2007-06-27 09:28:07.737027494 +0200
 @@ -247,7 +247,7 @@
  	}
  
diff --git a/patches/installswat.sh.patch b/patches/installswat.sh.patch
index d4ed621f1a..b635612071 100644
--- a/patches/installswat.sh.patch
+++ b/patches/installswat.sh.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25a/source/script/installswat.sh
+Index: samba-3.0.25b/source/script/installswat.sh
 ===================================================================
---- samba-3.0.25a.orig/source/script/installswat.sh	2007-05-26 07:45:40.380221291 +0200
-+++ samba-3.0.25a/source/script/installswat.sh	2007-05-26 07:46:30.380619610 +0200
+--- samba-3.0.25b.orig/source/script/installswat.sh	2007-06-27 09:25:40.743993768 +0200
++++ samba-3.0.25b/source/script/installswat.sh	2007-06-27 09:28:13.736742711 +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 8e9a87a924..f699b41b8f 100644
--- a/patches/make-distclean.patch
+++ b/patches/make-distclean.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Forwarded upstream, will be in 3.0.26
 
 Note: 
 
-Index: samba-3.0.25a/source/Makefile.in
+Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:46:28.752606632 +0200
-+++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:30.732622416 +0200
+--- samba-3.0.25b.orig/source/Makefile.in	2007-06-27 09:28:06.237098685 +0200
++++ samba-3.0.25b/source/Makefile.in	2007-06-27 09:28:16.236624041 +0200
 @@ -1688,6 +1688,7 @@
  
  python_clean:
diff --git a/patches/missing_userspace_bugzilla999.patch b/patches/missing_userspace_bugzilla999.patch
index 5cc21253a5..62d7515fb6 100644
--- a/patches/missing_userspace_bugzilla999.patch
+++ b/patches/missing_userspace_bugzilla999.patch
@@ -10,10 +10,10 @@ Status wrt upstream: Not applied. Mentioned by Dann Frazier in
 Author: Haroldo Gamal (see https://bugzilla.samba.org/attachment.cgi?id=634&action=view)
 
 
-Index: samba-3.0.25a/source/client/smbmnt.c
+Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmnt.c	2007-06-03 19:05:54.072802810 +0200
-+++ samba-3.0.25a/source/client/smbmnt.c	2007-06-03 19:06:00.072588923 +0200
+--- samba-3.0.25b.orig/source/client/smbmnt.c	2007-06-27 09:28:37.735603237 +0200
++++ samba-3.0.25b/source/client/smbmnt.c	2007-06-27 09:29:03.234391955 +0200
 @@ -49,6 +49,10 @@
  static unsigned mount_dmask;
  static int user_mount;
@@ -72,10 +72,10 @@ Index: samba-3.0.25a/source/client/smbmnt.c
  	if (mount(share_name, ".", "smbfs", flags, data1) == 0)
  		return 0;
  	return mount(share_name, ".", "smbfs", flags, data2);
-Index: samba-3.0.25a/source/client/smbmount.c
+Index: samba-3.0.25b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmount.c	2007-06-03 19:05:54.072802810 +0200
-+++ samba-3.0.25a/source/client/smbmount.c	2007-06-03 19:06:00.072588924 +0200
+--- samba-3.0.25b.orig/source/client/smbmount.c	2007-06-27 09:28:37.735603237 +0200
++++ samba-3.0.25b/source/client/smbmount.c	2007-06-27 09:29:03.234391955 +0200
 @@ -43,6 +43,10 @@
  static int smb_port = 0;
  static BOOL got_user;
@@ -114,7 +114,7 @@ Index: samba-3.0.25a/source/client/smbmount.c
  		slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
  		args[i++] = "-d";
  		args[i++] = smb_xstrdup(tmp);
-@@ -797,14 +801,18 @@
+@@ -800,14 +804,18 @@
  				pstrcpy(my_netbios_name,opteq+1);
  			} else if(!strcmp(opts, "uid")) {
  				mount_uid = nametouid(opteq+1);
diff --git a/patches/no_smbmount_symlink.patch b/patches/no_smbmount_symlink.patch
index 7ab0cb380c..871fd47e07 100644
--- a/patches/no_smbmount_symlink.patch
+++ b/patches/no_smbmount_symlink.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25a/source/script/installbin.sh.in
+Index: samba-3.0.25b/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.25a.orig/source/script/installbin.sh.in	2007-05-26 07:45:39.764216387 +0200
-+++ samba-3.0.25a/source/script/installbin.sh.in	2007-05-26 07:46:32.740638424 +0200
+--- samba-3.0.25b.orig/source/script/installbin.sh.in	2007-06-27 09:25:37.244159369 +0200
++++ samba-3.0.25b/source/script/installbin.sh.in	2007-06-27 09:28:30.235959381 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  
diff --git a/patches/non-linux-ports.patch b/patches/non-linux-ports.patch
index 3569ee82b3..c50d6d8de9 100644
--- a/patches/non-linux-ports.patch
+++ b/patches/non-linux-ports.patch
@@ -7,10 +7,10 @@ Status wrt upstream: Forwarded, will be in 3.0.26
 Note: Upstream would probably welcome patches allowing to build on new architectures. 
       As this patch is the most often broken by new upstream releases, everybody would benefit from it.
 
-Index: samba-3.0.25a/source/configure.in
+Index: samba-3.0.25b/source/configure.in
 ===================================================================
---- samba-3.0.25a.orig/source/configure.in	2007-05-26 07:46:28.764606728 +0200
-+++ samba-3.0.25a/source/configure.in	2007-05-26 07:46:31.568629081 +0200
+--- samba-3.0.25b.orig/source/configure.in	2007-06-27 09:28:06.237098685 +0200
++++ samba-3.0.25b/source/configure.in	2007-06-27 09:28:20.736410420 +0200
 @@ -758,6 +758,15 @@
        fi
      ;;
diff --git a/patches/pam-examples.patch b/patches/pam-examples.patch
index 35dc25a1c7..eb9862d5a3 100644
--- a/patches/pam-examples.patch
+++ b/patches/pam-examples.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: 
 
-Index: samba-3.0.25a/source/pam_smbpass/README
+Index: samba-3.0.25b/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.25a.orig/source/pam_smbpass/README	2007-05-26 07:45:39.944217820 +0200
-+++ samba-3.0.25a/source/pam_smbpass/README	2007-05-26 07:46:31.936632014 +0200
+--- samba-3.0.25b.orig/source/pam_smbpass/README	2007-06-27 09:25:38.244112055 +0200
++++ samba-3.0.25b/source/pam_smbpass/README	2007-06-27 09:28:23.736267996 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.
diff --git a/patches/python-examples.patch b/patches/python-examples.patch
index 2eea10774f..cdc184158a 100644
--- a/patches/python-examples.patch
+++ b/patches/python-examples.patch
@@ -6,20 +6,20 @@ Status wrt upstream: Forwarded upstream, will be in 3.0.26
 
 Note: Probably other vendors would benefit from examples not hardcoding the Python version
 
-Index: samba-3.0.25a/source/python/examples/tdbpack/tdbtimetrial.py
+Index: samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py
 ===================================================================
---- samba-3.0.25a.orig/source/python/examples/tdbpack/tdbtimetrial.py	2005-02-25 18:59:24.000000000 +0100
-+++ samba-3.0.25a/source/python/examples/tdbpack/tdbtimetrial.py	2007-05-26 07:46:36.652669613 +0200
+--- samba-3.0.25b.orig/source/python/examples/tdbpack/tdbtimetrial.py	2007-06-27 09:25:29.744514186 +0200
++++ samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py	2007-06-27 09:29:00.234534490 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python2.2
 +#! /usr/bin/python
  
  def run_trial():
      # import tdbutil
-Index: samba-3.0.25a/source/python/examples/tdbpack/test_tdbpack.py
+Index: samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py
 ===================================================================
---- samba-3.0.25a.orig/source/python/examples/tdbpack/test_tdbpack.py	2005-02-25 18:59:24.000000000 +0100
-+++ samba-3.0.25a/source/python/examples/tdbpack/test_tdbpack.py	2007-05-26 07:46:36.652669613 +0200
+--- samba-3.0.25b.orig/source/python/examples/tdbpack/test_tdbpack.py	2007-06-27 09:25:29.744514186 +0200
++++ samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py	2007-06-27 09:29:00.234534490 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/env python2.2
 +#! /usr/bin/env python
diff --git a/patches/smbclient-pager.patch b/patches/smbclient-pager.patch
index e19f277b87..0a0ed47ead 100644
--- a/patches/smbclient-pager.patch
+++ b/patches/smbclient-pager.patch
@@ -8,10 +8,10 @@ Author: Steve Langasek <vorlon@debian.org>
 
 Note: 
 
-Index: samba-3.0.25a/source/include/local.h
+Index: samba-3.0.25b/source/include/local.h
 ===================================================================
---- samba-3.0.25a.orig/source/include/local.h	2007-05-26 07:45:39.520214445 +0200
-+++ samba-3.0.25a/source/include/local.h	2007-05-26 07:46:33.132641549 +0200
+--- samba-3.0.25b.orig/source/include/local.h	2007-06-27 09:25:36.244206681 +0200
++++ samba-3.0.25b/source/include/local.h	2007-06-27 09:28:33.235816930 +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 f8971332a3..5a8b9fedcb 100644
--- a/patches/smbmount-mtab-flags.patch
+++ b/patches/smbmount-mtab-flags.patch
@@ -8,10 +8,10 @@ Author: Steve Langasek <vorlon@debian.org>
 
 Note: 
 
-Index: samba-3.0.25a/source/client/smbmnt.c
+Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmnt.c	2007-05-26 07:45:39.408213553 +0200
-+++ samba-3.0.25a/source/client/smbmnt.c	2007-05-26 07:46:33.492644419 +0200
+--- samba-3.0.25b.orig/source/client/smbmnt.c	2007-06-27 09:25:35.744230337 +0200
++++ samba-3.0.25b/source/client/smbmnt.c	2007-06-27 09:28:35.235721957 +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 1dd3a8b807..13900dab1a 100644
--- a/patches/smbmount-nomtab.patch
+++ b/patches/smbmount-nomtab.patch
@@ -8,10 +8,10 @@ Status wrt upstream: Forwarded on 2007/05/30
 Note: Part of no-longer maintained smbfs stuff?
       The manpages are not modified
 
-Index: samba-3.0.25a/source/client/smbmnt.c
+Index: samba-3.0.25b/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmnt.c	2007-05-26 07:46:33.492644419 +0200
-+++ samba-3.0.25a/source/client/smbmnt.c	2007-05-26 07:46:33.848647257 +0200
+--- samba-3.0.25b.orig/source/client/smbmnt.c	2007-06-27 09:28:35.235721957 +0200
++++ samba-3.0.25b/source/client/smbmnt.c	2007-06-27 09:28:37.735603237 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -113,10 +113,10 @@ Index: samba-3.0.25a/source/client/smbmnt.c
  
  	return 0;
  }	
-Index: samba-3.0.25a/source/client/smbmount.c
+Index: samba-3.0.25b/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmount.c	2007-05-26 07:46:32.692638041 +0200
-+++ samba-3.0.25a/source/client/smbmount.c	2007-05-26 07:46:33.884647544 +0200
+--- samba-3.0.25b.orig/source/client/smbmount.c	2007-06-27 09:25:34.744277648 +0200
++++ samba-3.0.25b/source/client/smbmount.c	2007-06-27 09:28:37.735603237 +0200
 @@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
@@ -154,7 +154,7 @@ Index: samba-3.0.25a/source/client/smbmount.c
  
  	printf("Version %s\n\n",SAMBA_VERSION_STRING);
  
-@@ -742,8 +749,13 @@
+@@ -745,8 +752,13 @@
  	argc -= 2;
  	argv += 2;
  
diff --git a/patches/smbstatus-locking.patch b/patches/smbstatus-locking.patch
index 9747c72029..bc786bf5b3 100644
--- a/patches/smbstatus-locking.patch
+++ b/patches/smbstatus-locking.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Should maybe be forwarded
 
 Note: 
 
-Index: samba-3.0.25a/source/utils/status.c
+Index: samba-3.0.25b/source/utils/status.c
 ===================================================================
---- samba-3.0.25a.orig/source/utils/status.c	2007-05-26 07:45:38.952209923 +0200
-+++ samba-3.0.25a/source/utils/status.c	2007-05-26 07:46:34.640653571 +0200
+--- samba-3.0.25b.orig/source/utils/status.c	2007-06-27 09:25:33.244348612 +0200
++++ samba-3.0.25b/source/utils/status.c	2007-06-27 09:28:41.235437018 +0200
 @@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;
diff --git a/patches/undefined-symbols.patch b/patches/undefined-symbols.patch
index 785d7b27d6..f96a5d936a 100644
--- a/patches/undefined-symbols.patch
+++ b/patches/undefined-symbols.patch
@@ -9,10 +9,10 @@ for it.
 
 Note: 
 
-Index: samba-3.0.25a/source/Makefile.in
+Index: samba-3.0.25b/source/Makefile.in
 ===================================================================
---- samba-3.0.25a.orig/source/Makefile.in	2007-05-26 07:46:30.732622416 +0200
-+++ samba-3.0.25a/source/Makefile.in	2007-05-26 07:46:34.984656314 +0200
+--- samba-3.0.25b.orig/source/Makefile.in	2007-06-27 09:28:16.236624041 +0200
++++ samba-3.0.25b/source/Makefile.in	2007-06-27 09:28:43.235342031 +0200
 @@ -1161,7 +1161,7 @@
  
  bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)