2025-02-03 13:47:25 +03:00 · - · 7d8d193c05
commit 7d8d193c05
parent 15d53fd53c
28 changed files with 459 additions and 918 deletions
							
							
								
							
							
						
@ -3,9 +3,14 @@ Building Samba Packages for Debian GNU/Linux
Building Debian packages is not as hard as some people might think. The
following instructions will allow you to build your own Samba Debian
packages. These instructions, and the files in packaging/Debian/, should
be current as of Samba 3.0beta3, and should allow you to build Debian
packages for Debian unstable.
packages. These instructions, and the files in packaging/Debian/, are
current as of Samba 3.0.0rc2, and allow you to build Debian packages
for Debian unstable (so you need some development packages available
only in Debian unstable.) If you are using something newer than 3.0.0rc2
you might want to try to follow the instructions to see if patches
apply cleanly. If some patches don't apply cleanly please e-mail
samba@packages.debian.org since we might have fixed patches that we have
not yet integrated into upstream Samba.
We try to maintain as much compatibility with previous releases
of Debian as possible, so it is possible that the files in
							
								
							
							
								
							
							
						
@ -32,11 +37,11 @@ devscripts, etc.):
  libpam0g-dev
  libreadline4-dev
  libcupsys2-dev
  libacl1-dev | acl-dev (>= 2.0.0)
  libacl1-dev, libacl1 (>= 2.2.11-1)
  libkrb5-dev
  libldap2-dev
  po-debconf
  python-dev (>= 2.2)
  python2.3-dev
  Notes regarding the packages required to build Samba Debian packages:
							
							
							
								
							
						
@ -44,12 +49,12 @@ devscripts, etc.):
    That's fine; the configure script won't detect CUPS support and the
    resulting binaries won't support CUPS.
  * The list above is current as of samba-3.0.0beta3, but it can get
  * The list above is current as of samba-3.0.0rc2, but it can get
    out of date. The best way to check what packages are required to
    build the samba packages on Debian is to look for the Build-Depends:
    field in the file debian/control.
1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3".
1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
2) cp -a packaging/Debian/debian/ debian
  It's important that you copy instead of symlink because the build
  tools in Potato have a problem that prevents the build to work with
							
								
							
							
							
						
							
							
								
							
							
						
@ -3,9 +3,14 @@ Building Samba Packages for Debian GNU/Linux
Building Debian packages is not as hard as some people might think. The
following instructions will allow you to build your own Samba Debian
packages. These instructions, and the files in packaging/Debian/, should
be current as of Samba 3.0beta3, and should allow you to build Debian
packages for Debian unstable.
packages. These instructions, and the files in packaging/Debian/, are
current as of Samba 3.0.0rc2, and allow you to build Debian packages
for Debian unstable (so you need some development packages available
only in Debian unstable.) If you are using something newer than 3.0.0rc2
you might want to try to follow the instructions to see if patches
apply cleanly. If some patches don't apply cleanly please e-mail
samba@packages.debian.org since we might have fixed patches that we have
not yet integrated into upstream Samba.
We try to maintain as much compatibility with previous releases
of Debian as possible, so it is possible that the files in
							
								
							
							
								
							
							
						
@ -32,11 +37,11 @@ devscripts, etc.):
  libpam0g-dev
  libreadline4-dev
  libcupsys2-dev
  libacl1-dev | acl-dev (>= 2.0.0)
  libacl1-dev, libacl1 (>= 2.2.11-1)
  libkrb5-dev
  libldap2-dev
  po-debconf
  python-dev (>= 2.2)
  python2.3-dev
  Notes regarding the packages required to build Samba Debian packages:
							
							
							
								
							
						
@ -44,12 +49,12 @@ devscripts, etc.):
    That's fine; the configure script won't detect CUPS support and the
    resulting binaries won't support CUPS.
  * The list above is current as of samba-3.0.0beta3, but it can get
  * The list above is current as of samba-3.0.0rc2, but it can get
    out of date. The best way to check what packages are required to
    build the samba packages on Debian is to look for the Build-Depends:
    field in the file debian/control.
1) cd samba[-<version>]. For example, "cd samba-3.0.0beta3".
1) cd samba[-<version>]. For example, "cd samba-3.0.0rc2".
2) cp -a packaging/Debian/debian/ debian
  It's important that you copy instead of symlink because the build
  tools in Potato have a problem that prevents the build to work with
							
								
							
							
							
						
							
							
							
						
@ -1,11 +1,17 @@
samba (3.0.0beta3-0.1) unstable; urgency=low
samba (3.0.0beta2+3.0.0rc2-1) unstable; urgency=low
  * Local build.
  * New upstream release.
  * Incorporate Dutch debconf translations; thanks to Bart Cornelis
    <cobaco@linux.be>. (closes: #207824)
  * Link against libgnutls7 instead of libgnutls5. (closes: #208151)
 -- Debian User <somebody@somwhere.net>  Tue, 15 Jul 2003 11:05:39 -0400
 -- Eloy A. Paris <peloy@debian.org>  Tue,  2 Sep 2003 21:37:13 -0400
samba (3.0.0beta2-2) unstable; urgency=low
samba (3.0.0beta2+3.0.0rc1-1) unstable; urgency=low
  * New upstream version (skipped samba 3.0.0beta3 due to time
    constraints.) This ugly version number will go away when the final
    Samba 3.0.0 is released.
  * Drag new unpackaged tools into the packages: smbcquotas (smbclient),
    vfs modules (samba), smbtree(1) manpage (smbclient), tdbbackup(8)
    manpage (samba). (closes: #151158)
							
							
							
								
							
						
@ -17,8 +23,12 @@ samba (3.0.0beta2-2) unstable; urgency=low
      path (closes: #185439)
    - add support for ${misc:Depends} in control for those packages with
      init scripts
  * Add versioned dependency on libpam-runtime and change
    /etc/pam.d/samba to use the new common PAM config blocks.
  * New python2.3-samba package (old python2.2-samba is no more.)
    (closes: #206171)
 -- Steve Langasek <vorlon@debian.org>  Sat, 12 Jul 2003 19:27:31 -0500
 -- Eloy A. Paris <peloy@debian.org>  Mon, 25 Aug 2003 17:05:14 -0400
samba (3.0.0beta2-1) unstable; urgency=low
							
								
							
							
								
							
							
						
@ -468,7 +478,7 @@ samba (2.2.3a-7) unstable; urgency=medium
    running before the upgrade starts.
  * Tweak the wording of debconf templates.
  * Incorporate debconf translations for French, Spanish and Portuguese;
    thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es),
    thanks to Carlos Valdivia Yagüe <valyag@hotpop.com> (es),
    Andre Luis Lopes <andrelop@ig.com.br> (pt_BR), and Philippe
    Batailler and Denis Barbier <barbier@debian.org> (fr).
    (closes: #142657, #142659, #141551, #141699, #141682)
							
								
							
							
							
						
							
							
								
							
							
						
@ -3,12 +3,12 @@ Section: net
Priority: optional
Maintainer: Eloy A. Paris <peloy@debian.org>
Uploaders: Steve Langasek <vorlon@debian.org>
Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2)
Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline4-dev, libcupsys2-dev, autoconf, libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1), libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev
Standards-Version: 3.5.10
Package: samba
Architecture: any
Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}
Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules
Replaces: samba-common (<= 2.0.5a-2)
Suggests: samba-doc
Description: a LanManager-like file and printer server for Unix
							
							
							
								
							
						
@ -32,7 +32,7 @@ Description: a LanManager-like file and printer server for Unix
  libsmbclient - Shared library that allows applications to talk to SMB servers
  libsmbclient-dev - libsmbclient shared libraries
  winbind: Service to resolve user and group information from Windows NT servers
  python2.2-samba: Python bindings that allow access to various aspects of Samba
  python2.3-samba: Python bindings that allow access to various aspects of Samba
 .
 It is possible to install a subset of these packages depending on
 your particular needs. For example, to access other SMB servers you
							
								
							
							
								
							
							
						
@ -175,14 +175,14 @@ Description: service to resolve user and group information from Windows NT serve
 Windows NT server. The service can also provide authentication
 services via an associated PAM module.
Package: python2.2-samba
Package: python2.3-samba
Section: python
Priority: optional
Architecture: any
Depends: ${shlibs:Depends}, python2.2
Depends: ${shlibs:Depends}, python2.3
Description: Python bindings that allow access to various aspects of Samba
 The Samba Python bindings allow you to access various aspects of Samba.
 At the moment their status is "experimental" but they have been reported
 to work well.
 .
 See /usr/share/doc/python2.2-samba/examples for a couple of examples.
 See /usr/share/doc/python2.3-samba/examples for a couple of examples.
							
							
							
						
							
							
							
						
@ -0,0 +1,8 @@
--- samba-3.0.0rc2/source/VERSION.orig	2003-09-02 21:56:11.000000000 -0400
+++ samba-3.0.0rc2/source/VERSION	2003-09-02 21:56:30.000000000 -0400
@@ -120,4 +120,4 @@
 # e.g. SAMBA_VERSION_VENDOR_SUFFIX=vendor_version()    #
 #  ->  "CVS 3.0.0rc2-VendorVersion"                    #
 ########################################################
-SAMBA_VERSION_VENDOR_SUFFIX=
+SAMBA_VERSION_VENDOR_SUFFIX="Debian"
							
							
							
						
@ -1,36 +1,3 @@
diff -uNr samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html
--- samba-2.999+3.0.alpha21.orig/docs/htmldocs/using_samba/ch06_05.html	2000-07-30 02:38:29.000000000 -0500
+++ samba-2.999+3.0.alpha21/docs/htmldocs/using_samba/ch06_05.html	2002-12-16 23:15:46.000000000 -0600
@@ -102,13 +102,13 @@
 WARNING:</strong> You will need to use at least Samba 2.1 to ensure that PDC functionality for Windows NT clients is present. Prior to Samba 2.1, only limited user authentication for NT clients was present. At the time this book went to press, Samba 2.0.5 was the latest version, but Samba  2.1 was available through CVS download. Instructions on downloading alpha versions of Samba are given in <a href="appe_01.html"><b>Appendix E, <CITE CLASS="appendix">Downloading Samba with CVS</cite></b></a>.</p></blockquote><P CLASS="para">
 As before, you need to ensure that Samba is a primary domain controller for the current workgroup and is using user-level security. However, you must also ensure that Samba is using encrypted passwords. In other words, alter the <CODE CLASS="literal">
 [global]</code> options the previous example to include the <CODE CLASS="literal">
-encrypted</code> <CODE CLASS="literal">
+encrypt</code> <CODE CLASS="literal">
 passwords</code> <CODE CLASS="literal">
 =</code> <CODE CLASS="literal">
 yes</code> option, as shown here: </p><PRE CLASS="programlisting">
 [global]
 	workgroup = SIMPLE
-	encrypted passwords = yes
+	encrypt passwords = yes
 	domain logons = yes
 
 	security = user </pre></div><DIV CLASS="sect3">
--- samba-2.2.2.cvs20020120.orig/swat/README
+++ samba-2.2.2.cvs20020120/swat/README
@@ -1,3 +1,11 @@
+[Debian-specific Note: you can safely skip the installation notes in
+this document. swat was configured for you when the package was
+installed. For security reasons, swat is not enabled. To enable it, you
+need to edit /etc/inetd.conf, uncomment the swat entry, and reload
+inetd. Please note that the file locations given in this file are not
+correct for the Debian version of swat. The correct file locations are
+given in swat's man page.]
+
 This is a brief description of how to install and use the Samba Web
 Administration Tool on your machine.
 
--- samba_3_0/docs/manpages/swat.8.orig	2003-06-06 16:16:24.000000000 -0400
+++ samba_3_0/docs/manpages/swat.8	2003-06-06 16:25:13.000000000 -0400
@@ -89,6 +89,13 @@
							
								
							
							
							
						
							
							
							
						
@ -1,7 +1,7 @@
diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
--- samba-3.0.0beta2.orig/source/Makefile.in	2003-07-02 23:26:46.000000000 -0500
+++ samba-3.0.0beta2/source/Makefile.in	2003-07-02 23:19:46.000000000 -0500
@@ -68,6 +68,7 @@
@@ -67,6 +67,7 @@
 CONFIGDIR = @configdir@
 VARDIR = @localstatedir@
 MANDIR = @mandir@
							
							
							
								
							
						
@ -9,7 +9,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
 
 # The permissions to give the executables
 INSTALLPERMS = 0755
@@ -91,6 +92,13 @@
@@ -90,6 +91,13 @@
 # the directory where lock files go
 LOCKDIR = @lockdir@
 
							
							
							
								
							
						
@ -23,7 +23,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
 # the directory where pid files go
 PIDDIR = @piddir@
 # man pages language(s)
@@ -115,7 +123,7 @@
@@ -114,7 +122,7 @@
 PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\"  -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\"
 PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" \
 	      -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"@SHLIBEXT@\"
							
							
							
								
							
						
@ -32,7 +32,7 @@ diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makef
 PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
 
 # Note that all executable programs now provide for an optional executable suffix.
@@ -1123,7 +1131,7 @@
@@ -1200,7 +1208,7 @@
 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
 installdat: installdirs
							
								
							
							
								
							
							
						
@ -301,7 +301,7 @@ diff -uNr samba-3.0.0beta2.orig/source/libsmb/samlogon_cache.c samba-3.0.0beta2/
diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c
--- samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c	2003-07-02 23:26:47.000000000 -0500
+++ samba-3.0.0beta2/source/nmbd/nmbd_serverlistdb.c	2003-07-02 23:19:02.000000000 -0500
@@ -343,7 +343,7 @@
@@ -327,7 +327,7 @@
 
   updatecount++;
     
							
							
							
								
							
						
@ -310,26 +310,25 @@ diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_serverlistdb.c samba-3.0.0beta2
   trim_string(fname,NULL,"/");
   pstrcat(fname,"/");
   pstrcat(fname,SERVER_LIST);
diff -uNr samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c
--- samba-3.0.0beta2.orig/source/nmbd/nmbd_winsserver.c	2003-07-02 23:26:47.000000000 -0500
+++ samba-3.0.0beta2/source/nmbd/nmbd_winsserver.c	2003-07-02 23:19:02.000000000 -0500
@@ -230,7 +230,7 @@
--- samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c.orig	2003-08-28 17:42:44.000000000 -0400
+++ samba-3.0.0rc2/source/nmbd/nmbd_winsserver.c	2003-08-31 08:09:11.000000000 -0400
@@ -228,7 +228,7 @@
 
   add_samba_names_to_subnet(wins_server_subnet);
 	add_samba_names_to_subnet(wins_server_subnet);
 
-  if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL)
+  if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL)
   {
     DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
            WINS_LIST, strerror(errno) ));
@@ -1836,7 +1836,7 @@
 	  }
   }
-	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
 		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
 			WINS_LIST, strerror(errno) ));
 		return True;
@@ -1759,7 +1759,7 @@
 		}
 	}
 
-  slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+  slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
   all_string_sub(fname,"//", "/", 0);
   slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
-	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+	slprintf(fname,sizeof(fname)-1,"%s/%s", dyn_STATEDIR(), WINS_LIST);
 	all_string_sub(fname,"//", "/", 0);
 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());
 
diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta2/source/nsswitch/winbindd_cache.c
--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c	2003-07-02 23:26:47.000000000 -0500
							
							
							
								
							
						
@ -346,7 +345,7 @@ diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_cache.c samba-3.0.0beta
diff -uNr samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c samba-3.0.0beta2/source/nsswitch/winbindd_util.c
--- samba-3.0.0beta2.orig/source/nsswitch/winbindd_util.c	2003-07-01 15:44:25.000000000 -0500
+++ samba-3.0.0beta2/source/nsswitch/winbindd_util.c	2003-07-02 23:19:02.000000000 -0500
@@ -747,7 +747,7 @@
@@ -800,7 +800,7 @@
 	SMB_STRUCT_STAT stbuf;
 	TDB_CONTEXT *idmap_tdb;
 
							
							
							
								
							
						
@ -368,24 +367,24 @@ diff -uNr samba-3.0.0beta2.orig/source/param/loadparm.c samba-3.0.0beta2/source/
 	char *szLockDir;
 	char *szPidDir;
 	char *szRootdir;
@@ -1074,8 +1077,13 @@
 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
@@ -1082,8 +1082,13 @@
 	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE}, 
 	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
 	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED}, 
+#ifdef FHS_COMPATIBLE
+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0}, 
+	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
+	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDirStub, NULL, NULL, 0},
+#else
 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED}, 
 	{"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, 
 	{"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER},
+#endif
 	{"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, 
 	{"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 | FLAG_DEVELOPER},
 	{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED}, 
diff -uNr samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c samba-3.0.0beta2/source/passdb/pdb_tdb.c
--- samba-3.0.0beta2.orig/source/passdb/pdb_tdb.c	2003-07-02 23:26:47.000000000 -0500
+++ samba-3.0.0beta2/source/passdb/pdb_tdb.c	2003-07-02 23:19:02.000000000 -0500
@@ -526,10 +526,7 @@
@@ -501,10 +501,7 @@
 	if (location) {
 		tdb_state->tdbsam_location = talloc_strdup(pdb_context->mem_ctx, location);
 	} else {
							
								
							
							
								
							
							
						
@ -425,7 +424,7 @@ diff -uNr samba-3.0.0beta2.orig/source/passdb/secrets.c samba-3.0.0beta2/source/
diff -uNr samba-3.0.0beta2.orig/source/printing/nt_printing.c samba-3.0.0beta2/source/printing/nt_printing.c
--- samba-3.0.0beta2.orig/source/printing/nt_printing.c	2003-07-02 23:26:47.000000000 -0500
+++ samba-3.0.0beta2/source/printing/nt_printing.c	2003-07-02 23:19:02.000000000 -0500
@@ -287,28 +287,28 @@
@@ -293,28 +293,28 @@
  
 	if (tdb_drivers)
 		tdb_close(tdb_drivers);
							
								
							
							
								
							
							
						
@ -525,7 +524,7 @@ diff -uNr samba-3.0.0beta2.orig/source/rpc_server/srv_srvsvc_nt.c samba-3.0.0bet
diff -uNr samba-3.0.0beta2.orig/source/sam/idmap_tdb.c samba-3.0.0beta2/source/sam/idmap_tdb.c
--- samba-3.0.0beta2.orig/source/sam/idmap_tdb.c	2003-07-01 15:44:26.000000000 -0500
+++ samba-3.0.0beta2/source/sam/idmap_tdb.c	2003-07-02 23:19:02.000000000 -0500
@@ -495,7 +495,7 @@
@@ -487,7 +487,7 @@
 	BOOL tdb_is_new = False;
 
 	/* use the old database if present */
							
								
							
							
								
							
							
						
@ -570,14 +569,3 @@ diff -uNr samba-3.0.0beta2.orig/source/wrepld/process.c samba-3.0.0beta2/source/
 	if (!tdb) {
 		DEBUG(2,("send_entry_request: Can't open wins database file %s. Error was %s\n", WINS_LIST, strerror(errno) ));
 		return;
--- samba_3_0/source/nsswitch/winbindd_acct.c.orig	2003-07-15 13:03:59.000000000 -0400
+++ samba_3_0/source/nsswitch/winbindd_acct.c	2003-07-15 13:04:42.000000000 -0400
@@ -73,7 +73,7 @@
 		
 	/* Nope.  Try to open it */
 
-	if (!(account_tdb = tdb_open_log(lock_path("winbindd_idmap.tdb"), 0, 
+	if (!(account_tdb = tdb_open_log(state_path("winbindd_idmap.tdb"), 0, 
 		TDB_DEFAULT, O_RDWR | O_CREAT, 0600))) 
 	{
 		/* last chance -- maybe idmap has already opened it */
							
							
							
						
							
							
							
						
@ -1,5 +1,5 @@
--- samba-3.0alpha23.orig/source/script/installswat.sh	2001-10-17 16:00:14.000000000 -0400
+++ samba-3.0alpha23/source/script/installswat.sh	2003-04-06 03:18:29.000000000 -0400
--- samba_3_0/source/script/installswat.sh.orig	2003-08-28 18:03:10.000000000 -0400
+++ samba_3_0/source/script/installswat.sh	2003-08-28 18:11:14.000000000 -0400
@@ -9,7 +9,7 @@
 echo Installing the Samba Web Administration Tool
 
							
								
							
							
								
							
							
						
@ -36,7 +36,7 @@
       FNAME=$SWATDIR/$ln/help/`basename $f`
       echo $FNAME
       if [ "x$BOOKDIR" = "x" ]; then
@@ -49,31 +45,31 @@
@@ -49,26 +45,24 @@
       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
       rm -f $f
       chmod 0644 $FNAME
							
							
							
								
							
						
@ -62,23 +62,15 @@
       cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
       chmod 0644 $FNAME
+ done
+
 done
 
+# Install html documentation
+for f in $SRCDIR../docs/htmldocs/*.html; do
+      FNAME=$SWATDIR/help/`basename $f`
+      echo $FNAME
+      ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+#      chmod 0644 $FNAME
+	FNAME=$SWATDIR/help/`basename $f`
+	echo $FNAME
+	ln -s ../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+	chmod 0644 $FNAME
 done
 
 # Install Using Samba book
 
-if [ "x$BOOKDIR" != "x" ]; then
+# For Debian we do not install anything here, we just create a symlink
+#	pointing to /usr/share/doc/samba-doc/htmldocs/using_samba/ in
+#	debian/rules (peloy@debian.org)
+if /bin/false; then
 
     # Create directories
 
 # Install Using Samba book (but only if it is there)
							
							
							
						
							
							
							
						
@ -1,688 +0,0 @@
--- samba_3_0/source/Makefile.in.orig	2003-07-15 12:26:55.000000000 -0400
+++ samba_3_0/source/Makefile.in	2003-07-15 12:26:57.000000000 -0400
@@ -32,7 +32,6 @@
 ACLLIBS=@ACLLIBS@
 PASSDBLIBS=@PASSDBLIBS@
 IDMAP_LIBS=@IDMAP_LIBS@
-ADSLIBS=@ADSLIBS@
 KRB5LIBS=@KRB5_LIBS@
 LDAPLIBS=@LDAP_LIBS@
 
@@ -735,12 +734,12 @@
 
 bin/smbd@EXEEXT@: $(SMBD_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(ADSLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
+	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(KRB5LIBS) $(LDAPLIBS) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
 	  $(AUTHLIBS) $(ACLLIBS) $(PASSDBLIBS) $(LIBS) @POPTLIBS@
 
 bin/nmbd@EXEEXT@: $(NMBD_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS)
+	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
 
 bin/wrepld@EXEEXT@: $(WREPL_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
@@ -749,19 +748,19 @@
 bin/swat@EXEEXT@: $(SWAT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
 	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINTLIBS) \
-	  $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS)
+	  $(AUTHLIBS) $(LIBS) $(PASSDBLIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
 
 bin/rpcclient@EXEEXT@: $(RPCCLIENT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS)
+	@$(CC) $(FLAGS) -o $@ $(PASSDBLIBS) $(RPCCLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
 
 bin/smbclient@EXEEXT@: $(CLIENT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(ADSLIBS)
+	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS)
 
 bin/net@EXEEXT@: $(NET_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(ADSLIBS) $(PASSDBLIBS)
+	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAPLIBS) $(PASSDBLIBS)
 
 bin/profiles@EXEEXT@: $(PROFILES_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
@@ -809,7 +808,7 @@
 
 bin/smbpasswd@EXEEXT@: $(SMBPASSWD_OBJ) bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS)
+	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(PASSDBLIBS) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAPLIBS)
 
 bin/pdbedit@EXEEXT@: $(PDBEDIT_OBJ) @BUILD_POPT@ bin/.dummy
 	@echo Linking $@
@@ -881,7 +880,7 @@
 
 bin/smbw_sample@EXEEXT@: $(SMBW_OBJ) utils/smbw_sample.o bin/.dummy
 	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS)
+	@$(CC) $(FLAGS) -o $@ $(SMBW_OBJ) utils/smbw_sample.o $(LDFLAGS) $(LIBS) $(KRB5LIBS) $(LDAPLIBS)
 
 bin/smbsh@EXEEXT@: $(SMBSH_OBJ) bin/.dummy
 	@echo Linking $@
@@ -890,12 +889,14 @@
 bin/smbwrapper.@SHLIBEXT@: $(PICOBJS) bin/.dummy
 	@echo Linking shared library $@
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(PICOBJS) $(LIBS) \
-		@SONAMEFLAG@`basename $@` $(KRB5LIBS)
+		$(KRB5LIBS) $(LDAPLIBS) \
+		@SONAMEFLAG@`basename $@`
 
 bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS)
 	@echo Linking libsmbclient shared library $@
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(LDFLAGS) $(LIBS) \
-	$(KRB5LIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+		$(KRB5LIBS) $(LDAPLIBS) \
+		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
 
 bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
 	@echo Linking libsmbclient non-shared library $@
@@ -905,7 +906,8 @@
 bin/libbigballofmud.@SHLIBEXT@: $(LIBBIGBALLOFMUD_PICOBJS)
 	@echo Linking bigballofmud shared library $@
 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_PICOBJS) $(LIBS) \
-		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR) $(PASSDBLIBS) $(IDMAP_LIBS) $(ADSLIBS)
+		$(PASSDBLIBS) $(IDMAP_LIBS) $(KRB5LIBS) $(LDAPLIBS) \
+		@SONAMEFLAG@`basename $@`.$(LIBBIGBALLOFMUD_MAJOR)
 	ln -snf libbigballofmud.so bin/libbigballofmud.so.0
 
 # It would be nice to build a static bigballofmud too, but when I try
diff -uNr samba-3.0.0beta2.orig/source/aclocal.m4 samba-3.0.0beta2/source/aclocal.m4
--- samba-3.0.0beta2.orig/source/aclocal.m4	2003-07-01 15:44:25.000000000 -0500
+++ samba-3.0.0beta2/source/aclocal.m4	2003-07-05 16:22:30.000000000 -0500
@@ -111,6 +111,113 @@
   esac
 ])
 
+# AC_CHECK_LIB_EXT(LIBRARY, [EXT_LIBS], [FUNCTION],
+#              [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
+#              [ADD-ACTION-IF-FOUND],[OTHER-LIBRARIES])
+# ------------------------------------------------------
+#
+# Use a cache variable name containing both the library and function name,
+# because the test really is for library $1 defining function $3, not
+# just for library $1.  Separate tests with the same $1 and different $3s
+# may have different results.
+#
+# Note that using directly AS_VAR_PUSHDEF([ac_Lib], [ac_cv_lib_$1_$3])
+# is asking for troubles, since AC_CHECK_LIB($lib, fun) would give
+# ac_cv_lib_$lib_fun, which is definitely not what was meant.  Hence
+# the AS_LITERAL_IF indirection.
+#
+# FIXME: This macro is extremely suspicious.  It DEFINEs unconditionnally,
+# whatever the FUNCTION, in addition to not being a *S macro.  Note
+# that the cache does depend upon the function we are looking for.
+#
+# It is on purpose we used `ac_check_lib_ext_save_LIBS' and not just
+# `ac_save_LIBS': there are many macros which don't want to see `LIBS'
+# changed but still want to use AC_CHECK_LIB_EXT, so they save `LIBS'.
+# And ``ac_save_LIBS' is too tempting a name, so let's leave them some
+# freedom.
+AC_DEFUN([AC_CHECK_LIB_EXT],
+[
+AH_CHECK_LIB_EXT([$1])
+ac_check_lib_ext_save_LIBS=$LIBS
+LIBS="-l$1 $$2 $7 $LIBS"
+AS_LITERAL_IF([$1],
+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1])],
+      [AS_VAR_PUSHDEF([ac_Lib_ext], [ac_cv_lib_ext_$1''])])dnl
+
+m4_ifval([$3],
+ [
+    AH_CHECK_FUNC_EXT([$3])
+    AS_LITERAL_IF([$1],
+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1_$3])],
+              [AS_VAR_PUSHDEF([ac_Lib_func], [ac_cv_lib_ext_$1''_$3])])dnl
+    AC_CACHE_CHECK([for $3 in -l$1], ac_Lib_func,
+	[AC_TRY_LINK_FUNC($3,
+                 [AS_VAR_SET(ac_Lib_func, yes);
+		  AS_VAR_SET(ac_Lib_ext, yes)],
+                 [AS_VAR_SET(ac_Lib_func, no);
+		  AS_VAR_SET(ac_Lib_ext, no)])
+	])
+    AS_IF([test AS_VAR_GET(ac_Lib_func) = yes],
+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_$3))])dnl
+    AS_VAR_POPDEF([ac_Lib_func])dnl
+ ],[
+    AC_CACHE_CHECK([for -l$1], ac_Lib_ext,
+	[AC_TRY_LINK_FUNC([main],
+                 [AS_VAR_SET(ac_Lib_ext, yes)],
+                 [AS_VAR_SET(ac_Lib_ext, no)])
+	])
+ ])
+LIBS=$ac_check_lib_ext_save_LIBS
+
+AS_IF([test AS_VAR_GET(ac_Lib_ext) = yes],
+    [m4_default([$4], 
+        [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_LIB$1))
+		case "$$2" in
+		    *-l$1*)
+			;;
+		    *)
+			$2="$$2 -l$1"
+			;;
+		esac])
+		[$6]
+	    ],
+	    [$5])dnl
+AS_VAR_POPDEF([ac_Lib_ext])dnl
+])# AC_CHECK_LIB_EXT
+
+# AH_CHECK_LIB_EXT(LIBNAME)
+# ---------------------
+m4_define([AH_CHECK_LIB_EXT],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_LIB$1),
+             [Define to 1 if you have the `]$1[' library (-l]$1[).])])
+
+# AC_CHECK_FUNCS_EXT(FUNCTION, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+# -----------------------------------------------------------------
+dnl check for a function in a $LIBS and $OTHER_LIBS libraries variable.
+dnl AC_CHECK_FUNC_EXT(func,OTHER_LIBS,IF-TRUE,IF-FALSE)
+AC_DEFUN([AC_CHECK_FUNC_EXT],
+[
+    AH_CHECK_FUNC_EXT($1)	
+    ac_check_func_ext_save_LIBS=$LIBS
+    LIBS="$2 $LIBS"
+    AS_VAR_PUSHDEF([ac_var], [ac_cv_func_ext_$1])dnl
+    AC_CACHE_CHECK([for $1], ac_var,
+	[AC_LINK_IFELSE([AC_LANG_FUNC_LINK_TRY([$1])],
+                [AS_VAR_SET(ac_var, yes)],
+                [AS_VAR_SET(ac_var, no)])])
+    LIBS=$ac_check_func_ext_save_LIBS
+    AS_IF([test AS_VAR_GET(ac_var) = yes], 
+	    [AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_$1])) $3], 
+	    [$4])dnl
+AS_VAR_POPDEF([ac_var])dnl
+])# AC_CHECK_FUNC
+
+# AH_CHECK_FUNC_EXT(FUNCNAME)
+# ---------------------
+m4_define([AH_CHECK_FUNC_EXT],
+[AH_TEMPLATE(AS_TR_CPP(HAVE_$1),
+             [Define to 1 if you have the `]$1[' function.])])
+
 dnl Define an AC_DEFINE with ifndef guard.
 dnl AC_N_DEFINE(VARIABLE [, VALUE])
 define(AC_N_DEFINE,
diff -uNr samba-3.0.0beta2.orig/source/configure.in samba-3.0.0beta2/source/configure.in
--- samba-3.0.0beta2.orig/source/configure.in	2003-07-05 16:22:00.000000000 -0500
+++ samba-3.0.0beta2/source/configure.in	2003-07-05 16:23:53.000000000 -0500
@@ -162,12 +162,10 @@
 AC_SUBST(PRINTLIBS)
 AC_SUBST(AUTHLIBS)
 AC_SUBST(ACLLIBS)
-AC_SUBST(ADSLIBS)
 AC_SUBST(PASSDBLIBS)
 AC_SUBST(IDMAP_LIBS)
 AC_SUBST(KRB5_LIBS)
 AC_SUBST(LDAP_LIBS)
-AC_SUBST(LDAP_OBJ)
 AC_SUBST(SHLIB_PROGS)
 AC_SUBST(SMBWRAPPER)
 AC_SUBST(EXTRA_BIN_PROGS)
@@ -2105,14 +2103,107 @@
   AC_MSG_RESULT(no)
 )
 
+########################################################
+# Compile with LDAP support?
+
+with_ldap_support=auto
+AC_MSG_CHECKING([for LDAP support])
+
+AC_ARG_WITH(ldap,
+[  --with-ldap             LDAP support (default yes)],
+[ case "$withval" in
+    yes|no)
+	with_ldap_support=$withval
+	;;
+  esac ])
+
+AC_MSG_RESULT($with_ldap_support)
+
+SMBLDAP=""
+SMBLDAP_PROTO=""
+AC_SUBST(SMBLDAP)
+AC_SUBST(SMBLDAP_PROTO)
+if test x"$with_ldap_support" != x"no"; then
+
+  ##################################################################
+  # first test for ldap.h and lber.h
+  # (ldap.h is required for this test)
+  AC_CHECK_HEADERS(ldap.h lber.h)
+  
+  if test x"$ac_cv_header_ldap_h" != x"yes"; then
+	if test x"$with_ldap_support" = x"yes"; then
+	 AC_MSG_ERROR(ldap.h is needed for LDAP support)
+	else
+	 AC_MSG_WARN(ldap.h is needed for LDAP support)
+	fi
+	
+	with_ldap_support=no
+  fi
+fi
+
+if test x"$with_ldap_support" != x"no"; then
+  ac_save_LIBS=$LIBS
+
+  ##################################################################
+  # we might need the lber lib on some systems. To avoid link errors
+  # this test must be before the libldap test
+  AC_CHECK_LIB_EXT(lber, LDAP_LIBS, ber_scanf)
+
+  ########################################################
+  # now see if we can find the ldap libs in standard paths
+  AC_CHECK_LIB_EXT(ldap, LDAP_LIBS, ldap_init)
+
+  AC_CHECK_FUNC_EXT(ldap_domain2hostlist,$LDAP_LIBS)
+  
+  ########################################################
+  # If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
+  # Check found in pam_ldap 145.
+  AC_CHECK_FUNC_EXT(ldap_set_rebind_proc,$LDAP_LIBS)
+
+  LIBS="$LIBS $LDAP_LIBS"
+  AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, smb_ldap_cv_ldap_set_rebind_proc, [
+    AC_TRY_COMPILE([
+	#include <lber.h>
+	#include <ldap.h>], 
+	[ldap_set_rebind_proc(0, 0, 0);], 
+	[smb_ldap_cv_ldap_set_rebind_proc=3], 
+	[smb_ldap_cv_ldap_set_rebind_proc=2]
+    ) 
+  ])
+  
+  AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $smb_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
+
+  AC_CHECK_FUNC_EXT(ldap_initialize,$LDAP_LIBS)	
+  
+  if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then
+    AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
+    default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
+    SMBLDAP="lib/smbldap.o"
+    with_ldap_support=yes
+    AC_MSG_CHECKING(whether LDAP support is used)
+    AC_MSG_RESULT(yes)
+  else
+    if test x"$with_ldap_support" = x"yes"; then
+	AC_MSG_ERROR(libldap is needed for LDAP support)
+    else
+	AC_MSG_WARN(libldap is needed for LDAP support)
+    fi
+    
+    LDAP_LIBS=""
+    with_ldap_support=no
+  fi
+  LIBS=$ac_save_LIBS
+fi
+
+
 #################################################
 # active directory support
 
 with_ads_support=auto
-AC_MSG_CHECKING([whether to use Active Directory])
+AC_MSG_CHECKING([for Active Directory and krb5 support])
 
 AC_ARG_WITH(ads,
-[  --with-ads              Active Directory support (default yes)],
+[  --with-ads              Active Directory support (default auto)],
 [ case "$withval" in
     yes|no)
 	with_ads_support="$withval"
@@ -2124,22 +2215,28 @@
 FOUND_KRB5=no
 KRB5_LIBS=""
 
+if test x"$with_ldap_support" != x"yes"; then
+    if test x"$with_ads_support" = x"yes"; then
+	AC_MSG_ERROR(Active Directory Support requires LDAP support)
+    elif test x"$with_ads_support" != x"no"; then
+	AC_MSG_WARN(Active Directory Support requires LDAP support)
+    fi
+    with_ads_support=no
+fi
+
 if test x"$with_ads_support" != x"no"; then
 
   # Do no harm to the values of CFLAGS and LIBS while testing for
   # Kerberos support.
 
-  ac_save_CFLAGS="$CFLAGS"
-  ac_save_LIBS="$LIBS"
-
   #################################################
   # check for krb5-config from recent MIT and Heimdal kerberos 5
   AC_PATH_PROG(KRB5_CONFIG, krb5-config)
   AC_MSG_CHECKING(for working krb5-config)
   if test -x "$KRB5_CONFIG"; then
-    LIBS="$LIBS `$KRB5_CONFIG --libs`"
-    CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
-    CPPFLAGS="$CPPFLAGS `$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
+    KRB5_LIBS="`CFLAGS='' $KRB5_CONFIG --libs gssapi`"
+    KRB5_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`" 
+    KRB5_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
     FOUND_KRB5=yes
     AC_MSG_RESULT(yes)
   else
@@ -2154,18 +2251,23 @@
     [  --with-krb5=base-dir    Locate Kerberos 5 support (default=/usr)],
     [ case "$withval" in
       no)
-        AC_MSG_RESULT(no)
+        AC_MSG_RESULT(no krb5-path given)
+        ;;
+      yes)
+        AC_MSG_RESULT(/usr)
+        KRB5_LIBS="-lkrb5"
+        FOUND_KRB5=yes
         ;;
       *)
-        AC_MSG_RESULT(yes)
-        LIBS="$LIBS -lkrb5"
-        CFLAGS="$CFLAGS -I$withval/include"
-        CPPFLAGS="$CPPFLAGS -I$withval/include"
-        LDFLAGS="$LDFLAGS -L$withval/lib"
+        AC_MSG_RESULT($withval)
+        KRB5_LIBS="-lkrb5"
+        KRB5_CFLAGS="-I$withval/include"
+        KRB5_CPPFLAGS="-I$withval/include"
+        KRB5_LDFLAGS="-L$withval/lib"
         FOUND_KRB5=yes
         ;;
       esac ],
-      AC_MSG_RESULT(no)
+      AC_MSG_RESULT(no krb5-path given)
     )
   fi
 
@@ -2175,15 +2277,15 @@
     AC_MSG_CHECKING(for /usr/include/heimdal)
     if test -d /usr/include/heimdal; then
       if test -f /usr/lib/heimdal/lib/libkrb5.a; then
-          LIBS="$LIBS -lkrb5"
-          CFLAGS="$CFLAGS -I/usr/include/heimdal"
-          CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
-          LDFLAGS="$LDFLAGS -L/usr/lib/heimdal/lib"
+          KRB5_LIBS="-lkrb5"
+          KRB5_CFLAGS="-I/usr/include/heimdal"
+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
+          KRB5_LDFLAGS="-L/usr/lib/heimdal/lib"
           AC_MSG_RESULT(yes)
       else
-          LIBS="$LIBS -lkrb5"
-          CFLAGS="$CFLAGS -I/usr/include/heimdal"
-          CPPFLAGS="$CPPFLAGS -I/usr/include/heimdal"
+          KRB5_LIBS="-lkrb5"
+          KRB5_CFLAGS="-I/usr/include/heimdal"
+          KRB5_CPPFLAGS="-I/usr/include/heimdal"
           AC_MSG_RESULT(yes)
       fi
     else
@@ -2196,16 +2298,26 @@
     # see if this box has the RedHat location for kerberos
     AC_MSG_CHECKING(for /usr/kerberos)
     if test -d /usr/kerberos -a -f /usr/kerberos/lib/libkrb5.a; then
-      LIBS="$LIBS -lkrb5"
-      LDFLAGS="$LDFLAGS -L/usr/kerberos/lib"
-      CFLAGS="$CFLAGS -I/usr/kerberos/include"
-      CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include"
+      KRB5_LIBS="-lkrb5"
+      KRB5_LDFLAGS="-L/usr/kerberos/lib"
+      KRB5_CFLAGS="-I/usr/kerberos/include"
+      KRB5_CPPFLAGS="-I/usr/kerberos/include"
       AC_MSG_RESULT(yes)
     else
       AC_MSG_RESULT(no)
     fi
   fi
 
+  ac_save_CFLAGS=$CFLAGS
+  ac_save_CPPFLAGS=$CPPFLAGS
+  ac_save_LDFLAGS=$LDFLAGS
+
+  CFLAGS="$CFLAGS $KRB5_CFLAGS"
+  CPPFLAGS="$CPPFLAGS $KRB5_CPPFLAGS"
+  LDFLAGS="$LDFLAGS $KRB5_LDFLAGS"
+
+  KRB5_LIBS="$KRB5_LDFLAGS $KRB5_LIBS"
+
   # now check for krb5.h. Some systems have the libraries without the headers!
   # note that this check is done here to allow for different kerberos
   # include paths
@@ -2225,24 +2337,17 @@
     # Turn off AD support and restore CFLAGS and LIBS variables
 
     with_ads_support="no"
-
-    CFLAGS="$ac_save_CFLAGS"
-    LIBS="$ac_save_LIBS"
-
-  else
-
-    # Get rid of case where $with_ads_support=auto
-
-    with_ads_support="yes"
-
+    
+    CFLAGS=$ac_save_CFLAGS
+    CPPFLAGS=$ac_save_CPPFLAGS
+    LDFLAGS=$ac_save_LDFLAGS
   fi
 fi
 
 # Now we have determined whether we really want ADS support
 
-if test x"$with_ads_support" = x"yes"; then
-
-  AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
+if test x"$with_ads_support" != x"no"; then
+  ac_save_LIBS=$LIBS
 
   # now check for gssapi headers.  This is also done here to allow for
   # different kerberos include paths
@@ -2250,64 +2365,46 @@
 
   ##################################################################
   # we might need the k5crypto and com_err libraries on some systems
-  AC_CHECK_LIB(com_err, _et_list)
-  AC_CHECK_LIB(k5crypto, krb5_encrypt_data)
+  AC_CHECK_LIB_EXT(com_err, KRB5_LIBS, _et_list)
+  AC_CHECK_LIB_EXT(k5crypto, KRB5_LIBS, krb5_encrypt_data)
 
   # Heimdal checks.
-  AC_CHECK_LIB(crypto, des_set_key)
-  AC_CHECK_LIB(asn1, copy_Authenticator)
-  AC_CHECK_LIB(roken, roken_getaddrinfo_hostspec)
+  AC_CHECK_LIB_EXT(crypto, KRB5_LIBS, des_set_key)
+  AC_CHECK_LIB_EXT(asn1, KRB5_LIBS, copy_Authenticator)
+  AC_CHECK_LIB_EXT(roken, KRB5_LIBS, roken_getaddrinfo_hostspec)
 
   # Heimdal checks. On static Heimdal gssapi must be linked before krb5.
-  AC_CHECK_LIB(gssapi, gss_display_status, [LIBS="$LIBS -lgssapi -lkrb5";
+  AC_CHECK_LIB_EXT(gssapi, KRB5_LIBS, gss_display_status, [KRB5_LIBS="$KRB5_LIBS -lgssapi -lkrb5";
                  AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
 
-  AC_CHECK_LIB(krb5, krb5_set_real_time, 
-	         [AC_DEFINE(HAVE_KRB5_SET_REAL_TIME,1,
-                   [Whether krb5_set_real_time is available])])
-  AC_CHECK_LIB(krb5, krb5_set_default_in_tkt_etypes, 
-                 [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_IN_TKT_ETYPES,1,
-                   [Whether krb5_set_default_in_tkt_etypes, is available])])
-  AC_CHECK_LIB(krb5, krb5_set_default_tgs_ktypes, 
-                 [AC_DEFINE(HAVE_KRB5_SET_DEFAULT_TGS_KTYPES,1,
-                   [Whether krb5_set_default_tgs_ktypes is available])])
-
-  AC_CHECK_LIB(krb5, krb5_principal2salt, 
-                [AC_DEFINE(HAVE_KRB5_PRINCIPAL2SALT,1,
-                   [Whether krb5_principal2salt is available])])
-  AC_CHECK_LIB(krb5, krb5_use_enctype, 
-                [AC_DEFINE(HAVE_KRB5_USE_ENCTYPE,1,
-                   [Whether krb5_use_enctype is available])])
-  AC_CHECK_LIB(krb5, krb5_string_to_key, 
-                [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY,1,
-                   [Whether krb5_string_to_key is available])])
-  AC_CHECK_LIB(krb5, krb5_get_pw_salt, 
-                [AC_DEFINE(HAVE_KRB5_GET_PW_SALT,1,
-                   [Whether krb5_get_pw_salt is available])])
-  AC_CHECK_LIB(krb5, krb5_string_to_key_salt, 
-                [AC_DEFINE(HAVE_KRB5_STRING_TO_KEY_SALT,1,
-                   [Whether krb5_string_to_key_salt is available])])
-  AC_CHECK_LIB(krb5, krb5_auth_con_setkey, 
-                [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETKEY,1,
-                   [Whether krb5_auth_con_setkey is available])])
-  AC_CHECK_LIB(krb5, krb5_auth_con_setuseruserkey, 
-                [AC_DEFINE(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY,1,
-                   [Whether krb5_auth_con_setuseruserkey is available])])
-  AC_CHECK_LIB(krb5, krb5_locate_kdc, 
-                [AC_DEFINE(HAVE_KRB5_LOCATE_KDC,1,
-                   [Whether krb5_locate_kdc is available])])
-  AC_CHECK_LIB(krb5, krb5_get_permitted_enctypes, 
-                [AC_DEFINE(HAVE_KRB5_GET_PERMITTED_ENCTYPES,1,
-                   [Whether krb5_get_permitted_enctypes is available])])
-  AC_CHECK_LIB(krb5, krb5_get_default_in_tkt_etypes, 
-                [AC_DEFINE(HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES,1,
-                   [Whether krb5_get_default_in_tkt_etypes is available])])
-  AC_CHECK_LIB(krb5, krb5_free_ktypes, 
-                [AC_DEFINE(HAVE_KRB5_FREE_KTYPES,1,
-                   [Whether krb5_free_ktypes is available])])
-  AC_CHECK_LIB(krb5, krb5_principal_get_comp_string, 
-                [AC_DEFINE(HAVE_KRB5_PRINCIPAL_GET_COMP_STRING,1,
-                   [Whether krb5_principal_get_comp_string is available])])
+  ########################################################
+  # now see if we can find the krb5 libs in standard paths
+  # or as specified above
+  AC_CHECK_LIB_EXT(krb5, KRB5_LIBS, krb5_mk_req_extended)
+
+  ########################################################
+  # now see if we can find the gssapi libs in standard paths
+  AC_CHECK_LIB_EXT(gssapi_krb5, KRB5_LIBS,gss_display_status,[],[],
+	   AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available]))
+
+  AC_CHECK_FUNC_EXT(krb5_set_real_time, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_set_default_in_tkt_etypes, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_set_default_tgs_ktypes, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_principal2salt, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_use_enctype, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_string_to_key, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_get_pw_salt, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_string_to_key_salt, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_auth_con_setkey, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_auth_con_setuseruserkey, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_locate_kdc, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_get_permitted_enctypes, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_get_default_in_tkt_etypes, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_free_ktypes, $KRB5_LIBS)
+  AC_CHECK_FUNC_EXT(krb5_principal_get_comp_string, $KRB5_LIBS)
+
+  LIBS="$LIBS $KRB5_LIBS"
+
   AC_CACHE_CHECK([for the krb5_princ_component macro],
                 samba_cv_HAVE_KRB5_PRINC_COMPONENT,[
     AC_TRY_LINK([#include <krb5.h>],
@@ -2380,87 +2468,21 @@
               [Whether the ENCTYPE_ARCFOUR_HMAC_MD5 key type is available])
   fi
 
-  ########################################################
-  # now see if we can find the krb5 libs in standard paths
-  # or as specified above
-  AC_CHECK_LIB(krb5, krb5_mk_req_extended, [KRB5_LIBS="$LIBS -lkrb5";
-	       KRB5_CFLAGS="$CFLAGS";
-               AC_DEFINE(HAVE_KRB5,1,[Whether KRB5 is available])])
-
-  ########################################################
-  # now see if we can find the gssapi libs in standard paths
-  AC_CHECK_LIB(gssapi_krb5, gss_display_status, 
-               [KRB5_LIBS="$KRB5_LIBS -lgssapi_krb5";
-                AC_DEFINE(HAVE_GSSAPI,1,[Whether GSSAPI is available])])
-
-  CFLAGS="$ac_save_CFLAGS"
-  LIBS="$ac_save_LIBS"
-fi
-
-########################################################
-# Compile with LDAP support?
-
-LDAP_OBJ=""
-with_ldap_support=yes
-AC_MSG_CHECKING([whether to use LDAP])
-
-AC_ARG_WITH(ldap,
-[  --with-ldap             LDAP support (default yes)],
-[ case "$withval" in
-    no)
-	with_ldap_support=no
-	;;
-  esac ])
-
-AC_MSG_RESULT($with_ldap_support)
-
-SMBLDAP=""
-if test x"$with_ldap_support" = x"yes"; then
-  ac_save_LIBS="$LIBS"
-  LIBS=""
-
-  ##################################################################
-  # we might need the lber lib on some systems. To avoid link errors
-  # this test must be before the libldap test
-  AC_CHECK_LIB(lber, ber_scanf)
-
-  ########################################################
-  # now see if we can find the ldap libs in standard paths
-  if test x$have_ldap != xyes; then
-        AC_CHECK_LIB(ldap, ldap_init, [
-           LIBS="$LIBS -lldap";
-           AC_CHECK_LIB(ldap, ldap_domain2hostlist, [
-	      AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
-	      AC_CHECK_HEADERS([ldap.h lber.h], 
-                 [default_static_modules="$default_static_modules pdb_ldap idmap_ldap";
-                  SMBLDAP="lib/smbldap.o"])
-           ])
-        ])
-
-	########################################################
-	# If we have LDAP, does it's rebind procedure take 2 or 3 arguments?
-	# Check found in pam_ldap 145.
-	AC_CHECK_FUNCS(ldap_set_rebind_proc)
-	AC_CACHE_CHECK(whether ldap_set_rebind_proc takes 3 arguments, pam_ldap_cv_ldap_set_rebind_proc, [
-	AC_TRY_COMPILE([
-	#include <lber.h>
-	#include <ldap.h>], [ldap_set_rebind_proc(0, 0, 0);], [pam_ldap_cv_ldap_set_rebind_proc=3], [pam_ldap_cv_ldap_set_rebind_proc=2]) ])
-	AC_DEFINE_UNQUOTED(LDAP_SET_REBIND_PROC_ARGS, $pam_ldap_cv_ldap_set_rebind_proc, [Number of arguments to ldap_set_rebind_proc])
-	AC_CHECK_FUNCS(ldap_initialize)	
-  fi
-  
-  AC_SUBST(SMBLDAP)
-  LDAP_LIBS="$LIBS";
-  LIBS="$ac_save_LIBS";
-else
-    # Can't have ADS support without LDAP
+  if test x"$ac_cv_lib_ext_krb5_krb5_mk_req_extended" = x"yes"; then
+    AC_DEFINE(HAVE_KRB5,1,[Whether to have KRB5 support])
+    AC_DEFINE(WITH_ADS,1,[Whether to include Active Directory support])
+    AC_MSG_CHECKING(whether Active Directory and krb5 support is used)
+    AC_MSG_RESULT(yes)
+  else
     if test x"$with_ads_support" = x"yes"; then
-       AC_MSG_ERROR(Active directory support requires LDAP)
+	AC_MSG_ERROR(libkrb5 is needed for Active Directory support)
+    else
+	AC_MSG_WARN(libkrb5 is needed for Active Directory support)
     fi
-fi
-
-if test x"$with_ads_support" = x"yes"; then
-	ADSLIBS="$LDAP_LIBS $KRB5_LIBS"
+    KRB5_LIBS=""
+    with_ads_support=no 
+  fi
+  LIBS="$ac_save_LIBS"
 fi
 
 ########################################################
							
							
							
						
@ -1,20 +1,20 @@
diff -uNr samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c
--- samba-2.999+3.0.alpha21.orig/source/nmbd/nmbd_subnetdb.c	2002-11-26 20:54:19.000000000 -0600
+++ samba-2.999+3.0.alpha21/source/nmbd/nmbd_subnetdb.c	2002-12-16 23:34:13.000000000 -0600
@@ -230,12 +230,16 @@
   extern struct in_addr loopback_ip;
@@ -214,12 +214,16 @@
	extern struct in_addr loopback_ip;
 
   if(num_interfaces == 0) {
+	  void (*old_handler)(int);
	if(num_interfaces == 0) {
+		void (*old_handler)(int);
+
 	  DEBUG(0,("create_subnets: No local interfaces !\n"));
 	  DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
+	  old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
 	  while (iface_count() == 0) {
 		  sleep(5);
 		  load_interfaces();
 	  }
+	  CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
   }
		DEBUG(0,("create_subnets: No local interfaces !\n"));
		DEBUG(0,("create_subnets: Waiting for an interface to appear ...\n"));
+		old_handler = CatchSignal( SIGTERM, SIGNAL_CAST SIG_DFL );
		while (iface_count() == 0) {
			sleep(5);
			load_interfaces();
		}
+		CatchSignal( SIGTERM, SIGNAL_CAST old_handler );
	}
 
   num_interfaces = iface_count();
	num_interfaces = iface_count();
							
							
							
						
							
							
							
						
@ -1,24 +0,0 @@
diff -uNr samba-3.0.0beta2.orig/source/Makefile.in samba-3.0.0beta2/source/Makefile.in
--- samba-3.0.0beta2.orig/source/Makefile.in	2003-07-05 16:24:34.000000000 -0500
+++ samba-3.0.0beta2/source/Makefile.in	2003-07-05 16:24:54.000000000 -0500
@@ -579,8 +579,8 @@
 PAM_SMBPASS_OBJ_0 = pam_smbpass/pam_smb_auth.o pam_smbpass/pam_smb_passwd.o \
                pam_smbpass/pam_smb_acct.o pam_smbpass/support.o \
                libsmb/smbencrypt.o libsmb/smbdes.o libsmb/nterr.o \
-               $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
-               $(SECRETS_OBJ) $(UBIQX_OBJ)
+               $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \
+	       $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(SMBLDAP_OBJ)
 
 PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
 
@@ -1076,7 +1076,8 @@
 
 bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_PICOOBJ)
 	@echo "Linking shared library $@"
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) $(LIBS) -lc
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_PICOOBJ) -lpam $(DYNEXP) \
+		 $(PASSDBLIBS) $(LIBS) -lc
 
 bin/libmsrpc.a: $(LIBMSRPC_PICOBJ)
 	@-$(AR) -rc $@ $(LIBMSRPC_PICOBJ) 
							
							
								
							
							
						
@ -49,7 +49,7 @@ diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/sou
diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/smbd/service.c
--- samba-3.0.0beta1.orig/source/smbd/service.c	2003-06-07 12:57:39.000000000 -0500
+++ samba-3.0.0beta1/source/smbd/service.c	2003-06-30 20:12:57.000000000 -0500
@@ -880,6 +880,9 @@
@@ -881,6 +881,9 @@
 	file_close_conn(conn);
 	dptr_closecnum(conn);
 
							
							
							
								
							
						
@ -59,7 +59,7 @@ diff -uNr samba-3.0.0beta1.orig/source/smbd/service.c samba-3.0.0beta1/source/sm
 	/* execute any "postexec = " line */
 	if (*lp_postexec(SNUM(conn)) && 
 	    change_to_user(conn, vuid))  {
@@ -899,8 +902,5 @@
@@ -900,8 +903,5 @@
 		smbrun(cmd,NULL);
 	}
 
							
								
							
							
							
						
							
							
							
						
@ -1,23 +0,0 @@
diff -uNr samba-3.0alpha21.orig/source/smbadduser samba-3.0alpha21/source/smbadduser
--- samba-3.0alpha21.orig/source/smbadduser	2003-02-16 13:01:45.000000000 -0600
+++ samba-3.0alpha21/source/smbadduser	2003-02-16 16:25:16.000000000 -0600
@@ -2,13 +2,14 @@
 #
 # smbadduser - Written by Mike Zakharoff
 #
+# Customized for Debian by Eloy A. Paris <peloy@debian.org>
+#
 unalias *
-set path = ($path /usr/local/samba/bin)
+# No need to set a path in Debian
+#set path = ($path /usr/local/samba/bin)
 
-set smbpasswd = /usr/local/samba/private/smbpasswd
-#set smbpasswd = /etc/samba/smbpasswd
-set user_map  = /usr/local/samba/lib/users.map
-#set user_map  = /etc/samba/smbusers
+set smbpasswd = /etc/samba/smbpasswd
+set user_map  = /etc/samba/users.map
 #
 # Set to site specific passwd command
 #
							
							
							
						
@ -1,7 +1,7 @@
diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/client/client.c
--- samba-3.0.0beta2.orig/source/client/client.c	2003-07-01 22:36:24.000000000 -0500
+++ samba-3.0.0beta2/source/client/client.c	2003-07-06 15:17:36.000000000 -0500
@@ -2731,6 +2731,7 @@
@@ -2773,6 +2773,7 @@
 	int opt;
 	pstring query_host;
 	BOOL message = False;
							
							
							
								
							
						
@ -18,7 +18,7 @@ diff -uNr samba-3.0.0beta2.orig/source/client/client.c samba-3.0.0beta2/source/c
 				poptPrintUsage(pc, stderr, 0);
 				exit(1);
 			}
@@ -2848,6 +2849,22 @@
@@ -2917,6 +2917,22 @@
 		pstrcpy(cmdline_auth_info.password,poptGetArg(pc));  
 	}
 
							
							
							
						
@ -1,7 +1,7 @@
diff -uNr samba-2.999+3.0.alpha21.orig/source/utils/status.c samba-2.999+3.0.alpha21/source/utils/status.c
--- samba-2.999+3.0.alpha21.orig/source/utils/status.c	2002-11-26 20:54:22.000000000 -0600
+++ samba-2.999+3.0.alpha21/source/utils/status.c	2002-12-16 23:37:14.000000000 -0600
@@ -634,6 +634,16 @@
@@ -630,6 +630,16 @@
 	if (!shares_only) {
 		int ret;
 
							
								
							
							
							
						
							
							
								
							
							
						
@ -14,14 +14,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
"POT-Creation-Date: 2003-07-02 21:50-0500\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-30 19:08-0500\n"
"PO-Revision-Date: 2003-07-02 21:51-0500\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: Spanish <debian-l10n-spanish@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#. Description
#: ../samba-common.templates:3
							
							
							
								
							
						
@ -39,9 +39,8 @@ msgid ""
msgstr ""
"Actualmente hay una opción de \"character set\" en smb.conf.  En Samba 3.0 "
"esta opción ha sido reemplazado por una opción nueva: \"unix charset\". Por "
"favor, indique el juego de caracteres que desea usar para esta opción "
"nueva, que controla cómo Samba interpretará los nombres en el sistema de "
"ficheros."
"favor, indique el juego de caracteres que desea usar para esta opción nueva, "
"que controla cómo Samba interpretará los nombres en el sistema de ficheros."
#. Description
#: ../samba-common.templates:3
							
								
							
							
							
						
							
							
								
							
							
						
@ -14,14 +14,14 @@
msgid ""
msgstr ""
"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
"POT-Creation-Date: 2003-07-02 21:50-0500\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-30 19:08-0500\n"
"PO-Revision-Date: 2003-07-02 21:52-0500\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-15\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#. Description
#: ../samba-common.templates:3
							
								
							
							
							
						
							
							
							
						
@ -0,0 +1,302 @@
#
#    Translators, if you are not familiar with the PO format, gettext
#    documentation is worth reading, especially sections dedicated to
#    this format, e.g. by running:
#         info -n '(gettext)PO Files'
#         info -n '(gettext)Header Entry'
#
#    Some information specific to po-debconf are available at
#            /usr/share/doc/po-debconf/README-trans
#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
#    Developers do not need to manually edit POT or PO files.
#
msgid ""
msgstr ""
"Project-Id-Version: samba\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-30 19:08-0500\n"
"PO-Revision-Date: 2003-08-30 02:03+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: dutch <debian-l10n-dutch@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#. Description
#: ../samba-common.templates:3
msgid "Character Set for Unix filesystem"
msgstr "Karakterset voor Unix bestandsysteem"
#. Description
#: ../samba-common.templates:3
msgid ""
"You currently have a \"character set\" configured in your smb.conf.  In "
"Samba 3.0, this option is replaced by a new option, \"unix charset\". Please "
"specify the character set you wish to use for theis new option, which "
"controls how Samba interprets filenames on the file system."
msgstr ""
"U heeft momenteel een \"karakterset\" ingesteld in uw smb.conf. In Samba 3.0 "
"werd deze optie vervangen door een nieuwe \"unix karakterset\" optie. "
"Gelieve de karakterset die u voor deze nieuwe optie wil gebruiken aan te "
"geven, deze bepaald hoe Samba de bestandsnamen in het bestandsysteem "
"interpreteerd."
#. Description
#: ../samba-common.templates:3
msgid "If you leave this option blank, your smb.conf will not be changed."
msgstr ""
"Uw smb.conf bestand wordt niet aangepast indien u deze optie leeg laat."
#. Description
#: ../samba-common.templates:13
msgid "Character Set for DOS clients"
msgstr "Karakterset voor DOS-clients"
#. Description
#: ../samba-common.templates:13
msgid ""
"You currently have a \"client code page\" set in your smb.conf.  In Samba "
"3.0, this option is replaced by the option \"dos charset\".  Please specify "
"the character set you wish to use for this new option.  In most cases, the "
"default chosen for you will be sufficient.  Note that this option is not "
"needed to support Windows clients, it is only for DOS clients.  If you leave "
"this option blank, your smb.conf will not be changed."
msgstr ""
"U heeft momenteel een \"client code pagina\" ingesteld in uw smb.conf. In "
"Samba 3.0 werd deze optie vervangen door de optie \"dos karakterset\". "
"Gelieve de karakterset die u voor deze nieuwe optie wilt gebruiken aan te "
"geven. In de meeste gevallen zal het standaard ingevulde antwoord voldoen. "
"Merk op dat deze optie niet nodig is voor ondersteuning van Windows-clients, "
"enkel voor DOS-clients. Uw smb.conf wordt niet veranderd wanneer u deze "
"optie blank laat."
#. Description
#: ../samba-common.templates:24
msgid "Modify smb.conf to use WINS settings from DHCP?"
msgstr "smb.conf aanpassen om de WINS instellingen van DHCP te gebruiken?"
#. Description
#: ../samba-common.templates:24
msgid ""
"If your computer gets IP address information from a DHCP server on the "
"network, the DHCP server may also provide information about WINS servers "
"(\"NetBIOS name servers\") present on the network.  This requires a change "
"to your smb.conf file so that DHCP-provided WINS settings will automatically "
"be read from /etc/samba/dhcp.conf."
msgstr ""
"Indien uw computer zijn ip-addres informatie van een DHCP-server op het "
"netwerk haalt, voorziet deze mogelijks ook informatie betreffende de op het "
"netwerk aanwezige WINS-servers (\"NetBIOS naam servers\").\" Dit vereist een "
"verandering aan uw smb.conf bestand, opdat de door DHCP doorgegeven WINS "
"instellingen automatisch gelezen worden van /etc/samba/dhcp.conf."
#. Description
#: ../samba-common.templates:24
msgid ""
"You must have the dhcp3-client package installed to take advantage of this "
"feature."
msgstr ""
"U dient het dhcp3-client-pakket geïnstalleert te hebben om van deze optie "
"gebruik te maken."
#. Description
#: ../samba-common.templates:37
msgid "Configure smb.conf through debconf?"
msgstr "Configuratie in smb.conf met debconf beheren?"
#. Description
#: ../samba-common.templates:37
msgid ""
"The rest of the configuration of Samba deals with questions that affect "
"parameters in /etc/samba/smb.conf, which is the file used to configure the "
"Samba programs (nmbd and smbd.) Your current smb.conf contains an 'include' "
"line or an option that spans multiple lines, which could confuse debconf and "
"require you to edit your smb.conf by hand to get it working again."
msgstr ""
"De resterende Samba configuratie beslaat parameters in /etc/samba/smb.conf, "
"het configuratiebestand dat gebruikt wordt voor de Samba programmas (nmbd en "
"smbd). Uw huidige smb.conf bevat een 'include' regel of een optie die "
"meerdere regels beslaat, dit kan debconf mogelijks in verwarring brenngen. "
"Indien debconf in verwarring raakt dient u uw smb.conf handmatig aan te "
"passen om samba terug werkend te krijgen."
#. Description
#: ../samba-common.templates:37
msgid ""
"If you don't use debconf to configure smb.conf, you will have to handle any "
"configuration changes yourself, and will not be able to take advantage of "
"periodic configuration enhancements.  Therefore, use of debconf is "
"recommended if possible."
msgstr ""
"Indien u geen gebruik maakt van debconf voor het beheer van smb.conf dient u "
"alle configuratie instellingen zelf te doen, en zult u geen voordeel halen "
"uit de periodieke configuratie verbeteringen. Het gebruik van debconf wordt "
"dan ook aangeraden. "
#. Description
#: ../samba-common.templates:52
msgid "Workgroup/Domain Name?"
msgstr "Werkgroep/Domeinnaam?"
#. Description
#: ../samba-common.templates:52
msgid ""
"This controls what workgroup your server will appear to be in when queried "
"by clients. Note that this parameter also controls the Domain name used with "
"the security=domain setting."
msgstr ""
"Dit bepaald van welke werkgroep uw server deel zal lijken uit te maken bij "
"het beantwoorden van vragen door clients. Merk op dat deze parameter ook de "
"domeinnaam die gebruikt wordt voor de security=domein instelling bepaald."
#. Description
#: ../samba-common.templates:60
msgid "Use password encryption?"
msgstr "Wachtwoord versleuteling gebruiken?"
#. Description
#: ../samba-common.templates:60
msgid ""
"Recent Windows clients communicate with SMB servers using encrypted "
"passwords. If you want to use clear text passwords you will need to change a "
"parameter in your Windows registry. It is recommended that you use encrypted "
"passwords. If you do, make sure you have a valid /etc/samba/smbpasswd file "
"and that you set passwords in there for each user using the smbpasswd "
"command."
msgstr ""
"Recente Windows clients maken gebruik van versleutelde wachtwoorden voor de "
"communicatie met SMB-servers. Indien u onversleutelde tekst  wachtwoorden "
"wilt gebruiken dient u een parameter te veranderen in de Windows registry. "
"Het gebruik van versleutelde wachtwoorden wordt aangeraden. Indien u dit "
"doet zorg er dan voor dat u een geldig /etc/samba/smbpasswd bestand heeft en "
"dat u de wachtwoorden daar voor elke gebruiker met behulp van smbpasswd "
"insteld. "
#. Description
#: ../samba.templates:4
msgid "Create samba password database, /var/lib/samba/passdb.tdb?"
msgstr "Samba wachtwoord database, /var/lib/samba/passdb.tdb, aanmaken?"
#. Description
#: ../samba.templates:4
msgid ""
"To be compatible with the defaults in most versions of Windows, Samba must "
"be configured to use encrypted passwords.  This requires user passwords to "
"be stored in a file separate from /etc/passwd. This file can be created "
"automatically, but the passwords must be added manually (by you or the user) "
"by running smbpasswd, and you must arrange to keep it up-to-date in the "
"future.  If you do not create it, you will have to reconfigure samba (and "
"probably your client machines) to use plaintext passwords. See /usr/share/"
"doc/samba-doc/htmldocs/ENCRYPTION.html from the samba-doc package for more "
"details."
msgstr ""
"Om compatibel te zijn met de standaard instellingen van de meeste "
"Windowsversies dient Samba gebruik te maken van versleutelde wachtwoorden. "
"Dit vereist dat de gebruikerswachtwoorden opgeslagen worden in een bestand "
"dat verschilt van /etc/passwd. Dit bestand kan automatisch aangemaakt "
"worden, maar de wachtwoorden dienen handmatig (door de gebuiker) toegevoegt "
"te worden met het smbpasswd commando. U dient dit bestand in de toekomst ook "
"aktueel te houden. Indien u dit bestand niet aanmaakt zult u samba (en naar "
"alle waarschijnlijkheid de client machines) moeten herconfigureren zodat "
"deze onversleutelde wachtwoorden gebruiken. Zie /usr/share/doc/samba-doc/"
"htmldocs/ENCRYPTION.html uit het samba-doc pakket voor meer details."
#. Description
#: ../samba.templates:17
msgid "Samba's log files have moved."
msgstr "Samba's log bestanden zijn verhuisd."
#. Description
#: ../samba.templates:17
msgid ""
"Starting with the first packages of Samba 2.2 for Debian the log files for "
"both Samba daemons (nmbd and smbd) are now stored in /var/log/samba/. The "
"names of the files are log.nmbd and log.smbd, for nmbd and smbd respectively."
msgstr ""
"Vanaf de eerste Debian pakketten vaan Samba versie 2.2 zijn de log bestanden "
"van beide Samba daemons (nmbd en smbd) opgeslagen in /var/log/samba/. De log "
"bestanden voor nmbd en smbd zijn, respectievelijk, log.nmbd en log.smbd."
#. Description
#: ../samba.templates:17
msgid ""
"The old log files that were in /var/log/ will be moved to the new location "
"for you."
msgstr ""
"De oude logbestanden in /var/log worden voor u naar de nieuwe locatie "
"verplaatst."
#. Description
#: ../samba.templates:28
msgid "Running nmbd from inetd is no longer supported"
msgstr "nmbd vanuit inetd draaien wordt niet langer ondersteund"
#. Description
#: ../samba.templates:28
msgid ""
"Your system was previously configured to start nmbd and smbd from inetd.  As "
"of version 2.999+3.0.alpha20-4, nmbd will no longer be started from inetd.  "
"If you have modified your /etc/init.d/samba startup script, you may need to "
"adjust it by hand now so that nmbd will start."
msgstr ""
"Uw systeem was geconfigureerd om nmbd en smbd vanuit inetd te starten. Vanaf "
"versie 2.999+3.0.alpha20-4 kan nmbd niet langer door inetd gestart worden. "
"Indien u uw /etc/init.d/samba startup-script aangepast had, dient u dit "
"mogelijks aan te passen opdat nmbd zou starten."
#. Choices
#: ../samba.templates:36
msgid "daemons, inetd"
msgstr "daemons, inetd"
#. Description
#: ../samba.templates:38
msgid "How do you want to run Samba?"
msgstr "Hoe wilt u Samba draaien?"
#. Description
#: ../samba.templates:38
msgid ""
"The Samba daemon smbd can run as a normal daemon or from inetd. Running as a "
"daemon is the recommended approach."
msgstr ""
"De Samba  daemon smbd kan als een normale daemon of via inetd draaien. Als "
"een daemon is de aangeraden aanpak."
#. Description
#: ../samba.templates:45
msgid "Move /etc/samba/smbpasswd to /var/lib/samba/passdb.tdb?"
msgstr "/etc/samba/smbpasswd verplaatsen naar /var/lib/samba/passdb.tdb?"
#. Description
#: ../samba.templates:45
msgid ""
"Samba 3.0 introduces a newer, more complete SAM database interface which "
"supersedes the /etc/samba/smbpasswd file.  Would you like your existing "
"smbpasswd file to be migrated to /var/lib/samba/passdb.tdb for you?  If you "
"plan to use another pdb backend (e.g., LDAP) instead, you should answer 'no' "
"here."
msgstr ""
"Samba 3.0 introduceert een nieuwe, meer complete SAM databaseinterface die "
"het /etc/samba/smbpasswd bestand overstijgt. \"Wilt u dat ik uw bestaand "
"smbpasswd bestand voor u naar /var/lib/samba/passdb.tdb migreer? Indien u "
"van plan bent om, in plaats hiervan, een ander pdb-backend (e.g. LDAP) te "
"gebruiken dient u hier 'nee' te antwoorden."
#. Description
#: ../swat.templates:3
msgid "Your smb.conf will be re-written!"
msgstr "Uw smb.conf wordt herschreven!"
#. Description
#: ../swat.templates:3
msgid ""
"SWAT will rewrite your smb.conf file. It will rearrange the entries and "
"delete all comments, include= and copy= options. If you have a carefully "
"crafted smb.conf then back it up or don't use SWAT!"
msgstr ""
"SWAT zal uw smb.conf bestand herschrijven. Het zal de ingangen anders "
"schikken en alle comments, include= en copy= opties verwijderen. Als u een, "
"met veel zorg, handmatig opgebouwd smb.conf bestand heeft, maak dan een "
"reservekopie of zie van het gebruik van SWAT af! "
							
							
								
							
							
						
@ -14,14 +14,14 @@
msgid ""
msgstr ""
"Project-Id-Version: samba_3.0.0beta2-1\n"
"POT-Creation-Date: 2003-07-02 21:50-0500\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-30 19:08-0500\n"
"PO-Revision-Date: 2003-07-02 21:56-0500\n"
"Last-Translator: Steve Langasek <vorlon@debian.org>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
"Report-Msgid-Bugs-To: \n"
#. Description
#: ../samba-common.templates:3
							
							
							
								
							
						
@ -39,10 +39,9 @@ msgid ""
msgstr ""
"Atualmente existe um \"conjunto de caracteres\" (\"character set\") "
"configurado em seu arquivo smb.conf. No Samba 3.0, esta opção foi "
"substituída por uma nova opção, \"unix charset\". Por favor especifique "
"o conjunto de caracteres a ser usado para essa nova opção, a qual "
"controla como o Samba interpreta nomes de arquivos no sistema de "
"arquivos."
"substituída por uma nova opção, \"unix charset\". Por favor especifique o "
"conjunto de caracteres a ser usado para essa nova opção, a qual controla "
"como o Samba interpreta nomes de arquivos no sistema de arquivos."
#. Description
#: ../samba-common.templates:3
							
								
							
							
							
						
							
							
								
							
							
						
@ -15,7 +15,8 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2003-07-02 21:50-0500\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-08-30 19:08-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
							
								
							
							
							
						
							
							
							
						
@ -1 +0,0 @@
usr/lib/python2.2/site-packages/
							
							
							
						
@ -0,0 +1 @@
usr/lib/python2.3/site-packages/
							
							
								
							
							
						
@ -41,7 +41,6 @@ endif
DESTDIR=`pwd`/debian/tmp
SWATDIR=`pwd`/debian/swat
SAMBABOOK=`pwd`/debian/swat
IVARS = BASEDIR=$(DESTDIR)/usr \
		prefix=$(DESTDIR)/usr \
							
							
							
								
							
						
@ -52,7 +51,6 @@ IVARS = BASEDIR=$(DESTDIR)/usr \
		VARDIR=$(DESTDIR)/var \
		INCLUDEDIR=$(DESTDIR)/usr/include \
		SWATDIR=$(SWATDIR)/usr/share/samba/swat \
		SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba \
		CODEPAGEDIR=$(DESTDIR)/usr/share/samba/ \
		PRIVATEDIR=$(DESTDIR)/etc/samba \
		CONFIGDIR=$(DESTDIR)/etc/samba
							
								
							
							
								
							
							
						
@ -92,7 +90,6 @@ configure-stamp:
		--with-smbmount \
		--with-pam \
		--with-syslog \
		--with-sambabook \
		--with-utmp \
		--with-readline \
		--with-pam_smbpass \
							
							
							
								
							
						
@ -103,7 +100,7 @@ configure-stamp:
		--with-acl-support \
		--with-tdbsam \
		--with-ldap \
		--with-python=python2.2)
		--with-python=python2.3)
	touch configure-stamp
							
								
							
							
								
							
							
						
@ -142,7 +139,7 @@ install: build
	         $(DESTDIR)/lib/security $(DESTDIR)/sbin \
	         $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
	         $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d \
	         $(DESTDIR)/usr/lib/python2.2/site-packages
	         $(DESTDIR)/usr/lib/python2.3/site-packages
	# Add here commands to install the package into debian/tmp.
	$(MAKE) -C source install $(IVARS)
							
								
							
							
								
							
							
						
@ -187,14 +184,6 @@ install: build
	#	Erich Schubert <debian@vitavonni.de> in #109509):
	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
	# To avoid duplication of a large number of files, the swat package
	#	does not contain the "Using Samba" book nor the HTML docs.
	#	Instead, these are provided by the samba-doc package and
	#	are accessed through symlinks provided in the swat package.
	#	Here we create the symlink for the book, and the symlinks
	#	for the HTML files are created by the script installswat.sh.
	ln -s ../../doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba
	# Install man pages for files without man pages in the upstream sources
	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
							
							
							
								
							
						
@ -217,7 +206,7 @@ install: build
	install -m755 debian/samba-common.dhcp $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d/samba
	# Install the Python modules
	cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.2/site-packages/
	cp source/build/lib.*/samba/*.so $(DESTDIR)/usr/lib/python2.3/site-packages/
	dh_movefiles
							
								
							
							
								
							
							
						
@ -262,7 +251,7 @@ binary-arch: build install
	dh_installdebconf
	dh_installdocs -A debian/README.build
	# dh_installexamples is not available in Debian Potato...
	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.2-samba source/python/examples/*
	[ -x /usr/bin/dh_installexamples ] && DH_OPTIONS= dh_installexamples -v -ppython2.3-samba source/python/examples/*
#	dh_installmenu
	# dh_installlogrotate is not available in Debian Potato...
	if [ -x /usr/bin/dh_installlogrotate ]; then \
							
								
							
							
							
						
							
							
							
						
@ -1,9 +1,7 @@
README
docs/Samba-HOWTO-Collection.pdf
docs/THANKS
docs/announce
docs/history
docs/textdocs/
docs/faq/
docs/htmldocs/
docs/Registry/
							
							
							
						
							
							
							
						
@ -1,5 +1,3 @@
auth 		required	pam_unix.so nullok
account		required	pam_unix.so
session		required	pam_unix.so
password	required	pam_unix.so
@include common-auth
@include common-account
@include common-session
							
							
							
						
							
							
								
							
							
						
@ -4,11 +4,23 @@
for patch in debian/patches/*.patch; do
	echo '->'`basename $patch`:
	patch -p1 < $patch
	patch -p1 --ignore-whitespace < $patch
done
cat debian/changelog | perl -pi -e '($version) = <STDIN> =~/\((.*)\)/; \
		s/\".*\"/\"$version for Debian\"/' source/include/version.h
# This code is currently not used because it creates a long version
# number string. For now we're sticking to <upstream version>-Debian,
# as in 3.0.0rc2-Debian. peloy@debian.org.-
# ---- Begin unused code ----
# Get Debian version number from 1st line of the Debian changelog
#DEBIAN_VERSION=`sed -n -e '1s/^.*(\(.*\)).*$/\1/p' debian/changelog`
# Insert Debian version number in source/VERSION, which will then be
# used to create source/include/version.h.
#TMPFILE=source/VERSION.debian
#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1\"Debian-${DEBIAN_VERSION}\"/"  source/VERSION > ${TMPFILE}
#mv -f ${TMPFILE} source/VERSION
# ---- End unused code ----
# Regenerate configure only if it is older than configure.in
[ source/configure -ot source/configure.in ] && (cd source && sh ./autogen.sh)
							
								
							
							
							
						
							
							
								
							
							
						
@ -5,10 +5,14 @@
# We want to reverse the patches in the opposite order we applied
#	them, hence the 'ls|sort -r'.
for patch in `ls debian/patches/*.patch | sort -r`; do
	patch -p1 -R < $patch
	patch -p1 -R --ignore-whitespace < $patch
done
perl -pi -e's/-.* for Debian//' source/include/version.h
# Unused code. See comment in the patch-source script.
#TMPFILE=source/VERSION.debian
#sed -e "s/^\(SAMBA_VERSION_VENDOR_SUFFIX=\).*$/\1/" source/VERSION > ${TMPFILE}
#mv -f ${TMPFILE} source/VERSION
# Regenerate configure only if it is older than configure.in
[ source/configure -ot source/configure.in ] && (cd source && autoheader && autoconf)
							
								
							
							
							
						
							
							
							
						
@ -1 +0,0 @@
swat/README