Refresh patches for 3.0.25c

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

23 files changed, 207 insertions, 207 deletions

diff --git a/patches/README_nosmbldap-tools.patch b/patches/README_nosmbldap-tools.patch
index fdaa024eed..ce3d94e9ab 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.25b/examples/LDAP/README
+Index: samba-3.0.25c/examples/LDAP/README
 ===================================================================
---- samba-3.0.25b.orig/examples/LDAP/README
-+++ samba-3.0.25b/examples/LDAP/README
+--- samba-3.0.25c.orig/examples/LDAP/README	2007-08-26 12:07:16.598298995 +0200
++++ samba-3.0.25c/examples/LDAP/README	2007-08-26 13:09:02.419701485 +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 3db23135fe..46fab04f85 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.25b/source/VERSION
+Index: samba-3.0.25c/source/VERSION
 ===================================================================
---- samba-3.0.25b.orig/source/VERSION
-+++ samba-3.0.25b/source/VERSION
+--- samba-3.0.25c.orig/source/VERSION	2007-08-26 12:07:15.598346358 +0200
++++ samba-3.0.25c/source/VERSION	2007-08-26 13:09:04.919579503 +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 f50aca5692..4af9cd230f 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.25b/docs/manpages/smb.conf.5
+Index: samba-3.0.25c/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/smb.conf.5
-+++ samba-3.0.25b/docs/manpages/smb.conf.5
+--- samba-3.0.25c.orig/docs/manpages/smb.conf.5	2007-08-26 12:07:15.098370040 +0200
++++ samba-3.0.25c/docs/manpages/smb.conf.5	2007-08-26 13:09:05.419555107 +0200
 @@ -662,8 +662,8 @@
  Default:
  \fB\fIadd machine script\fR = \fR
diff --git a/patches/autoconf.patch b/patches/autoconf.patch
index 77e15cb155..69c76a41f4 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.25b/source/configure
+Index: samba-3.0.25c/source/configure
 ===================================================================
---- samba-3.0.25b.orig/source/configure
-+++ samba-3.0.25b/source/configure
+--- samba-3.0.25c.orig/source/configure	2007-08-26 12:07:15.098370040 +0200
++++ samba-3.0.25c/source/configure	2007-08-26 13:09:05.419555107 +0200
 @@ -671,6 +671,9 @@
  logfilebase
  privatedir
@@ -110,7 +110,7 @@ Index: samba-3.0.25b/source/configure
         # glibc <= 2.3.2 has a broken getgrouplist
         if test "$cross_compiling" = yes; then
    { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-@@ -39139,11 +39174,14 @@
+@@ -39240,11 +39275,14 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -127,7 +127,7 @@ Index: samba-3.0.25b/source/configure
  			BLDSHARED="true"
  			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
  				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -61736,7 +61774,7 @@
+@@ -61780,7 +61818,7 @@
  echo "${ECHO_T}yes" >&6; };
  
  	case "$host_os" in
@@ -136,7 +136,7 @@ Index: samba-3.0.25b/source/configure
  		{ echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
  echo $ECHO_N "checking for linux sendfile64 support... $ECHO_C" >&6; }
  if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -62758,11 +62796,11 @@
+@@ -62802,11 +62840,11 @@
  SMB_KRB5_LOCATOR="bin/smb_krb5_locator.$SHLIBEXT"
  
  case "$host_os" in
@@ -150,7 +150,7 @@ Index: samba-3.0.25b/source/configure
  		# FreeBSD winbind client is implemented as a wrapper around
  		# the Linux version.
  		NSSSONAMEVERSIONSUFFIX=".1"
-@@ -67280,6 +67318,9 @@
+@@ -67324,6 +67362,9 @@
  logfilebase!$logfilebase$ac_delim
  privatedir!$privatedir$ac_delim
  swatdir!$swatdir$ac_delim
@@ -160,7 +160,7 @@ Index: samba-3.0.25b/source/configure
  rootsbindir!$rootsbindir$ac_delim
  pammodulesdir!$pammodulesdir$ac_delim
  SAMBA_CPPFLAGS!$SAMBA_CPPFLAGS$ac_delim
-@@ -67317,9 +67358,6 @@
+@@ -67361,9 +67402,6 @@
  PASSDB_LIBS!$PASSDB_LIBS$ac_delim
  IDMAP_LIBS!$IDMAP_LIBS$ac_delim
  KRB5_LIBS!$KRB5_LIBS$ac_delim
@@ -170,7 +170,7 @@ Index: samba-3.0.25b/source/configure
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -67361,6 +67399,9 @@
+@@ -67405,6 +67443,9 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -180,7 +180,7 @@ Index: samba-3.0.25b/source/configure
  INSTALL_PAM_MODULES!$INSTALL_PAM_MODULES$ac_delim
  UNINSTALL_PAM_MODULES!$UNINSTALL_PAM_MODULES$ac_delim
  NSS_MODULES!$NSS_MODULES$ac_delim
-@@ -67444,7 +67485,7 @@
+@@ -67488,7 +67529,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
@@ -189,10 +189,10 @@ Index: samba-3.0.25b/source/configure
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-Index: samba-3.0.25b/source/include/config.h.in
+Index: samba-3.0.25c/source/include/config.h.in
 ===================================================================
---- samba-3.0.25b.orig/source/include/config.h.in
-+++ samba-3.0.25b/source/include/config.h.in
+--- samba-3.0.25c.orig/source/include/config.h.in	2007-08-26 12:07:15.098370040 +0200
++++ samba-3.0.25c/source/include/config.h.in	2007-08-26 13:09:05.919530711 +0200
 @@ -57,6 +57,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC
diff --git a/patches/cifs-umount-same-user.patch b/patches/cifs-umount-same-user.patch
index 62918573ec..25161c8d27 100644
--- a/patches/cifs-umount-same-user.patch
+++ b/patches/cifs-umount-same-user.patch
@@ -7,10 +7,10 @@ Author: Steve Langasek <vorlon@debian.org>
 
 Upstream status: submitted as bugzilla bug #4784
 
-Index: samba-3.0.25b/source/client/umount.cifs.c
+Index: samba-3.0.25c/source/client/umount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/umount.cifs.c
-+++ samba-3.0.25b/source/client/umount.cifs.c
+--- samba-3.0.25c.orig/source/client/umount.cifs.c	2007-08-26 13:09:08.419408730 +0200
++++ samba-3.0.25c/source/client/umount.cifs.c	2007-08-26 13:09:08.919384334 +0200
 @@ -131,7 +131,7 @@
  		printf("user unmounting via %s is an optional feature of",thisprogram);
  		printf(" the cifs filesystem driver (cifs.ko)");
diff --git a/patches/cifs-umount-trailing-slashes.patch b/patches/cifs-umount-trailing-slashes.patch
index 1903619e50..73c97c7b8c 100644
--- a/patches/cifs-umount-trailing-slashes.patch
+++ b/patches/cifs-umount-trailing-slashes.patch
@@ -4,10 +4,10 @@ slash in the mount point name
 
 Upstream status: submitted as bugzilla bug #4781
 
-Index: samba-3.0.25b/source/client/umount.cifs.c
+Index: samba-3.0.25c/source/client/umount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/umount.cifs.c
-+++ samba-3.0.25b/source/client/umount.cifs.c
+--- samba-3.0.25c.orig/source/client/umount.cifs.c	2007-08-26 12:07:14.598393722 +0200
++++ samba-3.0.25c/source/client/umount.cifs.c	2007-08-26 13:09:08.419408730 +0200
 @@ -342,6 +342,10 @@
  
  	/* fixup path if needed */
diff --git a/patches/cups.patch b/patches/cups.patch
index f33f00ed19..43d6aaa423 100644
--- a/patches/cups.patch
+++ b/patches/cups.patch
@@ -7,11 +7,11 @@ 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.25b/source/include/includes.h
+Index: samba-3.0.25c/source/include/includes.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/includes.h
-+++ samba-3.0.25b/source/include/includes.h
-@@ -809,10 +809,7 @@
+--- samba-3.0.25c.orig/source/include/includes.h	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/include/includes.h	2007-08-26 13:08:58.419896656 +0200
+@@ -811,10 +811,7 @@
  #endif
  
  #ifndef DEFAULT_PRINTING
diff --git a/patches/documentation.patch b/patches/documentation.patch
index 8359a007b9..01d96a1773 100644
--- a/patches/documentation.patch
+++ b/patches/documentation.patch
@@ -6,10 +6,10 @@ Status wrt upstream: Debian specific
 
 Note: Some part should maybe go in the FHS patch
 
-Index: samba-3.0.25b/docs/manpages/swat.8
+Index: samba-3.0.25c/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/swat.8
-+++ samba-3.0.25b/docs/manpages/swat.8
+--- samba-3.0.25c.orig/docs/manpages/swat.8	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/swat.8	2007-08-26 13:08:58.919872259 +0200
 @@ -111,60 +111,6 @@
  .RS 3n
  Print a summary of command line options.
@@ -88,10 +88,10 @@ Index: samba-3.0.25b/docs/manpages/swat.8
  .RE
  .SH "WARNINGS"
  .PP
-Index: samba-3.0.25b/docs/manpages/nmbd.8
+Index: samba-3.0.25c/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/nmbd.8
-+++ samba-3.0.25b/docs/manpages/nmbd.8
+--- samba-3.0.25c.orig/docs/manpages/nmbd.8	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/nmbd.8	2007-08-26 13:08:58.919872259 +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.
@@ -137,10 +137,10 @@ Index: samba-3.0.25b/docs/manpages/nmbd.8
  nmbd
  to dump out its server database in the
  \fIlog.nmb\fR
-Index: samba-3.0.25b/docs/manpages/smbd.8
+Index: samba-3.0.25c/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/smbd.8
-+++ samba-3.0.25b/docs/manpages/smbd.8
+--- samba-3.0.25c.orig/docs/manpages/smbd.8	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/smbd.8	2007-08-26 13:08:58.919872259 +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
@@ -158,10 +158,10 @@ Index: samba-3.0.25b/docs/manpages/smbd.8
  .sp
  This file describes all the services the server is to make available to clients. See
  \fBsmb.conf\fR(5)
-Index: samba-3.0.25b/docs/manpages/lmhosts.5
+Index: samba-3.0.25c/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/lmhosts.5
-+++ samba-3.0.25b/docs/manpages/lmhosts.5
+--- samba-3.0.25c.orig/docs/manpages/lmhosts.5	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/lmhosts.5	2007-08-26 13:08:58.919872259 +0200
 @@ -77,10 +77,8 @@
  file.
  .SH "FILES"
@@ -175,10 +175,10 @@ Index: samba-3.0.25b/docs/manpages/lmhosts.5
  .SH "VERSION"
  .PP
  This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
+Index: samba-3.0.25c/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.0.25b/docs/manpages/ntlm_auth.1
+--- samba-3.0.25c.orig/docs/manpages/ntlm_auth.1	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/ntlm_auth.1	2007-08-26 13:08:58.919872259 +0200
 @@ -43,7 +43,7 @@
  Some of these commands also require access to the directory
  \fIwinbindd_privileged\fR
@@ -206,10 +206,10 @@ Index: samba-3.0.25b/docs/manpages/ntlm_auth.1
  .RE
  .PP
  gss-spnego-client
-Index: samba-3.0.25b/docs/manpages/tdbbackup.8
+Index: samba-3.0.25c/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/tdbbackup.8
-+++ samba-3.0.25b/docs/manpages/tdbbackup.8
+--- samba-3.0.25c.orig/docs/manpages/tdbbackup.8	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/tdbbackup.8	2007-08-26 13:08:58.919872259 +0200
 @@ -70,17 +70,17 @@
  \(bu
  
@@ -231,10 +231,10 @@ Index: samba-3.0.25b/docs/manpages/tdbbackup.8
  .SH "VERSION"
  .PP
  This man page is correct for version 3.0 of the Samba suite.
-Index: samba-3.0.25b/docs/manpages/winbindd.8
+Index: samba-3.0.25c/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.25b.orig/docs/manpages/winbindd.8
-+++ samba-3.0.25b/docs/manpages/winbindd.8
+--- samba-3.0.25c.orig/docs/manpages/winbindd.8	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/docs/manpages/winbindd.8	2007-08-26 13:08:58.919872259 +0200
 @@ -440,16 +440,16 @@
  file are owned by root.
  .RE
diff --git a/patches/fhs.patch b/patches/fhs.patch
index db85ae35a1..ecce1cd0ff 100644
--- a/patches/fhs.patch
+++ b/patches/fhs.patch
@@ -42,10 +42,10 @@ Note: Use dedicated directories for:
       grep -r lp_lockdir source/ | grep -vE \
          '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
 
-Index: samba-3.0.25b/source/Makefile.in
+Index: samba-3.0.25c/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in
-+++ samba-3.0.25b/source/Makefile.in
+--- samba-3.0.25c.orig/source/Makefile.in	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/Makefile.in	2007-08-26 13:08:59.419847863 +0200
 @@ -106,6 +106,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -82,10 +82,10 @@ Index: samba-3.0.25b/source/Makefile.in
  
  installswat: installdirs installmsg
  	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
-Index: samba-3.0.25b/source/configure.in
+Index: samba-3.0.25c/source/configure.in
 ===================================================================
---- samba-3.0.25b.orig/source/configure.in
-+++ samba-3.0.25b/source/configure.in
+--- samba-3.0.25c.orig/source/configure.in	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/configure.in	2007-08-26 13:08:59.419847863 +0200
 @@ -40,7 +40,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -116,10 +116,10 @@ Index: samba-3.0.25b/source/configure.in
  AC_SUBST(rootsbindir)
  AC_SUBST(pammodulesdir)
  
-Index: samba-3.0.25b/source/dynconfig.c
+Index: samba-3.0.25c/source/dynconfig.c
 ===================================================================
---- samba-3.0.25b.orig/source/dynconfig.c
-+++ samba-3.0.25b/source/dynconfig.c
+--- samba-3.0.25c.orig/source/dynconfig.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/dynconfig.c	2007-08-26 13:08:59.419847863 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -162,10 +162,10 @@ Index: samba-3.0.25b/source/dynconfig.c
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.25b/source/include/dynconfig.h
+Index: samba-3.0.25c/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/dynconfig.h
-+++ samba-3.0.25b/source/include/dynconfig.h
+--- samba-3.0.25c.orig/source/include/dynconfig.h	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/include/dynconfig.h	2007-08-26 13:08:59.419847863 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -179,10 +179,10 @@ Index: samba-3.0.25b/source/include/dynconfig.h
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
-Index: samba-3.0.25b/source/intl/lang_tdb.c
+Index: samba-3.0.25c/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/intl/lang_tdb.c
-+++ samba-3.0.25b/source/intl/lang_tdb.c
+--- samba-3.0.25c.orig/source/intl/lang_tdb.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/intl/lang_tdb.c	2007-08-26 13:08:59.919823466 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -192,11 +192,11 @@ Index: samba-3.0.25b/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.25b/source/lib/util.c
+Index: samba-3.0.25c/source/lib/util.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/util.c
-+++ samba-3.0.25b/source/lib/util.c
-@@ -2630,6 +2630,61 @@
+--- samba-3.0.25c.orig/source/lib/util.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/lib/util.c	2007-08-26 13:08:59.919823466 +0200
+@@ -2632,6 +2632,61 @@
  }
  
  /**
@@ -258,10 +258,10 @@ Index: samba-3.0.25b/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.25b/source/lib/util_unistr.c
+Index: samba-3.0.25c/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/util_unistr.c
-+++ samba-3.0.25b/source/lib/util_unistr.c
+--- samba-3.0.25c.orig/source/lib/util_unistr.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/lib/util_unistr.c	2007-08-26 13:08:59.919823466 +0200
 @@ -88,11 +88,11 @@
  	}
  	initialised = 1;
@@ -285,10 +285,10 @@ Index: samba-3.0.25b/source/lib/util_unistr.c
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.25b/source/libsmb/samlogon_cache.c
+Index: samba-3.0.25c/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/libsmb/samlogon_cache.c
-+++ samba-3.0.25b/source/libsmb/samlogon_cache.c
+--- samba-3.0.25c.orig/source/libsmb/samlogon_cache.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/libsmb/samlogon_cache.c	2007-08-26 13:08:59.919823466 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -307,10 +307,10 @@ Index: samba-3.0.25b/source/libsmb/samlogon_cache.c
  				   WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
-Index: samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.25c/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
+--- samba-3.0.25c.orig/source/nmbd/nmbd_serverlistdb.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/nmbd/nmbd_serverlistdb.c	2007-08-26 13:08:59.919823466 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -320,10 +320,10 @@ Index: samba-3.0.25b/source/nmbd/nmbd_serverlistdb.c
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.25b/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.25c/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.25b.orig/source/nmbd/nmbd_winsserver.c
-+++ samba-3.0.25b/source/nmbd/nmbd_winsserver.c
+--- samba-3.0.25c.orig/source/nmbd/nmbd_winsserver.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/nmbd/nmbd_winsserver.c	2007-08-26 13:08:59.919823466 +0200
 @@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
@@ -342,10 +342,10 @@ Index: samba-3.0.25b/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.25b/source/passdb/login_cache.c
+Index: samba-3.0.25c/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/login_cache.c
-+++ samba-3.0.25b/source/passdb/login_cache.c
+--- samba-3.0.25c.orig/source/passdb/login_cache.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/passdb/login_cache.c	2007-08-26 13:08:59.919823466 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -355,10 +355,10 @@ Index: samba-3.0.25b/source/passdb/login_cache.c
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.25b/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.25c/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/winbindd_cache.c
-+++ samba-3.0.25b/source/nsswitch/winbindd_cache.c
+--- samba-3.0.25c.orig/source/nsswitch/winbindd_cache.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/nsswitch/winbindd_cache.c	2007-08-26 13:08:59.919823466 +0200
 @@ -2180,7 +2180,7 @@
  		return True;
  
@@ -389,10 +389,10 @@ Index: samba-3.0.25b/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.25b/source/param/loadparm.c
+Index: samba-3.0.25c/source/param/loadparm.c
 ===================================================================
---- samba-3.0.25b.orig/source/param/loadparm.c
-+++ samba-3.0.25b/source/param/loadparm.c
+--- samba-3.0.25c.orig/source/param/loadparm.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/param/loadparm.c	2007-08-26 13:08:59.919823466 +0200
 @@ -108,6 +108,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -417,10 +417,10 @@ Index: samba-3.0.25b/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.25b/source/passdb/secrets.c
+Index: samba-3.0.25c/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/secrets.c
-+++ samba-3.0.25b/source/passdb/secrets.c
+--- samba-3.0.25c.orig/source/passdb/secrets.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/passdb/secrets.c	2007-08-26 13:08:59.919823466 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -431,10 +431,10 @@ Index: samba-3.0.25b/source/passdb/secrets.c
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.25b/source/printing/nt_printing.c
+Index: samba-3.0.25c/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/nt_printing.c
-+++ samba-3.0.25b/source/printing/nt_printing.c
+--- samba-3.0.25c.orig/source/printing/nt_printing.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/printing/nt_printing.c	2007-08-26 13:08:59.919823466 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -479,10 +479,10 @@ Index: samba-3.0.25b/source/printing/nt_printing.c
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25b/source/printing/printing.c
+Index: samba-3.0.25c/source/printing/printing.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/printing.c
-+++ samba-3.0.25b/source/printing/printing.c
+--- samba-3.0.25c.orig/source/printing/printing.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/printing/printing.c	2007-08-26 13:08:59.919823466 +0200
 @@ -185,8 +185,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -494,10 +494,10 @@ Index: samba-3.0.25b/source/printing/printing.c
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.25b/source/printing/printing_db.c
+Index: samba-3.0.25c/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.25b.orig/source/printing/printing_db.c
-+++ samba-3.0.25b/source/printing/printing_db.c
+--- samba-3.0.25c.orig/source/printing/printing_db.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/printing/printing_db.c	2007-08-26 13:09:00.419799070 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -507,10 +507,10 @@ Index: samba-3.0.25b/source/printing/printing_db.c
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.25b/source/smbd/lanman.c
+Index: samba-3.0.25c/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.25b.orig/source/smbd/lanman.c
-+++ samba-3.0.25b/source/smbd/lanman.c
+--- samba-3.0.25c.orig/source/smbd/lanman.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/smbd/lanman.c	2007-08-26 13:09:00.419799070 +0200
 @@ -1088,9 +1088,9 @@
  	BOOL local_list_only;
  	int i;
@@ -523,10 +523,10 @@ Index: samba-3.0.25b/source/smbd/lanman.c
  		return 0;
  	}
  
-Index: samba-3.0.25b/source/registry/reg_db.c
+Index: samba-3.0.25c/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.25b.orig/source/registry/reg_db.c
-+++ samba-3.0.25b/source/registry/reg_db.c
+--- samba-3.0.25c.orig/source/registry/reg_db.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/registry/reg_db.c	2007-08-26 13:09:00.419799070 +0200
 @@ -234,12 +234,12 @@
  	if ( tdb_reg )
  		return True;
@@ -557,10 +557,10 @@ Index: samba-3.0.25b/source/registry/reg_db.c
  	}
  
  	unbecome_root();
-Index: samba-3.0.25b/source/lib/account_pol.c
+Index: samba-3.0.25c/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/account_pol.c
-+++ samba-3.0.25b/source/lib/account_pol.c
+--- samba-3.0.25c.orig/source/lib/account_pol.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/lib/account_pol.c	2007-08-26 13:09:00.419799070 +0200
 @@ -213,9 +213,9 @@
  		return True;
  	}
@@ -573,10 +573,10 @@ Index: samba-3.0.25b/source/lib/account_pol.c
  		if (!tdb) {
  			DEBUG(0,("Failed to open account policy database\n"));
  			return False;
-Index: samba-3.0.25b/source/registry/reg_perfcount.c
+Index: samba-3.0.25c/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.25b.orig/source/registry/reg_perfcount.c
-+++ samba-3.0.25b/source/registry/reg_perfcount.c
+--- samba-3.0.25c.orig/source/registry/reg_perfcount.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/registry/reg_perfcount.c	2007-08-26 13:09:00.419799070 +0200
 @@ -46,7 +46,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -595,10 +595,10 @@ Index: samba-3.0.25b/source/registry/reg_perfcount.c
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.25c/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.25b.orig/source/rpc_server/srv_eventlog_lib.c
-+++ samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
+--- samba-3.0.25c.orig/source/rpc_server/srv_eventlog_lib.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/rpc_server/srv_eventlog_lib.c	2007-08-26 13:09:00.419799070 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -617,10 +617,10 @@ Index: samba-3.0.25b/source/rpc_server/srv_eventlog_lib.c
  	if ( !directory_exist( eventlogdir, NULL ) )
  		mkdir( eventlogdir, 0755 );	
  	
-Index: samba-3.0.25b/source/passdb/pdb_tdb.c
+Index: samba-3.0.25c/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/passdb/pdb_tdb.c
-+++ samba-3.0.25b/source/passdb/pdb_tdb.c
+--- samba-3.0.25c.orig/source/passdb/pdb_tdb.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/passdb/pdb_tdb.c	2007-08-26 13:09:00.419799070 +0200
 @@ -1559,7 +1559,7 @@
  	uint32 rid;
  	BOOL ret = False;
@@ -639,10 +639,10 @@ Index: samba-3.0.25b/source/passdb/pdb_tdb.c
  		pfile = tdbfile;
  	}
  	pstrcpy( tdbsam_filename, pfile );
-Index: samba-3.0.25b/source/groupdb/mapping_tdb.c
+Index: samba-3.0.25c/source/groupdb/mapping_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/groupdb/mapping_tdb.c
-+++ samba-3.0.25b/source/groupdb/mapping_tdb.c
+--- samba-3.0.25c.orig/source/groupdb/mapping_tdb.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/groupdb/mapping_tdb.c	2007-08-26 13:09:00.419799070 +0200
 @@ -39,7 +39,7 @@
  	if (tdb)
  		return True;
@@ -652,10 +652,10 @@ Index: samba-3.0.25b/source/groupdb/mapping_tdb.c
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.25b/source/nsswitch/idmap_tdb.c
+Index: samba-3.0.25c/source/nsswitch/idmap_tdb.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/idmap_tdb.c
-+++ samba-3.0.25b/source/nsswitch/idmap_tdb.c
+--- samba-3.0.25c.orig/source/nsswitch/idmap_tdb.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/nsswitch/idmap_tdb.c	2007-08-26 13:09:00.419799070 +0200
 @@ -247,7 +247,7 @@
  	}
  
@@ -665,10 +665,10 @@ Index: samba-3.0.25b/source/nsswitch/idmap_tdb.c
  	if (!tdbfile) {
  		DEBUG(0, ("Out of memory!\n"));
  		ret = NT_STATUS_NO_MEMORY;
-Index: samba-3.0.25b/source/utils/smbcontrol.c
+Index: samba-3.0.25c/source/utils/smbcontrol.c
 ===================================================================
---- samba-3.0.25b.orig/source/utils/smbcontrol.c
-+++ samba-3.0.25b/source/utils/smbcontrol.c
+--- samba-3.0.25c.orig/source/utils/smbcontrol.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/utils/smbcontrol.c	2007-08-26 13:09:00.419799070 +0200
 @@ -832,10 +832,10 @@
  	/* Remove the entry in the winbindd_cache tdb to tell a later
  	   starting winbindd that we're online. */
@@ -698,10 +698,10 @@ Index: samba-3.0.25b/source/utils/smbcontrol.c
  		return False;
  	}
  
-Index: samba-3.0.25b/source/lib/sharesec.c
+Index: samba-3.0.25c/source/lib/sharesec.c
 ===================================================================
---- samba-3.0.25b.orig/source/lib/sharesec.c
-+++ samba-3.0.25b/source/lib/sharesec.c
+--- samba-3.0.25c.orig/source/lib/sharesec.c	2007-08-26 13:07:02.925532676 +0200
++++ samba-3.0.25c/source/lib/sharesec.c	2007-08-26 13:09:00.419799070 +0200
 @@ -47,10 +47,10 @@
  		return True;
  	}
@@ -715,10 +715,10 @@ Index: samba-3.0.25b/source/lib/sharesec.c
  		return False;
  	}
   
-Index: samba-3.0.25b/source/libgpo/gpo_fetch.c
+Index: samba-3.0.25c/source/libgpo/gpo_fetch.c
 ===================================================================
---- samba-3.0.25b.orig/source/libgpo/gpo_fetch.c
-+++ samba-3.0.25b/source/libgpo/gpo_fetch.c
+--- samba-3.0.25c.orig/source/libgpo/gpo_fetch.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/libgpo/gpo_fetch.c	2007-08-26 13:09:00.419799070 +0200
 @@ -60,7 +60,7 @@
  		return NT_STATUS_NO_MEMORY;
  	}
@@ -737,10 +737,10 @@ Index: samba-3.0.25b/source/libgpo/gpo_fetch.c
  	char *current_dir;
  	fstring tok;
  
-Index: samba-3.0.25b/source/nsswitch/idmap_cache.c
+Index: samba-3.0.25c/source/nsswitch/idmap_cache.c
 ===================================================================
---- samba-3.0.25b.orig/source/nsswitch/idmap_cache.c
-+++ samba-3.0.25b/source/nsswitch/idmap_cache.c
+--- samba-3.0.25c.orig/source/nsswitch/idmap_cache.c	2007-08-26 13:07:03.425508276 +0200
++++ samba-3.0.25c/source/nsswitch/idmap_cache.c	2007-08-26 13:09:00.419799070 +0200
 @@ -55,7 +55,7 @@
  		return NULL;
  	}
diff --git a/patches/installswat.sh.patch b/patches/installswat.sh.patch
index e3f7e63979..23f68a4d68 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.25b/source/script/installswat.sh
+Index: samba-3.0.25c/source/script/installswat.sh
 ===================================================================
---- samba-3.0.25b.orig/source/script/installswat.sh
-+++ samba-3.0.25b/source/script/installswat.sh
+--- samba-3.0.25c.orig/source/script/installswat.sh	2007-08-26 12:07:17.098275313 +0200
++++ samba-3.0.25c/source/script/installswat.sh	2007-08-26 13:09:01.419750278 +0200
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)
diff --git a/patches/linux-cifs-user-perms.patch b/patches/linux-cifs-user-perms.patch
index 0cb6898a96..4f226b9f29 100644
--- a/patches/linux-cifs-user-perms.patch
+++ b/patches/linux-cifs-user-perms.patch
@@ -3,10 +3,10 @@ gid= options matching the current process
 
 Upstream status: submitted as bugzilla bug #4780
 
-Index: samba-3.0.25b/source/client/mount.cifs.c
+Index: samba-3.0.25c/source/client/mount.cifs.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/mount.cifs.c
-+++ samba-3.0.25b/source/client/mount.cifs.c
+--- samba-3.0.25c.orig/source/client/mount.cifs.c	2007-08-26 12:07:14.598393722 +0200
++++ samba-3.0.25c/source/client/mount.cifs.c	2007-08-26 13:09:08.419408730 +0200
 @@ -321,6 +321,8 @@
  	int out_len = 0;
  	int word_len;
diff --git a/patches/make-distclean.patch b/patches/make-distclean.patch
index 4737109bf8..44473de6b8 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.25b/source/Makefile.in
+Index: samba-3.0.25c/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in
-+++ samba-3.0.25b/source/Makefile.in
+--- samba-3.0.25c.orig/source/Makefile.in	2007-08-26 13:08:59.419847863 +0200
++++ samba-3.0.25c/source/Makefile.in	2007-08-26 13:09:01.919725881 +0200
 @@ -1688,6 +1688,7 @@
  
  python_clean:
diff --git a/patches/missing_userspace_bugzilla999.patch b/patches/missing_userspace_bugzilla999.patch
index 43dbd063b8..8ccb0c47b8 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.25b/source/client/smbmnt.c
+Index: samba-3.0.25c/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c
-+++ samba-3.0.25b/source/client/smbmnt.c
+--- samba-3.0.25c.orig/source/client/smbmnt.c	2007-08-26 13:09:03.919628296 +0200
++++ samba-3.0.25c/source/client/smbmnt.c	2007-08-26 13:09:07.919433127 +0200
 @@ -49,6 +49,10 @@
  static unsigned mount_dmask;
  static int user_mount;
@@ -81,10 +81,10 @@ Index: samba-3.0.25b/source/client/smbmnt.c
  	}
  
          if (geteuid() != 0) {
-Index: samba-3.0.25b/source/client/smbmount.c
+Index: samba-3.0.25c/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmount.c
-+++ samba-3.0.25b/source/client/smbmount.c
+--- samba-3.0.25c.orig/source/client/smbmount.c	2007-08-26 13:09:03.919628296 +0200
++++ samba-3.0.25c/source/client/smbmount.c	2007-08-26 13:09:07.919433127 +0200
 @@ -43,6 +43,10 @@
  static int smb_port = 0;
  static BOOL got_user;
diff --git a/patches/no_smbmount_symlink.patch b/patches/no_smbmount_symlink.patch
index a884a61180..a502cf0161 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.25b/source/script/installbin.sh.in
+Index: samba-3.0.25c/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.25b.orig/source/script/installbin.sh.in
-+++ samba-3.0.25b/source/script/installbin.sh.in
+--- samba-3.0.25c.orig/source/script/installbin.sh.in	2007-08-26 12:07:16.598298995 +0200
++++ samba-3.0.25c/source/script/installbin.sh.in	2007-08-26 13:09:02.919677088 +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 ce680f3d46..d1695432f3 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.25b/source/configure.in
+Index: samba-3.0.25c/source/configure.in
 ===================================================================
---- samba-3.0.25b.orig/source/configure.in
-+++ samba-3.0.25b/source/configure.in
+--- samba-3.0.25c.orig/source/configure.in	2007-08-26 13:08:59.419847863 +0200
++++ samba-3.0.25c/source/configure.in	2007-08-26 13:09:01.919725881 +0200
 @@ -758,6 +758,15 @@
        fi
      ;;
@@ -36,7 +36,7 @@ Index: samba-3.0.25b/source/configure.in
         # glibc <= 2.3.2 has a broken getgrouplist
         AC_TRY_RUN([
  #include <unistd.h>
-@@ -1681,7 +1690,10 @@
+@@ -1689,7 +1698,10 @@
  
    # and these are for particular systems
    case "$host_os" in
@@ -48,7 +48,7 @@ Index: samba-3.0.25b/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"
-@@ -5409,7 +5421,7 @@
+@@ -5417,7 +5429,7 @@
  	AC_MSG_RESULT(yes);
  
  	case "$host_os" in
@@ -57,7 +57,7 @@ Index: samba-3.0.25b/source/configure.in
  		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
  		AC_TRY_LINK([#include <sys/sendfile.h>],
  [\
-@@ -5714,11 +5726,11 @@
+@@ -5722,11 +5734,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 4c9ef5c187..aa9fa76d5a 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.25b/source/pam_smbpass/README
+Index: samba-3.0.25c/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/README
-+++ samba-3.0.25b/source/pam_smbpass/README
+--- samba-3.0.25c.orig/source/pam_smbpass/README	2007-08-26 12:07:16.598298995 +0200
++++ samba-3.0.25c/source/pam_smbpass/README	2007-08-26 13:09:02.419701485 +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 dd23abdffe..be03b6e2e1 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.25b/source/python/examples/tdbpack/tdbtimetrial.py
+Index: samba-3.0.25c/source/python/examples/tdbpack/tdbtimetrial.py
 ===================================================================
---- samba-3.0.25b.orig/source/python/examples/tdbpack/tdbtimetrial.py
-+++ samba-3.0.25b/source/python/examples/tdbpack/tdbtimetrial.py
+--- samba-3.0.25c.orig/source/python/examples/tdbpack/tdbtimetrial.py	2007-08-26 12:07:15.098370040 +0200
++++ samba-3.0.25c/source/python/examples/tdbpack/tdbtimetrial.py	2007-08-26 13:09:07.419457523 +0200
 @@ -1,4 +1,4 @@
 -#! /usr/bin/python2.2
 +#! /usr/bin/python
  
  def run_trial():
      # import tdbutil
-Index: samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py
+Index: samba-3.0.25c/source/python/examples/tdbpack/test_tdbpack.py
 ===================================================================
---- samba-3.0.25b.orig/source/python/examples/tdbpack/test_tdbpack.py
-+++ samba-3.0.25b/source/python/examples/tdbpack/test_tdbpack.py
+--- samba-3.0.25c.orig/source/python/examples/tdbpack/test_tdbpack.py	2007-08-26 12:07:15.098370040 +0200
++++ samba-3.0.25c/source/python/examples/tdbpack/test_tdbpack.py	2007-08-26 13:09:07.419457523 +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 1a7efa254c..200fe23290 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.25b/source/include/local.h
+Index: samba-3.0.25c/source/include/local.h
 ===================================================================
---- samba-3.0.25b.orig/source/include/local.h
-+++ samba-3.0.25b/source/include/local.h
+--- samba-3.0.25c.orig/source/include/local.h	2007-08-26 12:07:16.098322677 +0200
++++ samba-3.0.25c/source/include/local.h	2007-08-26 13:09:03.419652692 +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 8c66b6206a..9fd41b0447 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.25b/source/client/smbmnt.c
+Index: samba-3.0.25c/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c
-+++ samba-3.0.25b/source/client/smbmnt.c
+--- samba-3.0.25c.orig/source/client/smbmnt.c	2007-08-26 12:07:16.098322677 +0200
++++ samba-3.0.25c/source/client/smbmnt.c	2007-08-26 13:09:03.419652692 +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 456bcbb0f5..26257bf395 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.25b/source/client/smbmnt.c
+Index: samba-3.0.25c/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmnt.c
-+++ samba-3.0.25b/source/client/smbmnt.c
+--- samba-3.0.25c.orig/source/client/smbmnt.c	2007-08-26 13:09:03.419652692 +0200
++++ samba-3.0.25c/source/client/smbmnt.c	2007-08-26 13:09:03.919628296 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -113,10 +113,10 @@ Index: samba-3.0.25b/source/client/smbmnt.c
  
  	return 0;
  }	
-Index: samba-3.0.25b/source/client/smbmount.c
+Index: samba-3.0.25c/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25b.orig/source/client/smbmount.c
-+++ samba-3.0.25b/source/client/smbmount.c
+--- samba-3.0.25c.orig/source/client/smbmount.c	2007-08-26 12:07:16.098322677 +0200
++++ samba-3.0.25c/source/client/smbmount.c	2007-08-26 13:09:03.919628296 +0200
 @@ -48,6 +48,7 @@
  static int mount_ro;
  static unsigned mount_fmask;
diff --git a/patches/smbpasswd-syslog.patch b/patches/smbpasswd-syslog.patch
index 589567e605..60aca763fe 100644
--- a/patches/smbpasswd-syslog.patch
+++ b/patches/smbpasswd-syslog.patch
@@ -4,10 +4,10 @@ Fixes: bug #434372
 
 Upstream status: submitted as bugzilla bug #4831
 
-Index: samba-3.0.25b/source/pam_smbpass/support.c
+Index: samba-3.0.25c/source/pam_smbpass/support.c
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/support.c
-+++ samba-3.0.25b/source/pam_smbpass/support.c
+--- samba-3.0.25c.orig/source/pam_smbpass/support.c	2007-08-26 12:07:14.098417404 +0200
++++ samba-3.0.25c/source/pam_smbpass/support.c	2007-08-26 13:09:09.419359938 +0200
 @@ -15,6 +15,7 @@
  	 * Mass Ave, Cambridge, MA 02139, USA.
  	 */
@@ -292,10 +292,10 @@ Index: samba-3.0.25b/source/pam_smbpass/support.c
  	}
  	make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
  				"No password supplied" : "Password unchanged" );
-Index: samba-3.0.25b/source/pam_smbpass/pam_smb_auth.c
+Index: samba-3.0.25c/source/pam_smbpass/pam_smb_auth.c
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.0.25b/source/pam_smbpass/pam_smb_auth.c
+--- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_auth.c	2007-08-26 12:07:14.098417404 +0200
++++ samba-3.0.25c/source/pam_smbpass/pam_smb_auth.c	2007-08-26 13:09:09.419359938 +0200
 @@ -75,10 +75,9 @@
  
  	/* Samba initialization. */
@@ -365,10 +365,10 @@ Index: samba-3.0.25b/source/pam_smbpass/pam_smb_auth.c
  	return PAM_AUTHTOK_RECOVER_ERR;
      } else if (pass == NULL) {
  	return PAM_AUTHTOK_RECOVER_ERR;
-Index: samba-3.0.25b/source/pam_smbpass/pam_smb_acct.c
+Index: samba-3.0.25c/source/pam_smbpass/pam_smb_acct.c
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.0.25b/source/pam_smbpass/pam_smb_acct.c
+--- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_acct.c	2007-08-26 12:07:14.098417404 +0200
++++ samba-3.0.25c/source/pam_smbpass/pam_smb_acct.c	2007-08-26 13:09:09.419359938 +0200
 @@ -52,29 +52,28 @@
  
  	/* Samba initialization. */
@@ -423,10 +423,10 @@ Index: samba-3.0.25b/source/pam_smbpass/pam_smb_acct.c
  		}
  		make_remark( pamh, ctrl, PAM_ERROR_MSG
  			, "Your account has been disabled; "
-Index: samba-3.0.25b/source/pam_smbpass/pam_smb_passwd.c
+Index: samba-3.0.25c/source/pam_smbpass/pam_smb_passwd.c
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.0.25b/source/pam_smbpass/pam_smb_passwd.c
+--- samba-3.0.25c.orig/source/pam_smbpass/pam_smb_passwd.c	2007-08-26 12:07:14.098417404 +0200
++++ samba-3.0.25c/source/pam_smbpass/pam_smb_passwd.c	2007-08-26 13:09:09.419359938 +0200
 @@ -104,10 +104,9 @@
  
      /* Samba initialization. */
@@ -558,10 +558,10 @@ Index: samba-3.0.25b/source/pam_smbpass/pam_smb_passwd.c
          retval = PAM_ABORT;
  
      }
-Index: samba-3.0.25b/source/pam_smbpass/support.h
+Index: samba-3.0.25c/source/pam_smbpass/support.h
 ===================================================================
---- samba-3.0.25b.orig/source/pam_smbpass/support.h
-+++ samba-3.0.25b/source/pam_smbpass/support.h
+--- samba-3.0.25c.orig/source/pam_smbpass/support.h	2007-08-26 12:07:14.098417404 +0200
++++ samba-3.0.25c/source/pam_smbpass/support.h	2007-08-26 13:09:09.419359938 +0200
 @@ -1,8 +1,8 @@
  /* syslogging function for errors and other information */
 -extern void _log_err(int, const char *, ...);
diff --git a/patches/smbstatus-locking.patch b/patches/smbstatus-locking.patch
index 05fdce02f7..47397837d1 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.25b/source/utils/status.c
+Index: samba-3.0.25c/source/utils/status.c
 ===================================================================
---- samba-3.0.25b.orig/source/utils/status.c
-+++ samba-3.0.25b/source/utils/status.c
+--- samba-3.0.25c.orig/source/utils/status.c	2007-08-26 12:07:15.598346358 +0200
++++ samba-3.0.25c/source/utils/status.c	2007-08-26 13:09:04.419603900 +0200
 @@ -367,6 +367,16 @@
  	if ( show_locks ) {
  		int ret;
diff --git a/patches/undefined-symbols.patch b/patches/undefined-symbols.patch
index 914b9f9a8a..3945b775a4 100644
--- a/patches/undefined-symbols.patch
+++ b/patches/undefined-symbols.patch
@@ -9,10 +9,10 @@ for it.
 
 Note: 
 
-Index: samba-3.0.25b/source/Makefile.in
+Index: samba-3.0.25c/source/Makefile.in
 ===================================================================
---- samba-3.0.25b.orig/source/Makefile.in
-+++ samba-3.0.25b/source/Makefile.in
+--- samba-3.0.25c.orig/source/Makefile.in	2007-08-26 13:09:01.919725881 +0200
++++ samba-3.0.25c/source/Makefile.in	2007-08-26 13:09:04.419603900 +0200
 @@ -1161,7 +1161,7 @@
  
  bin/libsmbclient.@SHLIBEXT@: proto_exists $(LIBSMBCLIENT_OBJ)