[Pkg-samba-maint] r1093 - trunk/patches

Christian Perrier bubulle at costa.debian.org
Tue Jul 11 07:00:12 UTC 2006 

Author: bubulle
Date: 2006-07-11 07:00:09 +0000 (Tue, 11 Jul 2006)
New Revision: 1093

Modified:
   trunk/patches/README_nosmbldap-tools.patch
   trunk/patches/VERSION.patch
   trunk/patches/adapt_machine_creation_script.patch
   trunk/patches/autoconf.patch
   trunk/patches/cups.patch
   trunk/patches/documentation.patch
   trunk/patches/fhs.patch
   trunk/patches/installswat.sh.patch
   trunk/patches/make-distclean.patch
   trunk/patches/nmbd-signalling.patch
   trunk/patches/non-linux-ports.patch
   trunk/patches/nonpic-libsmbclient.patch
   trunk/patches/pam-examples.patch
   trunk/patches/samba.patch
   trunk/patches/smbclient-pager.patch
   trunk/patches/smbmount-mtab-flags.patch
   trunk/patches/smbmount-nomtab.patch
   trunk/patches/smbmount-unix-caps.patch
   trunk/patches/smbstatus-locking.patch
   trunk/patches/undefined-symbols.patch
Log:
Refresh patches with 3.0.23 source


Modified: trunk/patches/README_nosmbldap-tools.patch
===================================================================
--- trunk/patches/README_nosmbldap-tools.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/README_nosmbldap-tools.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/examples/LDAP/README
+Index: samba-3.0.23/examples/LDAP/README
 ===================================================================
---- samba-3.0.23rc3.orig/examples/LDAP/README	2006-06-24 13:46:17.184839500 +0200
-+++ samba-3.0.23rc3/examples/LDAP/README	2006-06-24 13:46:53.511109750 +0200
+--- samba-3.0.23.orig/examples/LDAP/README	2006-07-11 08:58:30.150254728 +0200
++++ samba-3.0.23/examples/LDAP/README	2006-07-11 08:59:37.278713340 +0200
 @@ -59,6 +59,9 @@
  The smbldap-tools package can be downloaded individually from 
  http://samba.idealx.org/dist/

Modified: trunk/patches/VERSION.patch
===================================================================
--- trunk/patches/VERSION.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/VERSION.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/VERSION
+Index: samba-3.0.23/source/VERSION
 ===================================================================
---- samba-3.0.23rc3.orig/source/VERSION	2006-06-24 13:46:15.540736750 +0200
-+++ samba-3.0.23rc3/source/VERSION	2006-06-24 13:47:02.099646500 +0200
+--- samba-3.0.23.orig/source/VERSION	2006-07-11 08:58:28.526243709 +0200
++++ samba-3.0.23/source/VERSION	2006-07-11 08:59:44.550763371 +0200
 @@ -96,5 +96,5 @@
  # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
  #  ->  "CVS 3.0.0rc2-VendorVersion"                    #

Modified: trunk/patches/adapt_machine_creation_script.patch
===================================================================
--- trunk/patches/adapt_machine_creation_script.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/adapt_machine_creation_script.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -3,10 +3,10 @@
 
 Status wrt upstream: Debian specific
 
-Index: samba-3.0.23rc3/docs/manpages/smb.conf.5
+Index: samba-3.0.23/docs/manpages/smb.conf.5
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/smb.conf.5	2006-06-24 13:46:15.388727250 +0200
-+++ samba-3.0.23rc3/docs/manpages/smb.conf.5	2006-06-24 13:47:02.995702500 +0200
+--- samba-3.0.23.orig/docs/manpages/smb.conf.5	2006-07-11 08:58:28.366242624 +0200
++++ samba-3.0.23/docs/manpages/smb.conf.5	2006-07-11 08:59:45.438769485 +0200
 @@ -522,7 +522,7 @@
  
  Default: \fB\fIadd machine script\fR = \fR 

Modified: trunk/patches/autoconf.patch
===================================================================
--- trunk/patches/autoconf.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/autoconf.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/configure
+Index: samba-3.0.23/source/configure
 ===================================================================
---- samba-3.0.23rc3.orig/source/configure	2006-06-24 13:46:15.188714750 +0200
-+++ samba-3.0.23rc3/source/configure	2006-06-24 13:47:04.031767250 +0200
+--- samba-3.0.23.orig/source/configure	2006-07-11 08:58:28.138241077 +0200
++++ samba-3.0.23/source/configure	2006-07-11 08:59:46.462776537 +0200
 @@ -310,7 +310,7 @@
  # include <unistd.h>
  #endif"
@@ -3124,10 +3124,10 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
-Index: samba-3.0.23rc3/source/include/config.h.in
+Index: samba-3.0.23/source/include/config.h.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/include/config.h.in	2006-06-24 13:46:15.228717250 +0200
-+++ samba-3.0.23rc3/source/include/config.h.in	2006-06-24 13:47:04.035767500 +0200
+--- samba-3.0.23.orig/source/include/config.h.in	2006-07-11 08:58:28.178241348 +0200
++++ samba-3.0.23/source/include/config.h.in	2006-07-11 08:59:46.470776592 +0200
 @@ -48,6 +48,9 @@
  /* Define to turn on dmalloc debugging */
  #undef ENABLE_DMALLOC

Modified: trunk/patches/cups.patch
===================================================================
--- trunk/patches/cups.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/cups.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/include/includes.h
+Index: samba-3.0.23/source/include/includes.h
 ===================================================================
---- samba-3.0.23rc3.orig/source/include/includes.h	2006-06-24 13:46:20.233030000 +0200
-+++ samba-3.0.23rc3/source/include/includes.h	2006-06-24 13:46:42.866444500 +0200
+--- samba-3.0.23.orig/source/include/includes.h	2006-07-11 08:58:33.154275120 +0200
++++ samba-3.0.23/source/include/includes.h	2006-07-11 08:59:27.258644509 +0200
 @@ -1076,10 +1076,7 @@
  #endif
  

Modified: trunk/patches/documentation.patch
===================================================================
--- trunk/patches/documentation.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/documentation.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/docs/manpages/swat.8
+Index: samba-3.0.23/docs/manpages/swat.8
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/swat.8	2006-06-24 13:46:19.881008000 +0200
-+++ samba-3.0.23rc3/docs/manpages/swat.8	2006-06-24 13:46:43.774501250 +0200
+--- samba-3.0.23.orig/docs/manpages/swat.8	2006-07-11 08:58:32.810272784 +0200
++++ samba-3.0.23/docs/manpages/swat.8	2006-07-11 08:59:28.154650659 +0200
 @@ -81,51 +81,6 @@
  \-h|\-\-help
  Print a summary of command line options\&.
@@ -65,10 +65,10 @@
  
  .SH "WARNINGS"
  
-Index: samba-3.0.23rc3/docs/manpages/nmbd.8
+Index: samba-3.0.23/docs/manpages/nmbd.8
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/nmbd.8	2006-06-24 13:46:19.913010000 +0200
-+++ samba-3.0.23rc3/docs/manpages/nmbd.8	2006-06-24 13:46:43.774501250 +0200
+--- samba-3.0.23.orig/docs/manpages/nmbd.8	2006-07-11 08:58:32.838272975 +0200
++++ samba-3.0.23/docs/manpages/nmbd.8	2006-07-11 08:59:28.158650686 +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 @@
  
  .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.23rc3/docs/manpages/smbd.8
+Index: samba-3.0.23/docs/manpages/smbd.8
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/smbd.8	2006-06-24 13:46:19.933011250 +0200
-+++ samba-3.0.23rc3/docs/manpages/smbd.8	2006-06-24 13:46:43.778501500 +0200
+--- samba-3.0.23.orig/docs/manpages/smbd.8	2006-07-11 08:58:32.866273165 +0200
++++ samba-3.0.23/docs/manpages/smbd.8	2006-07-11 08:59:28.158650686 +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 @@
  
  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.23rc3/docs/manpages/lmhosts.5
+Index: samba-3.0.23/docs/manpages/lmhosts.5
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/lmhosts.5	2006-06-24 13:46:19.961013000 +0200
-+++ samba-3.0.23rc3/docs/manpages/lmhosts.5	2006-06-24 13:46:43.778501500 +0200
+--- samba-3.0.23.orig/docs/manpages/lmhosts.5	2006-07-11 08:58:32.890273328 +0200
++++ samba-3.0.23/docs/manpages/lmhosts.5	2006-07-11 08:59:28.158650686 +0200
 @@ -73,7 +73,7 @@
  .SH "FILES"
  
@@ -126,10 +126,10 @@
  
  .SH "VERSION"
  
-Index: samba-3.0.23rc3/docs/manpages/ntlm_auth.1
+Index: samba-3.0.23/docs/manpages/ntlm_auth.1
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/ntlm_auth.1	2006-06-24 13:46:19.989014750 +0200
-+++ samba-3.0.23rc3/docs/manpages/ntlm_auth.1	2006-06-24 13:46:43.778501500 +0200
+--- samba-3.0.23.orig/docs/manpages/ntlm_auth.1	2006-07-11 08:58:32.930273599 +0200
++++ samba-3.0.23/docs/manpages/ntlm_auth.1	2006-07-11 08:59:28.158650686 +0200
 @@ -42,7 +42,7 @@
  The \fBwinbindd\fR(8) daemon must be operational for many of these commands to function\&.
  
@@ -157,10 +157,10 @@
  
  .TP
  gss\-spnego\-client
-Index: samba-3.0.23rc3/docs/manpages/tdbbackup.8
+Index: samba-3.0.23/docs/manpages/tdbbackup.8
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/tdbbackup.8	2006-06-24 13:46:20.017016500 +0200
-+++ samba-3.0.23rc3/docs/manpages/tdbbackup.8	2006-06-24 13:46:43.782501750 +0200
+--- samba-3.0.23.orig/docs/manpages/tdbbackup.8	2006-07-11 08:58:32.958273789 +0200
++++ samba-3.0.23/docs/manpages/tdbbackup.8	2006-07-11 08:59:28.162650714 +0200
 @@ -72,13 +72,13 @@
  
  .TP 3
@@ -178,10 +178,10 @@
  .LP
  
  .SH "VERSION"
-Index: samba-3.0.23rc3/docs/manpages/winbindd.8
+Index: samba-3.0.23/docs/manpages/winbindd.8
 ===================================================================
---- samba-3.0.23rc3.orig/docs/manpages/winbindd.8	2006-06-24 13:46:20.065019500 +0200
-+++ samba-3.0.23rc3/docs/manpages/winbindd.8	2006-06-24 13:46:43.782501750 +0200
+--- samba-3.0.23.orig/docs/manpages/winbindd.8	2006-07-11 08:58:32.994274034 +0200
++++ samba-3.0.23/docs/manpages/winbindd.8	2006-07-11 08:59:28.162650714 +0200
 @@ -298,19 +298,19 @@
  The UNIX pipe over which clients communicate with the \fBwinbindd\fR program\&. For security reasons, the winbind client will only attempt to connect to the winbindd daemon if both the \fI/tmp/\&.winbindd\fR directory and \fI/tmp/\&.winbindd/pipe\fR file are owned by root\&.
  

Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/fhs.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/Makefile.in
+Index: samba-3.0.23/source/Makefile.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/Makefile.in	2006-06-24 13:46:18.920948000 +0200
-+++ samba-3.0.23rc3/source/Makefile.in	2006-06-24 13:46:45.010578500 +0200
+--- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:58:31.802265941 +0200
++++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:29.326658704 +0200
 @@ -100,6 +100,13 @@
  # the directory where lock files go
  LOCKDIR = @lockdir@
@@ -25,7 +25,7 @@
  PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
  
  # Note that all executable programs now provide for an optional executable suffix.
-@@ -1453,7 +1460,7 @@
+@@ -1454,7 +1461,7 @@
  	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
  
  installdat: installdirs
@@ -34,10 +34,10 @@
  
  installmsg: installdirs
  	@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
-Index: samba-3.0.23rc3/source/configure.in
+Index: samba-3.0.23/source/configure.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/configure.in	2006-06-24 13:46:18.948949750 +0200
-+++ samba-3.0.23rc3/source/configure.in	2006-06-24 13:46:45.018579000 +0200
+--- samba-3.0.23.orig/source/configure.in	2006-07-11 08:58:31.834266158 +0200
++++ samba-3.0.23/source/configure.in	2006-07-11 08:59:29.334658759 +0200
 @@ -37,7 +37,7 @@
  [  --with-fhs              Use FHS-compliant paths (default=no)],
  [ case "$withval" in
@@ -68,10 +68,10 @@
  AC_SUBST(rootsbindir)
  AC_SUBST(pammodulesdir)
  
-Index: samba-3.0.23rc3/source/dynconfig.c
+Index: samba-3.0.23/source/dynconfig.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/dynconfig.c	2006-06-24 13:46:18.976951500 +0200
-+++ samba-3.0.23rc3/source/dynconfig.c	2006-06-24 13:46:45.018579000 +0200
+--- samba-3.0.23.orig/source/dynconfig.c	2006-07-11 08:58:31.862266348 +0200
++++ samba-3.0.23/source/dynconfig.c	2006-07-11 08:59:29.334658759 +0200
 @@ -53,6 +53,13 @@
  pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
  
@@ -114,10 +114,10 @@
 +	return lp_lockdir();
 +#endif
 +}
-Index: samba-3.0.23rc3/source/groupdb/mapping.c
+Index: samba-3.0.23/source/groupdb/mapping.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/groupdb/mapping.c	2006-06-24 13:46:19.008953500 +0200
-+++ samba-3.0.23rc3/source/groupdb/mapping.c	2006-06-24 13:46:45.022579250 +0200
+--- samba-3.0.23.orig/source/groupdb/mapping.c	2006-07-11 08:58:31.894266565 +0200
++++ samba-3.0.23/source/groupdb/mapping.c	2006-07-11 08:59:29.338658787 +0200
 @@ -56,7 +56,7 @@
  	if (tdb)
  		return True;
@@ -127,10 +127,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open group mapping database\n"));
  		return False;
-Index: samba-3.0.23rc3/source/include/dynconfig.h
+Index: samba-3.0.23/source/include/dynconfig.h
 ===================================================================
---- samba-3.0.23rc3.orig/source/include/dynconfig.h	2006-06-24 13:46:19.044955750 +0200
-+++ samba-3.0.23rc3/source/include/dynconfig.h	2006-06-24 13:46:45.022579250 +0200
+--- samba-3.0.23.orig/source/include/dynconfig.h	2006-07-11 08:58:31.930266810 +0200
++++ samba-3.0.23/source/include/dynconfig.h	2006-07-11 08:59:29.338658787 +0200
 @@ -31,8 +31,12 @@
  extern pstring dyn_CONFIGFILE;
  extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -144,10 +144,10 @@
 +
 +char *dyn_STATEDIR(void);
 +char *dyn_CACHEDIR(void);
-Index: samba-3.0.23rc3/source/intl/lang_tdb.c
+Index: samba-3.0.23/source/intl/lang_tdb.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/intl/lang_tdb.c	2006-06-24 13:46:19.084958250 +0200
-+++ samba-3.0.23rc3/source/intl/lang_tdb.c	2006-06-24 13:46:45.022579250 +0200
+--- samba-3.0.23.orig/source/intl/lang_tdb.c	2006-07-11 08:58:31.962267027 +0200
++++ samba-3.0.23/source/intl/lang_tdb.c	2006-07-11 08:59:29.338658787 +0200
 @@ -131,7 +131,7 @@
  	if (!lang) 
  		return True;
@@ -157,10 +157,10 @@
  	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.23rc3/source/lib/util.c
+Index: samba-3.0.23/source/lib/util.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/lib/util.c	2006-06-24 13:46:19.112960000 +0200
-+++ samba-3.0.23rc3/source/lib/util.c	2006-06-24 13:46:45.026579500 +0200
+--- samba-3.0.23.orig/source/lib/util.c	2006-07-11 08:58:31.982267163 +0200
++++ samba-3.0.23/source/lib/util.c	2006-07-11 08:59:29.346658842 +0200
 @@ -2567,6 +2567,61 @@
  }
  
@@ -223,10 +223,10 @@
   * @brief Returns the platform specific shared library extension.
   *
   * @retval Pointer to a static #fstring containing the extension.
-Index: samba-3.0.23rc3/source/lib/util_unistr.c
+Index: samba-3.0.23/source/lib/util_unistr.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/lib/util_unistr.c	2006-06-24 13:46:19.144962000 +0200
-+++ samba-3.0.23rc3/source/lib/util_unistr.c	2006-06-24 13:46:45.030579750 +0200
+--- samba-3.0.23.orig/source/lib/util_unistr.c	2006-07-11 08:58:32.030267489 +0200
++++ samba-3.0.23/source/lib/util_unistr.c	2006-07-11 08:59:29.346658842 +0200
 @@ -88,10 +88,10 @@
  	}
  	initialised = 1;
@@ -249,10 +249,10 @@
  	if (valid_file) {
  		valid_table = valid_file;
  		mapped_file = 1;
-Index: samba-3.0.23rc3/source/libsmb/samlogon_cache.c
+Index: samba-3.0.23/source/libsmb/samlogon_cache.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/libsmb/samlogon_cache.c	2006-06-24 13:46:19.208966000 +0200
-+++ samba-3.0.23rc3/source/libsmb/samlogon_cache.c	2006-06-24 13:46:45.034580000 +0200
+--- samba-3.0.23.orig/source/libsmb/samlogon_cache.c	2006-07-11 08:58:32.098267950 +0200
++++ samba-3.0.23/source/libsmb/samlogon_cache.c	2006-07-11 08:59:29.350658869 +0200
 @@ -34,7 +34,7 @@
  BOOL netsamlogon_cache_init(void)
  {
@@ -271,10 +271,10 @@
  				   TDB_DEFAULT, O_RDWR, 0600);
  		if (!tdb) {
  			DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
-Index: samba-3.0.23rc3/source/nmbd/nmbd_serverlistdb.c
+Index: samba-3.0.23/source/nmbd/nmbd_serverlistdb.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/nmbd/nmbd_serverlistdb.c	2006-06-24 13:46:19.228967250 +0200
-+++ samba-3.0.23rc3/source/nmbd/nmbd_serverlistdb.c	2006-06-24 13:46:45.034580000 +0200
+--- samba-3.0.23.orig/source/nmbd/nmbd_serverlistdb.c	2006-07-11 08:58:32.130268168 +0200
++++ samba-3.0.23/source/nmbd/nmbd_serverlistdb.c	2006-07-11 08:59:29.350658869 +0200
 @@ -325,7 +325,7 @@
  
  	updatecount++;
@@ -284,11 +284,11 @@
  	trim_char(fname,'\0' ,'/');
  	pstrcat(fname,"/");
  	pstrcat(fname,SERVER_LIST);
-Index: samba-3.0.23rc3/source/nmbd/nmbd_winsserver.c
+Index: samba-3.0.23/source/nmbd/nmbd_winsserver.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/nmbd/nmbd_winsserver.c	2006-06-24 13:46:19.268969750 +0200
-+++ samba-3.0.23rc3/source/nmbd/nmbd_winsserver.c	2006-06-24 13:46:45.042580500 +0200
-@@ -559,7 +559,7 @@
+--- samba-3.0.23.orig/source/nmbd/nmbd_winsserver.c	2006-07-11 08:58:32.162268385 +0200
++++ samba-3.0.23/source/nmbd/nmbd_winsserver.c	2006-07-11 08:59:29.366658979 +0200
+@@ -585,7 +585,7 @@
  
  	add_samba_names_to_subnet(wins_server_subnet);
  
@@ -297,7 +297,7 @@
  		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
  			WINS_LIST, strerror(errno) ));
  		return True;
-@@ -2315,7 +2315,7 @@
+@@ -2337,7 +2337,7 @@
  		}
  	}
  
@@ -306,10 +306,10 @@
  	all_string_sub(fname,"//", "/", 0);
  	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
  
-Index: samba-3.0.23rc3/source/passdb/login_cache.c
+Index: samba-3.0.23/source/passdb/login_cache.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/passdb/login_cache.c	2006-06-24 13:46:19.288971000 +0200
-+++ samba-3.0.23rc3/source/passdb/login_cache.c	2006-06-24 13:46:45.042580500 +0200
+--- samba-3.0.23.orig/source/passdb/login_cache.c	2006-07-11 08:58:32.194268602 +0200
++++ samba-3.0.23/source/passdb/login_cache.c	2006-07-11 08:59:29.366658979 +0200
 @@ -36,7 +36,7 @@
  	/* skip file open if it's already opened */
  	if (cache) return True;
@@ -319,11 +319,11 @@
  	if (cache_fname)
  		DEBUG(5, ("Opening cache file at %s\n", cache_fname));
  	else {
-Index: samba-3.0.23rc3/source/nsswitch/winbindd_cache.c
+Index: samba-3.0.23/source/nsswitch/winbindd_cache.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/nsswitch/winbindd_cache.c	2006-06-24 13:46:19.384977000 +0200
-+++ samba-3.0.23rc3/source/nsswitch/winbindd_cache.c	2006-06-24 13:46:45.046580750 +0200
-@@ -1888,7 +1888,7 @@
+--- samba-3.0.23.orig/source/nsswitch/winbindd_cache.c	2006-07-11 08:58:32.294269281 +0200
++++ samba-3.0.23/source/nsswitch/winbindd_cache.c	2006-07-11 08:59:29.370659007 +0200
+@@ -1889,7 +1889,7 @@
  		return True;
  
  	/* when working offline we must not clear the cache on restart */
@@ -332,7 +332,7 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				TDB_DEFAULT /*TDB_CLEAR_IF_FIRST*/, O_RDWR|O_CREAT, 0600);
  
-@@ -2130,7 +2130,7 @@
+@@ -2131,7 +2131,7 @@
  		return;
  
  	/* when working offline we must not clear the cache on restart */
@@ -341,10 +341,10 @@
  				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
  				TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.23rc3/source/nsswitch/winbindd_util.c
+Index: samba-3.0.23/source/nsswitch/winbindd_util.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/nsswitch/winbindd_util.c	2006-06-24 13:46:19.416979000 +0200
-+++ samba-3.0.23rc3/source/nsswitch/winbindd_util.c	2006-06-24 13:46:45.050581000 +0200
+--- samba-3.0.23.orig/source/nsswitch/winbindd_util.c	2006-07-11 08:58:32.330269526 +0200
++++ samba-3.0.23/source/nsswitch/winbindd_util.c	2006-07-11 08:59:29.374659034 +0200
 @@ -1167,7 +1167,7 @@
  	SMB_STRUCT_STAT stbuf;
  	TDB_CONTEXT *idmap_tdb;
@@ -354,10 +354,10 @@
  
  	if (!file_exist(idmap_name, &stbuf)) {
  		/* nothing to convert return */
-Index: samba-3.0.23rc3/source/param/loadparm.c
+Index: samba-3.0.23/source/param/loadparm.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/param/loadparm.c	2006-06-24 13:46:19.448981000 +0200
-+++ samba-3.0.23rc3/source/param/loadparm.c	2006-06-24 13:46:45.058581500 +0200
+--- samba-3.0.23.orig/source/param/loadparm.c	2006-07-11 08:58:32.362269743 +0200
++++ samba-3.0.23/source/param/loadparm.c	2006-07-11 08:59:29.382659089 +0200
 @@ -107,6 +107,9 @@
  	char *szAddPrinterCommand;
  	char *szDeletePrinterCommand;
@@ -382,10 +382,10 @@
  	{"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.23rc3/source/passdb/secrets.c
+Index: samba-3.0.23/source/passdb/secrets.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/passdb/secrets.c	2006-06-24 13:46:19.324973250 +0200
-+++ samba-3.0.23rc3/source/passdb/secrets.c	2006-06-24 13:46:45.062581750 +0200
+--- samba-3.0.23.orig/source/passdb/secrets.c	2006-07-11 08:58:32.230268847 +0200
++++ samba-3.0.23/source/passdb/secrets.c	2006-07-11 08:59:29.386659116 +0200
 @@ -58,8 +58,7 @@
  	if (tdb)
  		return True;
@@ -396,10 +396,10 @@
  
  	tdb = tdb_open_log(fname, 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
  
-Index: samba-3.0.23rc3/source/printing/nt_printing.c
+Index: samba-3.0.23/source/printing/nt_printing.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/printing/nt_printing.c	2006-06-24 13:46:19.476982750 +0200
-+++ samba-3.0.23rc3/source/printing/nt_printing.c	2006-06-24 13:46:45.094583750 +0200
+--- samba-3.0.23.orig/source/printing/nt_printing.c	2006-07-11 08:58:32.394269960 +0200
++++ samba-3.0.23/source/printing/nt_printing.c	2006-07-11 08:59:29.394659171 +0200
 @@ -551,28 +551,28 @@
   
  	if (tdb_drivers)
@@ -444,10 +444,10 @@
  		pstrcat(printdb_path, sharename);
  		pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.23rc3/source/printing/printing.c
+Index: samba-3.0.23/source/printing/printing.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/printing/printing.c	2006-06-24 13:46:19.504984500 +0200
-+++ samba-3.0.23rc3/source/printing/printing.c	2006-06-24 13:46:45.098584000 +0200
+--- samba-3.0.23.orig/source/printing/printing.c	2006-07-11 08:58:32.422270150 +0200
++++ samba-3.0.23/source/printing/printing.c	2006-07-11 08:59:29.398659199 +0200
 @@ -183,8 +183,8 @@
  	int services = lp_numservices();
  	int snum;
@@ -459,10 +459,10 @@
  	mkdir(printing_path,0755);
  
  	/* handle a Samba upgrade */
-Index: samba-3.0.23rc3/source/printing/printing_db.c
+Index: samba-3.0.23/source/printing/printing_db.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/printing/printing_db.c	2006-06-24 13:46:19.536986500 +0200
-+++ samba-3.0.23rc3/source/printing/printing_db.c	2006-06-24 13:46:45.098584000 +0200
+--- samba-3.0.23.orig/source/printing/printing_db.c	2006-07-11 08:58:32.454270367 +0200
++++ samba-3.0.23/source/printing/printing_db.c	2006-07-11 08:59:29.402659226 +0200
 @@ -91,7 +91,7 @@
  		DLIST_ADD(print_db_head, p);
  	}
@@ -472,10 +472,10 @@
  	pstrcat(printdb_path, printername);
  	pstrcat(printdb_path, ".tdb");
  
-Index: samba-3.0.23rc3/source/sam/idmap_tdb.c
+Index: samba-3.0.23/source/sam/idmap_tdb.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/sam/idmap_tdb.c	2006-06-24 13:46:19.568988500 +0200
-+++ samba-3.0.23rc3/source/sam/idmap_tdb.c	2006-06-24 13:46:45.102584250 +0200
+--- samba-3.0.23.orig/source/sam/idmap_tdb.c	2006-07-11 08:58:32.490270612 +0200
++++ samba-3.0.23/source/sam/idmap_tdb.c	2006-07-11 08:59:29.402659226 +0200
 @@ -449,7 +449,7 @@
  	BOOL tdb_is_new = False;
  
@@ -485,10 +485,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.23rc3/source/smbd/lanman.c
+Index: samba-3.0.23/source/smbd/lanman.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/smbd/lanman.c	2006-06-24 13:46:19.600990500 +0200
-+++ samba-3.0.23rc3/source/smbd/lanman.c	2006-06-24 13:46:45.110584750 +0200
+--- samba-3.0.23.orig/source/smbd/lanman.c	2006-07-11 08:58:32.522270829 +0200
++++ samba-3.0.23/source/smbd/lanman.c	2006-07-11 08:59:29.406659254 +0200
 @@ -1052,9 +1052,9 @@
  	BOOL local_list_only;
  	int i;
@@ -501,10 +501,10 @@
  		return 0;
  	}
  
-Index: samba-3.0.23rc3/source/utils/net_idmap.c
+Index: samba-3.0.23/source/utils/net_idmap.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/utils/net_idmap.c	2006-06-24 13:46:19.632992500 +0200
-+++ samba-3.0.23rc3/source/utils/net_idmap.c	2006-06-24 13:46:45.110584750 +0200
+--- samba-3.0.23.orig/source/utils/net_idmap.c	2006-07-11 08:58:32.554271046 +0200
++++ samba-3.0.23/source/utils/net_idmap.c	2006-07-11 08:59:29.410659281 +0200
 @@ -136,7 +136,7 @@
  		return NT_STATUS_UNSUCCESSFUL;
  	}
@@ -514,10 +514,10 @@
  	if (!tdbfile) {
  		DEBUG(0, ("idmap_init: out of memory!\n"));
  		return NT_STATUS_NO_MEMORY;
-Index: samba-3.0.23rc3/source/registry/reg_db.c
+Index: samba-3.0.23/source/registry/reg_db.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/registry/reg_db.c	2006-06-24 13:46:19.652993750 +0200
-+++ samba-3.0.23rc3/source/registry/reg_db.c	2006-06-24 13:46:45.110584750 +0200
+--- samba-3.0.23.orig/source/registry/reg_db.c	2006-07-11 08:58:32.582271236 +0200
++++ samba-3.0.23/source/registry/reg_db.c	2006-07-11 08:59:29.410659281 +0200
 @@ -205,12 +205,12 @@
  	if ( tdb_reg )
  		return True;
@@ -548,10 +548,10 @@
  	}
  
  	unbecome_root();
-Index: samba-3.0.23rc3/source/lib/account_pol.c
+Index: samba-3.0.23/source/lib/account_pol.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/lib/account_pol.c	2006-06-24 13:46:19.172963750 +0200
-+++ samba-3.0.23rc3/source/lib/account_pol.c	2006-06-24 13:46:45.114585000 +0200
+--- samba-3.0.23.orig/source/lib/account_pol.c	2006-07-11 08:58:32.066267733 +0200
++++ samba-3.0.23/source/lib/account_pol.c	2006-07-11 08:59:29.414659309 +0200
 @@ -262,7 +262,7 @@
  		return True;
  	}
@@ -561,10 +561,10 @@
  	if (!tdb) {
  		DEBUG(0,("Failed to open account policy database\n"));
  		return False;
-Index: samba-3.0.23rc3/source/registry/reg_perfcount.c
+Index: samba-3.0.23/source/registry/reg_perfcount.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/registry/reg_perfcount.c	2006-06-24 13:46:19.692996250 +0200
-+++ samba-3.0.23rc3/source/registry/reg_perfcount.c	2006-06-24 13:46:45.114585000 +0200
+--- samba-3.0.23.orig/source/registry/reg_perfcount.c	2006-07-11 08:58:32.614271454 +0200
++++ samba-3.0.23/source/registry/reg_perfcount.c	2006-07-11 08:59:29.414659309 +0200
 @@ -44,7 +44,7 @@
  	
  	fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -583,10 +583,10 @@
  
  	/* no registry keys; just create the perfmon directory */
  	
-Index: samba-3.0.23rc3/source/rpc_server/srv_eventlog_lib.c
+Index: samba-3.0.23/source/rpc_server/srv_eventlog_lib.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/rpc_server/srv_eventlog_lib.c	2006-06-24 13:46:19.728998500 +0200
-+++ samba-3.0.23rc3/source/rpc_server/srv_eventlog_lib.c	2006-06-24 13:46:45.118585250 +0200
+--- samba-3.0.23.orig/source/rpc_server/srv_eventlog_lib.c	2006-07-11 08:58:32.654271725 +0200
++++ samba-3.0.23/source/rpc_server/srv_eventlog_lib.c	2006-07-11 08:59:29.418659336 +0200
 @@ -67,7 +67,7 @@
  {
  	fstring path;
@@ -596,7 +596,7 @@
  	
  	pstr_sprintf( path, "%s/%s.tdb", eventlogdir, name );
  	strlower_m( path );
-@@ -343,7 +343,7 @@
+@@ -349,7 +349,7 @@
  	
  	/* make sure that the eventlog dir exists */
  	
@@ -605,11 +605,11 @@
  	if ( !directory_exist( eventlogdir, NULL ) )
  		mkdir( eventlogdir, 0755 );	
  	
-Index: samba-3.0.23rc3/source/passdb/pdb_tdb.c
+Index: samba-3.0.23/source/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/passdb/pdb_tdb.c	2006-06-24 13:46:19.356975250 +0200
-+++ samba-3.0.23rc3/source/passdb/pdb_tdb.c	2006-06-24 13:46:45.122585500 +0200
-@@ -1593,7 +1593,7 @@
+--- samba-3.0.23.orig/source/passdb/pdb_tdb.c	2006-07-11 08:58:32.266269091 +0200
++++ samba-3.0.23/source/passdb/pdb_tdb.c	2006-07-11 08:59:29.422659364 +0200
+@@ -1598,7 +1598,7 @@
  	/* save the path for later */
  			   
  	if ( !location ) {

Modified: trunk/patches/installswat.sh.patch
===================================================================
--- trunk/patches/installswat.sh.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/installswat.sh.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/script/installswat.sh
+Index: samba-3.0.23/source/script/installswat.sh
 ===================================================================
---- samba-3.0.23rc3.orig/source/script/installswat.sh	2006-06-24 13:46:18.488921000 +0200
-+++ samba-3.0.23rc3/source/script/installswat.sh	2006-06-24 13:46:47.218716500 +0200
+--- samba-3.0.23.orig/source/script/installswat.sh	2006-07-11 08:58:31.342262818 +0200
++++ samba-3.0.23/source/script/installswat.sh	2006-07-11 08:59:31.930676587 +0200
 @@ -194,7 +194,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)

Modified: trunk/patches/make-distclean.patch
===================================================================
--- trunk/patches/make-distclean.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/make-distclean.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23rc3/source/Makefile.in
+Index: samba-3.0.23/source/Makefile.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/Makefile.in	2006-06-24 13:46:45.010578500 +0200
-+++ samba-3.0.23rc3/source/Makefile.in	2006-06-24 13:46:48.102771750 +0200
-@@ -1520,6 +1520,7 @@
+--- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:29.326658704 +0200
++++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:32.806682604 +0200
+@@ -1521,6 +1521,7 @@
  
  python_clean:
  	@-if test -n "$(PYTHON)"; then $(PYTHON) python/setup.py clean; fi
@@ -10,7 +10,7 @@
  
  # revert to the previously installed version
  revert:
-@@ -1697,6 +1698,7 @@
+@@ -1698,6 +1699,7 @@
  
  distclean: realclean
  	-rm -f include/stamp-h

Modified: trunk/patches/nmbd-signalling.patch
===================================================================
--- trunk/patches/nmbd-signalling.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/nmbd-signalling.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/nmbd/nmbd_subnetdb.c
+Index: samba-3.0.23/source/nmbd/nmbd_subnetdb.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/nmbd/nmbd_subnetdb.c	2006-06-24 13:46:17.888883500 +0200
-+++ samba-3.0.23rc3/source/nmbd/nmbd_subnetdb.c	2006-06-24 13:46:49.902884250 +0200
+--- samba-3.0.23.orig/source/nmbd/nmbd_subnetdb.c	2006-07-11 08:58:30.918259940 +0200
++++ samba-3.0.23/source/nmbd/nmbd_subnetdb.c	2006-07-11 08:59:33.706688788 +0200
 @@ -185,12 +185,16 @@
  	struct in_addr unicast_ip, ipzero;
  

Modified: trunk/patches/non-linux-ports.patch
===================================================================
--- trunk/patches/non-linux-ports.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/non-linux-ports.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/configure.in
+Index: samba-3.0.23/source/configure.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/configure.in	2006-06-24 13:46:45.018579000 +0200
-+++ samba-3.0.23rc3/source/configure.in	2006-06-24 13:46:50.818941500 +0200
+--- samba-3.0.23.orig/source/configure.in	2006-07-11 08:59:29.334658759 +0200
++++ samba-3.0.23/source/configure.in	2006-07-11 08:59:34.602694945 +0200
 @@ -755,6 +755,15 @@
        fi
      ;;

Modified: trunk/patches/nonpic-libsmbclient.patch
===================================================================
--- trunk/patches/nonpic-libsmbclient.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/nonpic-libsmbclient.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23rc3/source/Makefile.in
+Index: samba-3.0.23/source/Makefile.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/Makefile.in	2006-06-24 13:46:48.102771750 +0200
-+++ samba-3.0.23rc3/source/Makefile.in	2006-06-24 13:46:51.714997500 +0200
-@@ -1097,9 +1097,9 @@
+--- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:32.806682604 +0200
++++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:35.490701048 +0200
+@@ -1098,9 +1098,9 @@
  		$(KRB5LIBS) $(LDAP_LIBS) \
  		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
  
@@ -14,7 +14,7 @@
  
  bin/libsmbsharemodes. at SHLIBEXT@: $(LIBSMBSHAREMODES_PICOBJS)
  	@echo Linking libsmbsharemodes shared library $@
-@@ -1116,9 +1116,9 @@
+@@ -1117,9 +1117,9 @@
  	@$(SHLD) $(LDSHFLAGS) -o $@ $(CAC_PICOBJS) $(LDFLAGS) $(LIBS) \
  	@SONAMEFLAG@`basename $@`.$(LIBMSRPC_MAJOR)
  

Modified: trunk/patches/pam-examples.patch
===================================================================
--- trunk/patches/pam-examples.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/pam-examples.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/pam_smbpass/README
+Index: samba-3.0.23/source/pam_smbpass/README
 ===================================================================
---- samba-3.0.23rc3.orig/source/pam_smbpass/README	2006-06-24 13:46:17.344849500 +0200
-+++ samba-3.0.23rc3/source/pam_smbpass/README	2006-06-24 13:46:52.619054000 +0200
+--- samba-3.0.23.orig/source/pam_smbpass/README	2006-07-11 08:58:30.322255895 +0200
++++ samba-3.0.23/source/pam_smbpass/README	2006-07-11 08:59:36.398707290 +0200
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Modified: trunk/patches/samba.patch
===================================================================
--- trunk/patches/samba.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/samba.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/client/smbmount.c
+Index: samba-3.0.23/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/client/smbmount.c	2006-06-24 13:46:16.944824500 +0200
-+++ samba-3.0.23rc3/source/client/smbmount.c	2006-06-24 13:46:54.439167750 +0200
+--- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:58:29.918253154 +0200
++++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:38.182719556 +0200
 @@ -767,7 +767,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -29,10 +29,10 @@
  		}
  		strupper_m(username);
  	}
-Index: samba-3.0.23rc3/source/web/diagnose.c
+Index: samba-3.0.23/source/web/diagnose.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/web/diagnose.c	2006-06-24 13:46:16.976826500 +0200
-+++ samba-3.0.23rc3/source/web/diagnose.c	2006-06-24 13:46:54.439167750 +0200
+--- samba-3.0.23.orig/source/web/diagnose.c	2006-07-11 08:58:29.950253371 +0200
++++ samba-3.0.23/source/web/diagnose.c	2006-07-11 08:59:38.182719556 +0200
 @@ -62,6 +62,7 @@
  {
  	static struct cli_state cli;
@@ -41,10 +41,10 @@
  	if (!cli_initialise(&cli))
  		return False;
  
-Index: samba-3.0.23rc3/source/script/installbin.sh.in
+Index: samba-3.0.23/source/script/installbin.sh.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/script/installbin.sh.in	2006-06-24 13:46:17.012828750 +0200
-+++ samba-3.0.23rc3/source/script/installbin.sh.in	2006-06-24 13:46:54.439167750 +0200
+--- samba-3.0.23.orig/source/script/installbin.sh.in	2006-07-11 08:58:29.990253642 +0200
++++ samba-3.0.23/source/script/installbin.sh.in	2006-07-11 08:59:38.182719556 +0200
 @@ -21,13 +21,15 @@
   chmod $INSTALLPERMS $DESTDIR/$BINDIR/$p2
  

Modified: trunk/patches/smbclient-pager.patch
===================================================================
--- trunk/patches/smbclient-pager.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/smbclient-pager.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/include/local.h
+Index: samba-3.0.23/source/include/local.h
 ===================================================================
---- samba-3.0.23rc3.orig/source/include/local.h	2006-06-24 13:46:16.704809500 +0200
-+++ samba-3.0.23rc3/source/include/local.h	2006-06-24 13:46:55.439230250 +0200
+--- samba-3.0.23.orig/source/include/local.h	2006-07-11 08:58:29.682251552 +0200
++++ samba-3.0.23/source/include/local.h	2006-07-11 08:59:39.166726323 +0200
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */

Modified: trunk/patches/smbmount-mtab-flags.patch
===================================================================
--- trunk/patches/smbmount-mtab-flags.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/smbmount-mtab-flags.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/client/smbmnt.c
+Index: samba-3.0.23/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/client/smbmnt.c	2006-06-24 13:46:16.544799500 +0200
-+++ samba-3.0.23rc3/source/client/smbmnt.c	2006-06-24 13:46:56.331286000 +0200
+--- samba-3.0.23.orig/source/client/smbmnt.c	2006-07-11 08:58:29.518250440 +0200
++++ samba-3.0.23/source/client/smbmnt.c	2006-07-11 08:59:40.038732321 +0200
 @@ -276,7 +276,10 @@
          ment.mnt_fsname = share_name ? share_name : "none";
          ment.mnt_dir = mount_point;

Modified: trunk/patches/smbmount-nomtab.patch
===================================================================
--- trunk/patches/smbmount-nomtab.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/smbmount-nomtab.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/client/smbmnt.c
+Index: samba-3.0.23/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/client/smbmnt.c	2006-06-24 13:46:56.331286000 +0200
-+++ samba-3.0.23rc3/source/client/smbmnt.c	2006-06-24 13:46:57.207340750 +0200
+--- samba-3.0.23.orig/source/client/smbmnt.c	2006-07-11 08:59:40.038732321 +0200
++++ samba-3.0.23/source/client/smbmnt.c	2006-07-11 08:59:40.922738402 +0200
 @@ -44,6 +44,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
@@ -103,10 +103,10 @@
  
  	return 0;
  }	
-Index: samba-3.0.23rc3/source/client/smbmount.c
+Index: samba-3.0.23/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/client/smbmount.c	2006-06-24 13:46:54.439167750 +0200
-+++ samba-3.0.23rc3/source/client/smbmount.c	2006-06-24 13:46:57.255343750 +0200
+--- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:59:38.182719556 +0200
++++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:40.942738540 +0200
 @@ -46,6 +46,7 @@
  static int mount_ro;
  static unsigned mount_fmask;

Modified: trunk/patches/smbmount-unix-caps.patch
===================================================================
--- trunk/patches/smbmount-unix-caps.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/smbmount-unix-caps.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/client/smbmount.c
+Index: samba-3.0.23/source/client/smbmount.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/client/smbmount.c	2006-06-24 13:46:57.255343750 +0200
-+++ samba-3.0.23rc3/source/client/smbmount.c	2006-06-24 13:46:58.227404500 +0200
+--- samba-3.0.23.orig/source/client/smbmount.c	2006-07-11 08:59:40.942738540 +0200
++++ samba-3.0.23/source/client/smbmount.c	2006-07-11 08:59:41.874744953 +0200
 @@ -211,6 +211,10 @@
    		c->capabilities &= ~CAP_STATUS32;
  		c->force_dos_errors = True;

Modified: trunk/patches/smbstatus-locking.patch
===================================================================
--- trunk/patches/smbstatus-locking.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/smbstatus-locking.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,7 +1,7 @@
-Index: samba-3.0.23rc3/source/utils/status.c
+Index: samba-3.0.23/source/utils/status.c
 ===================================================================
---- samba-3.0.23rc3.orig/source/utils/status.c	2006-06-24 13:46:15.856756500 +0200
-+++ samba-3.0.23rc3/source/utils/status.c	2006-06-24 13:46:59.103459250 +0200
+--- samba-3.0.23.orig/source/utils/status.c	2006-07-11 08:58:28.846245880 +0200
++++ samba-3.0.23/source/utils/status.c	2006-07-11 08:59:42.766751091 +0200
 @@ -714,6 +714,16 @@
  	if ( show_locks ) {
  		int ret;

Modified: trunk/patches/undefined-symbols.patch
===================================================================
--- trunk/patches/undefined-symbols.patch	2006-07-11 06:58:05 UTC (rev 1092)
+++ trunk/patches/undefined-symbols.patch	2006-07-11 07:00:09 UTC (rev 1093)
@@ -1,8 +1,8 @@
-Index: samba-3.0.23rc3/source/Makefile.in
+Index: samba-3.0.23/source/Makefile.in
 ===================================================================
---- samba-3.0.23rc3.orig/source/Makefile.in	2006-06-24 13:46:51.714997500 +0200
-+++ samba-3.0.23rc3/source/Makefile.in	2006-06-24 13:47:01.211591000 +0200
-@@ -691,7 +691,8 @@
+--- samba-3.0.23.orig/source/Makefile.in	2006-07-11 08:59:35.490701048 +0200
++++ samba-3.0.23/source/Makefile.in	2006-07-11 08:59:43.654757203 +0200
+@@ -692,7 +692,8 @@
              $(RPC_NTSVCS_OBJ) utils/passwd_util.o
  
  WINBIND_WINS_NSS_OBJ = nsswitch/wins.o $(PARAM_OBJ) \
@@ -12,7 +12,7 @@
  
  WINBIND_WINS_NSS_PICOBJS = $(WINBIND_WINS_NSS_OBJ:.o=. at PICSUFFIX@)
  
-@@ -1093,7 +1094,7 @@
+@@ -1094,7 +1095,7 @@
  
  bin/libsmbclient. at SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
  	@echo Linking libsmbclient shared library $@

More information about the Pkg-samba-maint mailing list