More Debian updates.

(This used to be commit 1f7de8c42e05c70cdb76c4f917b7ff128f5249e6)

19 files changed, 409 insertions, 262 deletions

diff --git a/packaging/Debian/README b/packaging/Debian/README
index c124ef01a5..64a505c8cb 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -44,7 +44,7 @@ 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.0beta1, but it can get
+  * The list above is current as of samba-3.0.0beta2, 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.
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream
index 764a042939..64a505c8cb 100644
--- a/packaging/Debian/debian/README.build-upstream
+++ b/packaging/Debian/debian/README.build-upstream
@@ -4,7 +4,7 @@ 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.0beta1, and should allow you to build Debian
+be current as of Samba 3.0beta2, and should allow you to build Debian
 packages for Debian unstable.
 
 We try to maintain as much compatibility with previous releases
@@ -44,7 +44,7 @@ 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.0beta1, but it can get
+  * The list above is current as of samba-3.0.0beta2, 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.
diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian
index 56361d3afb..3802e329e5 100644
--- a/packaging/Debian/debian/README.debian
+++ b/packaging/Debian/debian/README.debian
@@ -11,9 +11,9 @@ samba and sambades (merged together for longer than we can remember.)
 Contents of this README file:
 
 1. Notes
-2. Packages Generated from the Samba Sources
-3. Support for NT Domains
-4. Samba and LDAP
+2. Upgrading from Samba 2.2
+3. Packages Generated from the Samba Sources
+4. Support for NT Domains
 5. Reporting bugs
 
 
@@ -36,7 +36,45 @@ Contents of this README file:
   (/var/log/{nmb,smb} were moved to the new location.
 
 
-2. Packages Generated from the Samba Sources
+2. Upgrading from Samba 2.2
+---------------------------
+
+Samba 3.0 provides greatly improved support for modern Windows systems,
+including support for Unicode and LDAP.  In the process, Samba 3.0
+necessarily also breaks backward compatiblity with past releases.  These
+issues are documented herein; if you are aware of other problems related
+to upgrading from Samba 2.2, please let us know at
+<samba@packages.debian.org>.
+
+Samba and LDAP
+--------------
+Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with
+LDAP support.  However, the LDAP schema for Samba 3.0 differs
+substantially from the schema used by many sites with Samba 2.2 (not
+enabled in the Debian packages).  If upgrading from an LDAP-enabled 2.2,
+you will need to run the convertSambaAccount script found in
+/usr/share/doc/samba-doc/examples/LDAP.  A copy of the schema itself can
+also be found at /usr/share/doc/samba-doc/examples/LDAP/samba.schema.
+
+Character Sets
+--------------
+Samba 3.0 introduces support for negotiating Unicode (UCS-2LE) with
+Windows clients.  Owing to the close similarity between Windows and Unix
+NLS charsets, in the past, many users were able to pass filenames
+containing non-ASCII characters between clients and servers without
+configuring Samba to know what character set was in use.  Now, Samba
+must be able to convert Unix filenames to Unicode before sending to the
+client, so Samba must know what character set the filenames are being
+converted from.  If you will be sharing files with non-ASCII names, and
+the filenames are not encoded with UTF-8, you will need to tell Samba
+which character set to use with the 'unix charset' option.
+
+If you had previously specified 'character set' and 'client code page'
+options under 2.2, these settings should be automatically converted for
+you.
+
+
+3. Packages Generated from the Samba Sources
 --------------------------------------------
 
 Currently, the Samba sources produce the following binary packages:
@@ -66,7 +104,7 @@ with glibc2.1 get cleared out (the problem is with glibc, not with Samba
 itself).
 
 
-3. Support for NT Domains
+4. Support for NT Domains
 -------------------------
 
 Samba 2.2 includes preliminary support for NT domains. A Samba server
@@ -86,13 +124,6 @@ Please note that NT domain PDC support is far from complete and is still
 experimental.
 
 
-4. Samba and LDAP
------------------
-
-Starting with Samba 2.999+3.0cvs20020723-1 we are building Samba with
-ldapsam support.
-
-
 5. Reporting Bugs
 -----------------
 
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index 8c1d9b594d..ad556c0d8c 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,16 +1,64 @@
-samba (3.0.0beta2-0.1) unstable; urgency=low
-
-  * Local build.
-
- -- Debian User <somebody@somewhere.net>  Wed,  2 Jul 2003 22:41:33 -0400
+samba (3.0.0beta2-1) unstable; urgency=low
+
+  * New upstream release
+    - The smb.conf(5) manpage documents config options again
+      (closes: #197963).
+    - Handling of winbind/idmap has been restructured; domain members
+      should be able to map domain accounts to local accounts again
+      (closes: #196815).
+    - Use the locale charset for 'display charset' by default
+      (closes: #194406).
+    - Fix for segfault in smbclient when using the -b option
+      (closes: #196833).
+    - Handle an empty 'passdb backend' list gracefully (closes: #193946).
+  * Don't set 'display charset' anymore on upgrade, since this is now
+    grabbed from the locale by default -- a much better option.
+
+ -- Steve Langasek <vorlon@debian.org>  Wed,  2 Jul 2003 20:59:09 -0500
+
+samba (3.0.0beta1-2) unstable; urgency=low
+
+  * Update build-deps to libacl1-dev (>= 2.2.11-1), libacl1 (>= 2.2.11-1)
+    to make sure we get the right shlib dependencies (closes: #193149).
+  * Update the dhcp config hooks so they're suitable for sourcing (i.e.,
+    don't call "exit") (closes: #196477).
+  * Bring package into line with current policy by adding support for
+    the DEB_BUILD_OPTIONS flag, and enabling debugging symbols (-gstabs)
+    by default
+  * Make sure libpam-smbpass is a self-contained DSO.
+  * Fix a typo in samba-common.dhcp that caused us to spuriously rewrite
+    the server list.
+  * Fix python install script to ignore -Wl linker flags, as seen in the
+    output from the latest krb5-config.
+  * Add LDAP and Unicode information about upgrading from 2.2 to
+    README.debian.
+  * Remove dangerous and confusing browse options from the default 
+    smb.conf (closes: #198804).
+  * Reorder smb.conf options for clearer grouping, and clarify the
+    comments.
+  * Add a default [print$] share to the sample smb.conf, and create the
+    necessary tree under /var/lib/samba/printers. (closes: #168173)
+  * s/winbind/idmap/ in smb.conf, since the option names have changed.
+  * Fix the patch for postexec handling, so that we chdir("/") at the
+    right time.
+
+ -- Steve Langasek <vorlon@debian.org>  Thu, 12 Jun 2003 15:02:00 -0500
 
 samba (3.0.0beta1-1) unstable; urgency=low
 
   * New upstream version.
+    - fix for empty browselist bug (closes: #194553)
+    - fix for tab completion segfault in smbclient (closes: #194776)
+    - Samba now works as a domain member again without segfaulting
+      (closes: #194134, #194394, #194775)
+    - WinXP machines can join a Samba-controlled domain again
+      (closes: #195362)
   * Build-depend on python-dev >= 2.2 instead of on just python-dev
     (without version).
+  * Added Vorlon'n patch to source/lib/time.c to fix #194075.
+    (closes: #194075)
 
- -- Eloy A. Paris <peloy@debian.org>  Sun,  8 Jun 2003 14:35:25 -0400
+ -- Eloy A. Paris <peloy@debian.org>  Sun,  8 Jun 2003 22:26:43 -0400
 
 samba (2.999+3.0.alpha24-3) unstable; urgency=low
 
diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control
index 74f60c3213..0713080143 100644
--- a/packaging/Debian/debian/control
+++ b/packaging/Debian/debian/control
@@ -3,8 +3,8 @@ 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 | acl-dev (>= 2.0.0), libkrb5-dev, libldap2-dev, po-debconf, python-dev (>= 2.2)
-Standards-Version: 3.1.1
+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)
+Standards-Version: 3.5.10
 
 Package: samba
 Architecture: any
diff --git a/packaging/Debian/debian/patches/pam_smbpass_linkage.patch b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
new file mode 100644
index 0000000000..3d1fab8ab0
--- /dev/null
+++ b/packaging/Debian/debian/patches/pam_smbpass_linkage.patch
@@ -0,0 +1,26 @@
+diff -ur samba-3.0.0beta1.orig/source/Makefile.in samba-3.0.0beta1/source/Makefile.in
+--- samba-3.0.0beta1.orig/source/Makefile.in	2003-06-16 23:59:19.000000000 -0500
++++ samba-3.0.0beta1/source/Makefile.in	2003-06-17 00:13:50.000000000 -0500
+@@ -582,9 +582,9 @@
+ 
+ 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) $(IDMAP_OBJ)
++               $(LIBSAMBA_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(PASSDB_OBJ) \
++               $(GROUPDB_OBJ) $(SECRETS_OBJ) $(UBIQX_OBJ) $(IDMAP_OBJ) \
++               $(SMBLDAP_OBJ)
+ 
+ PAM_SMBPASS_PICOOBJ = $(PAM_SMBPASS_OBJ_0:.o=.po)
+ 
+@@ -1080,7 +1080,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) 
diff --git a/packaging/Debian/debian/patches/python-linker.patch b/packaging/Debian/debian/patches/python-linker.patch
new file mode 100644
index 0000000000..1cbf4b7c2c
--- /dev/null
+++ b/packaging/Debian/debian/patches/python-linker.patch
@@ -0,0 +1,13 @@
+diff -ur samba-3.0.0beta1.orig/source/python/setup.py samba-3.0.0beta1/source/python/setup.py
+--- samba-3.0.0beta1.orig/source/python/setup.py	2003-06-07 12:57:36.000000000 -0500
++++ samba-3.0.0beta1/source/python/setup.py	2003-06-19 17:26:48.000000000 -0500
+@@ -57,6 +57,9 @@
+     if lib[0:2] == "-L":
+         library_dirs.append(lib[2:])
+         continue
++    if lib[0:4] == "-Wl,":
++        print "Ignoring linker flag '%s' in $LIBS variable passed to setup.py" % lib
++        continue
+     print "Unknown entry '%s' in $LIBS variable passed to setup.py" % lib
+     sys.exit(1)
+ 
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
index 8dcfac5e65..3925081735 100644
--- a/packaging/Debian/debian/patches/samba.patch
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -1,6 +1,6 @@
-diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source/client/smbmount.c
---- samba-3.0alpha23.orig/source/client/smbmount.c	2003-03-30 20:28:28.000000000 -0600
-+++ samba-3.0alpha23/source/client/smbmount.c	2003-04-04 21:05:58.000000000 -0600
+diff -uNr samba-3.0.0beta1.orig/source/client/smbmount.c samba-3.0.0beta1/source/client/smbmount.c
+--- samba-3.0.0beta1.orig/source/client/smbmount.c	2003-06-07 12:57:32.000000000 -0500
++++ samba-3.0.0beta1/source/client/smbmount.c	2003-06-30 20:12:22.000000000 -0500
 @@ -765,7 +765,7 @@
  					*lp = 0;
  					pstrcpy(password,lp+1);
@@ -28,9 +28,9 @@ diff -uNr samba-3.0alpha23.orig/source/client/smbmount.c samba-3.0alpha23/source
  		}
  		strupper(username);
  	}
-diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/source/script/installbin.sh
---- samba-3.0alpha23.orig/source/script/installbin.sh	2002-04-22 13:16:20.000000000 -0500
-+++ samba-3.0alpha23/source/script/installbin.sh	2003-04-04 21:05:58.000000000 -0600
+diff -uNr samba-3.0.0beta1.orig/source/script/installbin.sh samba-3.0.0beta1/source/script/installbin.sh
+--- samba-3.0.0beta1.orig/source/script/installbin.sh	2002-04-22 13:16:20.000000000 -0500
++++ samba-3.0.0beta1/source/script/installbin.sh	2003-06-30 20:12:22.000000000 -0500
 @@ -22,9 +22,11 @@
   chmod $INSTALLPERMS $BINDIR/$p2
  
@@ -46,27 +46,31 @@ diff -uNr samba-3.0alpha23.orig/source/script/installbin.sh samba-3.0alpha23/sou
  done
  
  
-diff -uNr samba-3.0alpha23.orig/source/smbd/service.c samba-3.0alpha23/source/smbd/service.c
---- samba-3.0alpha23.orig/source/smbd/service.c	2003-03-30 20:28:31.000000000 -0600
-+++ samba-3.0alpha23/source/smbd/service.c	2003-04-04 21:05:58.000000000 -0600
-@@ -890,6 +890,14 @@
- 		change_to_root_user();
- 	}
+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 @@
+ 	file_close_conn(conn);
+ 	dptr_closecnum(conn);
  
-+	/* If our root postexec command includes a call to 'unmount', we want
-+	   to make sure we aren't blocking the mount point. */
-+	/* I think this patch should go here, but I am not sure since
-+	   the code looks very different than in Samba 2.2.2. Will come
-+	   back later; should check what change_to_root_user() does. Eloy.-
-+	vfs_ChDir(conn,"/");
-+	/*
++	/* make sure we leave the directory available for unmount */
++	vfs_ChDir(conn, "/");
 +
- 	change_to_root_user();
- 	/* execute any "root postexec = " line */
- 	if (*lp_rootpostexec(SNUM(conn)))  {
-diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/source/smbwrapper/smbsh.c
---- samba-3.0alpha23.orig/source/smbwrapper/smbsh.c	2003-03-30 20:28:31.000000000 -0600
-+++ samba-3.0alpha23/source/smbwrapper/smbsh.c	2003-04-04 21:05:58.000000000 -0600
+ 	/* execute any "postexec = " line */
+ 	if (*lp_postexec(SNUM(conn)) && 
+ 	    change_to_user(conn, vuid))  {
+@@ -899,8 +902,5 @@
+ 		smbrun(cmd,NULL);
+ 	}
+ 
+-	/* make sure we leave the directory available for unmount */
+-	vfs_ChDir(conn, "/");
+-
+ 	conn_free(conn);
+ }
+diff -uNr samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c samba-3.0.0beta1/source/smbwrapper/smbsh.c
+--- samba-3.0.0beta1.orig/source/smbwrapper/smbsh.c	2003-06-07 12:57:40.000000000 -0500
++++ samba-3.0.0beta1/source/smbwrapper/smbsh.c	2003-06-30 20:12:22.000000000 -0500
 @@ -36,7 +36,7 @@
  int main(int argc, char *argv[])
  {
@@ -76,9 +80,9 @@ diff -uNr samba-3.0alpha23.orig/source/smbwrapper/smbsh.c samba-3.0alpha23/sourc
  	pstring line, wd;
  	int opt;
  	extern char *optarg;
-diff -uNr samba-3.0alpha23.orig/source/web/diagnose.c samba-3.0alpha23/source/web/diagnose.c
---- samba-3.0alpha23.orig/source/web/diagnose.c	2003-01-18 13:03:58.000000000 -0600
-+++ samba-3.0alpha23/source/web/diagnose.c	2003-04-04 21:05:58.000000000 -0600
+diff -uNr samba-3.0.0beta1.orig/source/web/diagnose.c samba-3.0.0beta1/source/web/diagnose.c
+--- samba-3.0.0beta1.orig/source/web/diagnose.c	2003-06-07 12:57:41.000000000 -0500
++++ samba-3.0.0beta1/source/web/diagnose.c	2003-06-30 20:12:22.000000000 -0500
 @@ -70,6 +70,7 @@
  	static struct cli_state cli;
  	extern struct in_addr loopback_ip;
diff --git a/packaging/Debian/debian/po/es.po b/packaging/Debian/debian/po/es.po
index 22f4fe58b0..1c5854b480 100644
--- a/packaging/Debian/debian/po/es.po
+++ b/packaging/Debian/debian/po/es.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 2.999+3.0.alpha21-4\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-03-09 20:27-0600\n"
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-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
@@ -32,18 +33,15 @@ msgstr "Juego de caracteres para el sistema de ficheros Unix"
 #: ../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 two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"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 ""
 "Actualmente hay una opción de \"character set\" en smb.conf.  En Samba 3.0 "
-"esta opción ha sido reemplazado por dos opciones nuevas: \"unix charset\" y "
-"\"display charset\".  Por favor, indique el juego de caracteres que desea "
-"usar para estas opciones nuevas, que controlan cómo Samba interpretará los "
-"nombres en el sistema de ficheros y también cómo smbclient los interpretará "
-"al conectarse a un servidor de ficheros."
+"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."
 
 #. Description
 #: ../samba-common.templates:3
@@ -51,12 +49,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed."
 msgstr "Si deja en blanco este campo, no se cambiará smb.conf."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Juego de caracteres para los clientes DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../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 "
@@ -73,13 +71,13 @@ msgstr ""
 "cambiará smb.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 "¿Modificar smb.conf para usar la configuración WINS que proviene de DHCP?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../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 "
@@ -94,7 +92,7 @@ msgstr ""
 "de /etc/samba/dhcp.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
@@ -102,12 +100,12 @@ msgstr ""
 "Hay que instalar el paquete dhcp3-client para aprovechar esta funcionalidad."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "¿Configurar smb.conf mediante debconf?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -123,7 +121,7 @@ msgstr ""
 "arregle a mano."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -136,12 +134,12 @@ msgstr ""
 "sea posible."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Nombre del dominio o del grupo de trabajo"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../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 "
@@ -152,12 +150,12 @@ msgstr ""
 "de dominio que se usa con la configuración security=domain."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "¿Utilizar contraseñas cifradas?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../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 "
diff --git a/packaging/Debian/debian/po/fr.po b/packaging/Debian/debian/po/fr.po
index bb8cf41e35..130a92ee11 100644
--- a/packaging/Debian/debian/po/fr.po
+++ b/packaging/Debian/debian/po/fr.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Samba for Debian 2.999+3.0.alpha23-1\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-04-19 08:28-0100\n"
-"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Project-Id-Version: Samba for Debian 3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-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
@@ -31,20 +32,15 @@ msgstr "Jeu de caractères pour les systèmes de fichiers Unix"
 #: ../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 two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"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 ""
 "Une instruction « character set » (jeu de caractères) est utilisée dans "
-"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par deux "
-"nouvelles options, « unix charset » (jeu de caractères Unix) et « display "
-"charset » (jeu de caractères à l'affichage). Veuillez indiquer le jeu de "
-"caractères que vous voulez utiliser avec chacune de ces deux options. La "
-"première permet d'interpréter les noms de fichiers sur le système et la "
-"seconde permet à smbclient d'interpréter ces noms lors d'une connexion à un "
-"serveur de fichiers."
+"votre fichier smb.conf. Avec Samba 3.0, cette option est remplacée par une "
+"nouvelle option, « unix charset » (jeu de caractères Unix).  Veuillez "
+"indiquer le jeu de caractères que vous voulez utiliser avec cette option, "
+"qui permet d'interpréter les noms de fichiers sur le système."
 
 #. Description
 #: ../samba-common.templates:3
@@ -54,12 +50,12 @@ msgstr ""
 "réponse."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Jeu de caractères pour les clients DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../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 "
@@ -78,12 +74,12 @@ msgstr ""
 "sans réponse. "
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modifier smb.conf pour utiliser les paramètres WINS fournis par DHCP ?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../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 "
@@ -98,19 +94,19 @@ msgstr ""
 "serveur DHCP soient lus dans /etc/samba/dhcp.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
 msgstr "Pour cela, le paquet dhcp3-client doit être installé."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "Voulez-vous configurer smb.conf avec debconf ?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -125,7 +121,7 @@ msgstr ""
 "il vaut mieux gérer manuellement le contenu de ce fichier."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -138,12 +134,12 @@ msgstr ""
 "est conseillé d'utiliser debconf."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Groupe de travail et nom de domaine ?"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../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 "
@@ -154,12 +150,12 @@ msgstr ""
 "« security=domain »."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "Voulez-vous chiffrer les mots de passe ?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../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 "
diff --git a/packaging/Debian/debian/po/pt_BR.po b/packaging/Debian/debian/po/pt_BR.po
index a6f02f7706..63ffd9a983 100644
--- a/packaging/Debian/debian/po/pt_BR.po
+++ b/packaging/Debian/debian/po/pt_BR.po
@@ -13,14 +13,15 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: samba_2.999+3.0.alpha20-4\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
-"PO-Revision-Date: 2003-04-05 13:30-0300\n"
-"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
+"Project-Id-Version: samba_3.0.0beta2-1\n"
+"POT-Creation-Date: 2003-07-02 21:50-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
@@ -29,21 +30,19 @@ msgstr "Conjunto de caracteres para sistema de arquivos Unix"
 
 #. Description
 #: ../samba-common.templates:3
+#, fuzzy
 msgid ""
 "You currently have a \"character set\" configured in your smb.conf.  In "
-"Samba 3.0, this option is replaced by two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"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 ""
 "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 duas novas opções, \"unix charset\" e \"display charset\". "
-"Por favor especifique o conjunto de caracteres a ser usado para essas novas "
-"opções, as quais controlam como o Samba interpreta nomes de arquivos no "
-"sistema de arquivos e como o smbclient irá interpretar esses nomes quando "
-"você se conectar a um servidor de arquivos, respectivamente."
+"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
@@ -53,12 +52,12 @@ msgstr ""
 "modificado."
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr "Conjunto de caracteres para clientes DOS"
 
 #. Description
-#: ../samba-common.templates:15
+#: ../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 "
@@ -76,12 +75,12 @@ msgstr ""
 "será modificado."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr "Modificar smb.conf para usar configurações WINS fornecidas via DHCP ?"
 
 #. Description
-#: ../samba-common.templates:26
+#: ../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 "
@@ -97,7 +96,7 @@ msgstr ""
 "arquivo smb.conf."
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
@@ -106,12 +105,12 @@ msgstr ""
 "recurso."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr "Configurar smb.conf através do debconf ?"
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -127,7 +126,7 @@ msgstr ""
 "lo funcional novamente."
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -140,12 +139,12 @@ msgstr ""
 "Por esse motivo, é recomendado usar o debconf, caso seja possível."
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr "Nome de Domínio/Grupo de Trabalho ?"
 
 #. Description
-#: ../samba-common.templates:54
+#: ../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 "
@@ -157,12 +156,12 @@ msgstr ""
 "security=domain."
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr "Usar encriptação de senhas ?"
 
 #. Description
-#: ../samba-common.templates:62
+#: ../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 "
diff --git a/packaging/Debian/debian/po/templates.pot b/packaging/Debian/debian/po/templates.pot
index 4798ca9cfa..b636ba2e48 100644
--- a/packaging/Debian/debian/po/templates.pot
+++ b/packaging/Debian/debian/po/templates.pot
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2003-04-30 13:11-0500\n"
+"POT-Creation-Date: 2003-07-02 21:50-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"
@@ -32,11 +32,9 @@ msgstr ""
 #: ../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 two new options, \"unix charset\" and "
-"\"display charset\".  Please specify the character set you wish to use for "
-"these new options, which control how Samba interprets filenames on the file "
-"system and how smbclient will interpret these names when you connect to a "
-"file server."
+"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 ""
 
 #. Description
@@ -45,12 +43,12 @@ msgid "If you leave this option blank, your smb.conf will not be changed."
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:15
+#: ../samba-common.templates:13
 msgid "Character Set for DOS clients"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:15
+#: ../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 "
@@ -61,12 +59,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid "Modify smb.conf to use WINS settings from DHCP?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../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 "
@@ -76,19 +74,19 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:26
+#: ../samba-common.templates:24
 msgid ""
 "You must have the dhcp3-client package installed to take advantage of this "
 "feature."
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../samba-common.templates:37
 msgid "Configure smb.conf through debconf?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -98,7 +96,7 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:39
+#: ../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 "
@@ -107,12 +105,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:54
+#: ../samba-common.templates:52
 msgid "Workgroup/Domain Name?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:54
+#: ../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 "
@@ -120,12 +118,12 @@ msgid ""
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:62
+#: ../samba-common.templates:60
 msgid "Use password encryption?"
 msgstr ""
 
 #. Description
-#: ../samba-common.templates:62
+#: ../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 "
diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules
index 4cef604f8e..a8c83529a4 100755
--- a/packaging/Debian/debian/rules
+++ b/packaging/Debian/debian/rules
@@ -23,6 +23,22 @@ DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
 
+
+# Support the DEB_BUILD_OPTIONS variable
+CFLAGS = -gstabs -Wall
+INSTALL = install
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  CFLAGS += -O0
+else
+  CFLAGS += -O2
+endif
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+  INSTALL += -s
+endif
+
+
 DESTDIR=`pwd`/debian/tmp
 SWATDIR=`pwd`/debian/swat
 SAMBABOOK=`pwd`/debian/swat
@@ -60,7 +76,7 @@ configure-stamp:
 		cp -f debian/config.cache source/config.cache; \
 	fi
 
-	[ -f source/Makefile ] || (cd source && ./configure \
+	[ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure \
 		--host=$(DEB_HOST_GNU_TYPE) \
 		--build=$(DEB_BUILD_GNU_TYPE) \
 		--cache-file=./config.cache \
diff --git a/packaging/Debian/debian/samba-common.config b/packaging/Debian/debian/samba-common.config
index b5ab6e81d5..ed76b95cb8 100644
--- a/packaging/Debian/debian/samba-common.config
+++ b/packaging/Debian/debian/samba-common.config
@@ -78,7 +78,6 @@ if [ -f $FILE ]; then
 
 	CHARSET=`smbconf_retr "character set"`
 	CODEPAGE=`smbconf_retr "client code page"`
-	DISPLAYCHARSET=`smbconf_retr "display charset"`
 	UNIXCHARSET=`smbconf_retr "unix charset"`
 	DOSCHARSET=`smbconf_retr "dos charset"`
 
@@ -110,10 +109,10 @@ db_input medium samba-common/encrypt_passwords || true
 db_go
 
 # Handle migrating character sets
-if [ -n "$CHARSET" -a -z "$DISPLAYCHARSET" -a -z "$UNIXCHARSET" ]
+if [ -n "$CHARSET" -a -z "$UNIXCHARSET" ]
 then
-	DISPLAYCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'`
-	db_set samba-common/character_set "$DISPLAYCHARSET"
+	UNIXCHARSET=`echo $CHARSET | sed -e's/iso-/ISO/i'`
+	db_set samba-common/character_set "$UNIXCHARSET"
 	# FIXME: should eventually be low.
 	db_input medium samba-common/character_set || true
 	db_go
diff --git a/packaging/Debian/debian/samba-common.dhcp b/packaging/Debian/debian/samba-common.dhcp
index 0ec8a0ff80..3b2fa4ba19 100644
--- a/packaging/Debian/debian/samba-common.dhcp
+++ b/packaging/Debian/debian/samba-common.dhcp
@@ -1,29 +1,34 @@
 #!/bin/sh
 
-# No need to continue if we're called with an unsupported option
+netbios_setup() {
+	# No need to continue if we're called with an unsupported option
 
-if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
-   && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
-   && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
-then
-	exit 0
-fi
+	if [ "$reason" != BOUND ] && [ "$reason" != RENEW ] \
+	   && [ "$reason" != REBIND ] && [ "$reason" != REBOOT ] \
+	   && [ "$reason" != EXPIRE ] && [ "$reason" != FAIL ]
+	then
+		return
+	fi
 
-umask 022
+	umask 022
 
-if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \
-   || [ "$reason" = EXPIRE ]
-then
-	# FIXME: add sed magic to only remove wins servers
-	# associated with this interface
-	echo -n > /etc/samba/dhcp.conf
-elif [ "$new_netbios_name_servers" != "old_netbios_name_servers" ]
-then
-	for server in $new_netbios_name_servers
-	do
-		serverlist="$serverlist $interface:$server"
-	done
-	# FIXME: add sed magic to only update wins servers
-	# associated with this interface
-	echo "   wins server =$serverlist" > /etc/samba/dhcp.conf
-fi
+	if [ -z "$new_netbios_name_servers" ] || [ "$reason" = FAIL ] \
+	   || [ "$reason" = EXPIRE ]
+	then
+		# FIXME: add sed magic to only remove wins servers
+		# associated with this interface
+		echo -n > /etc/samba/dhcp.conf
+	elif [ "$new_netbios_name_servers" != "$old_netbios_name_servers" ]
+	then
+		local serverlist=""
+		for server in $new_netbios_name_servers
+		do
+			serverlist="$serverlist $interface:$server"
+		done
+		# FIXME: add sed magic to only update wins servers
+		# associated with this interface
+		echo "   wins server =$serverlist" > /etc/samba/dhcp.conf
+	fi
+}
+
+netbios_setup
diff --git a/packaging/Debian/debian/samba-common.postinst b/packaging/Debian/debian/samba-common.postinst
index cda437b60c..6c6eb9bf53 100644
--- a/packaging/Debian/debian/samba-common.postinst
+++ b/packaging/Debian/debian/samba-common.postinst
@@ -79,15 +79,14 @@ if [ "${RET}" = "true" ]; then
 	if ! grep -q "^[[:space:]]*unix charset[[:space:]]*=" /etc/samba/smb.conf
 	then
 		db_get samba-common/character_set || true
-		DISPLAYCHARSET="${RET}"
-		if [ -n "$DISPLAYCHARSET" ]
+		UNIXCHARSET="${RET}"
+		if [ -n "$UNIXCHARSET" ]
 		then
 			sed -e "s/^\([[:space:]]*\)\[global\]/\1\[global\]/i
 				s/^\([[:space:]]*\)character set/\1character set/i
 				/^[[:space:]]*\[global\]/,/^[[:space:]]*\[/ {
 					/^[[:space:]]*character set[[:space:]]*=/c \\
-   display charset = $DISPLAYCHARSET\\
-   unix charset = $DISPLAYCHARSET
+   unix charset = $UNIXCHARSET
 				}" < /etc/samba/smb.conf > ${TMPFILE}
 			mv -f ${TMPFILE} /etc/samba/smb.conf
 		fi
diff --git a/packaging/Debian/debian/samba-common.templates b/packaging/Debian/debian/samba-common.templates
index 83621408df..e5f7b1ae0c 100644
--- a/packaging/Debian/debian/samba-common.templates
+++ b/packaging/Debian/debian/samba-common.templates
@@ -2,11 +2,9 @@ Template: samba-common/character_set
 Type: string
 _Description: Character Set for Unix filesystem
  You currently have a "character set" configured in your smb.conf.  In
- Samba 3.0, this option is replaced by two new options, "unix charset" and
- "display charset".  Please specify the character set you wish to use for
- these new options, which control how Samba interprets filenames on the
- file system and how smbclient will interpret these names when you connect
- to a file server.
+ 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.
  .
  If you leave this option blank, your smb.conf will not be changed.
 
diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs
index 06a2fb2484..a58e4e9892 100644
--- a/packaging/Debian/debian/samba.dirs
+++ b/packaging/Debian/debian/samba.dirs
@@ -1,6 +1,7 @@
 usr/bin
 usr/sbin
 var/log/samba
-var/lib/samba
+var/lib/samba/printers/W32X86
+var/lib/samba/printers/WIN40
 var/run/samba
 var/cache/samba
diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf
index fac9bee8ca..6d8852958b 100644
--- a/packaging/Debian/debian/smb.conf
+++ b/packaging/Debian/debian/smb.conf
@@ -21,27 +21,31 @@
 
 [global]
 
-# Change this for the workgroup/NT-domain name your Samba server will part of
+## Browsing/Identification ###
+
+# Change this to the workgroup/NT-domain name your Samba server will part of
    workgroup = DEBIAN_FANS
 
 # server string is the equivalent of the NT Description field
    server string = %h server (Samba %v)
 
-# If you want to automatically load your printer list rather
-# than setting them up individually then you'll need this
-;   load printers = yes
+# Windows Internet Name Serving Support Section:
+# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
+;   wins support = no
 
-# lpr(ng) printing. You may wish to override the location of the
-# printcap file
-;   printing = bsd
-;   printcap name = /etc/printcap
+# WINS Server - Tells the NMBD components of Samba to be a WINS Client
+# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
+;   wins server = w.x.y.z
 
-# cups printing.  See also the cupsaddsmb(8) manpage
-;   printing = cups
-;   printcap name = cups
+# This will prevent nmbd to search for NetBIOS names through DNS.
+   dns proxy = no
+
+# What naming service and in what order should we use to resolve host names
+# to IP addresses
+;   name resolve order = lmhosts host wins bcast
 
-;   guest account = nobody
-   invalid users = root
+
+#### Debugging/Accounting ####
 
 # This tells Samba to use a separate log file for each machine
 # that connects
@@ -50,16 +54,21 @@
 # Put a capping on the size of the log files (in Kb).
    max log size = 1000
 
-# If you want Samba to log though syslog only then set the following
-# parameter to 'yes'. Please note that logging through syslog in
-# Samba is still experimental.
+# If you want Samba to only log through syslog then set the following
+# parameter to 'yes'.
 ;   syslog only = no
 
 # We want Samba to log a minimum amount of information to syslog. Everything
-# should go to /var/log/samba/log.{smb,nmb} instead. If you want to log
+# should go to /var/log/samba/log.{smbd,nmbd} instead. If you want to log
 # through syslog you should set the following parameter to something higher.
    syslog = 0
 
+# Do something sensible when Samba crashes: mail the admin a backtrace
+   panic action = /usr/share/samba/panic-action %d
+
+
+####### Authentication #######
+
 # "security = user" is always a good idea. This will require a Unix account
 # in this server for every user accessing the server. See
 # security_level.txt for details.
@@ -74,94 +83,88 @@
 # password database type you are using.  
    passdb backend = tdbsam guest
 
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting
-;   include = /home/samba/etc/smb.conf.%m
+   obey pam restrictions = yes
 
-# Most people will find that this option gives better performance.
-# See speed.txt and the manual pages for details
-# You may want to add the following on a Linux system:
-#         SO_RCVBUF=8192 SO_SNDBUF=8192
-   socket options = TCP_NODELAY
+;   guest account = nobody
+   invalid users = root
 
-# --- Browser Control Options ---
+# This boolean parameter controls whether Samba attempts to sync the Unix
+# password with the SMB password when the encrypted SMB password in the
+# passdb is changed.
+;   unix password sync = no
 
-# Please _read_ BROWSING.txt and set the next four parameters according
-# to your network setup. The defaults are specified below (commented
-# out.) It's important that you read BROWSING.txt so you don't break
-# browsing in your network!
+# For Unix password sync to work on a Debian GNU/Linux system, the following
+# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for
+# sending the correct chat script for the passwd program in Debian Potato).
+   passwd program = /usr/bin/passwd %u
+   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n .
 
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = yes
+# This boolean controls whether PAM will be used for password changes
+# when requested by an SMB client instead of the program listed in
+# 'passwd program'. The default is 'no'.
+;   pam password change = no
 
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 20
 
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = auto
+########## Printing ##########
 
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = auto
+# If you want to automatically load your printer list rather
+# than setting them up individually then you'll need this
+;   load printers = yes
 
-# --- End of Browser Control Options ---
+# lpr(ng) printing. You may wish to override the location of the
+# printcap file
+;   printing = bsd
+;   printcap name = /etc/printcap
 
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = no
+# CUPS printing.  See also the cupsaddsmb(8) manpage in the
+# cupsys-client package.
+;   printing = cups
+;   printcap name = cups
 
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-# Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
+# When using [print$], root is implicitly a 'printer admin', but you can
+# also give this right to other users to add drivers and set printer
+# properties
+;   printer admin = @ntadmin
 
-# This will prevent nmbd to search for NetBIOS names through DNS.
-   dns proxy = no
 
-# What naming service and in what order should we use to resolve host names
-# to IP addresses
-;   name resolve order = lmhosts host wins bcast
+######## File sharing ########
 
 # Name mangling options
 ;   preserve case = yes
 ;   short preserve case = yes
 
-# This boolean parameter controlls whether Samba attempts to sync. the Unix
-# password with the SMB password when the encrypted SMB password in the
-# /etc/samba/smbpasswd file is changed.
-;   unix password sync = false
 
-# For Unix password sync. to work on a Debian GNU/Linux system, the following
-# parameters must be set (thanks to Augustin Luton <aluton@hybrigenics.fr> for
-# sending the correct chat script for the passwd program in Debian Potato).
-   passwd program = /usr/bin/passwd %u
-   passwd chat = *Enter\snew\sUNIX\spassword:* %n\n *Retype\snew\sUNIX\spassword:* %n\n .
+############ Misc ############
 
-# This boolean controls whether PAM will be used for password changes
-# when requested by an SMB client instead of the program listed in
-# 'passwd program'. The default is 'no'.
-;   pam password change = no
+# Using the following line enables you to customise your configuration
+# on a per machine basis. The %m gets replaced with the netbios name
+# of the machine that is connecting
+;   include = /home/samba/etc/smb.conf.%m
+
+# Most people will find that this option gives better performance.
+# See smb.conf(5) and /usr/share/doc/samba-doc/htmldocs/speed.html
+# for details
+# You may want to add the following on a Linux system:
+#         SO_RCVBUF=8192 SO_SNDBUF=8192
+   socket options = TCP_NODELAY
 
 # The following parameter is useful only if you have the linpopup package
 # installed. The samba maintainer and the linpopup maintainer are
 # working to ease installation and configuration of linpopup and samba.
 ;   message command = /bin/sh -c '/usr/bin/linpopup "%f" "%m" %s; rm %s' &
 
-   obey pam restrictions = yes
+
+# Domain Master specifies Samba to be the Domain Master Browser. If this
+# machine will be configured as a BDC (a secondary logon server), you
+# must set this to 'no'; otherwise, the default behavior is recommended.
+;   domain master = auto
 
 # Some defaults for winbind (make sure you're not using the ranges
 # for something else.)
-;   winbind uid = 10000-20000
-;   winbind gid = 10000-20000
+;   idmap uid = 10000-20000
+;   idmap gid = 10000-20000
 ;   template shell = /bin/bash
 
-# Do something sensible when Samba crashes: mail the admin a backtrace
-   panic action = /usr/share/samba/panic-action %d
-
 #======================= Share Definitions =======================
 
 [homes]
@@ -198,6 +201,19 @@
    writable = no
    create mode = 0700
 
+# Windows clients look for this share name as a source of downloadable
+# printer drivers
+[print$]
+   comment = Printer Drivers
+   path = /var/lib/samba/printers
+   browseable = yes
+   read only = yes
+   guest ok = no
+# Uncomment to allow remote administration of Windows print drivers.
+# Replace 'ntadmin' with the name of the group your admin users are
+# members of.
+;   write list = root, @ntadmin
+
 # A sample share for sharing your CD-ROM with others.
 ;[cdrom]
 ;   comment = Samba server's CD-ROM