merge from 2.2

(This used to be commit 473a89cde2e60c359cb435c714dc98974489a118)
author: Gerald Carter <jerry@samba.org> 2002-02-02 15:44:37 +0000
committer: Gerald Carter <jerry@samba.org> 2002-02-02 15:44:37 +0000
commit: c8bc0fa4a7be25cb926750a56085e1e98ed9046b (patch)
tree: ec7bb9c0ce893fda80a6eb1f264c4717b3f667ac /packaging/Debian
parent: 8cb4e23ffc77a9842e1304f3de20af5861982746 (diff)
download: samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.tar.gz
samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.tar.bz2
samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.zip
61 files changed, 10732 insertions, 0 deletions
diff --git a/packaging/Debian/README b/packaging/Debian/README
new file mode 100644
index 0000000000..042499b46f
--- /dev/null
+++ b/packaging/Debian/README
@@ -0,0 +1,42 @@
+Building Samba Packages for Debian GNU/Linux
+--------------------------------------------
+
+If you want to build Samba packages for Debian and you just want to use
+upstream sources, i.e. you don't want to wait for us to put official
+packages out, or you want packages for a Debian version for which we
+don't provide deb's, or you don't want to use official packages, or
+you want to add --this-cool-switch to configure, or whatever, follow
+these instructions:
+
+0) Make sure you have the following packages installed:
+   debhelper
+   libpam0g-dev
+   libreadline4-dev
+   libcupsys2-dev
+   + the minimum Debian development stuff (dpkg-dev, libc6-dev, etc.)
+   Note: libcupsys2-dev is not available for Potato. It's safe
+   to not install it if you don't need CUPS support.
+1) cd samba[-<version>]
+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
+  a symlink.
+3) dch -i
+  - Edit the changelog and make sure the version is right. For example,
+  for Samba 2.2.3, the version number should be 2.2.3-0.1 (use
+  a number less than 1 like 0.1, 0.2, etc. so there is no conflict
+  with future upgrades to the official Debian packages.)
+4) Run 'debian/rules binary'.
+  - It is better that you prefix the above command with 'fakeroot'.
+    If you have problems you might try building as root.
+5) That's it. Your new packages should be in ../. Install with dpkg.
+
+Please e-mail samba@packages.debian.org with comments, question or
+usggestions. Please talk to us and not to the Samba Team. They have
+better things to do and know nothing about the Debian packaging system.
+
+Eloy A. Paris <peloy@debian.org>
+Steve Langasek <vorlon@debian.org>
+
+Sat Feb  2 00:44:42 CET 2002
+
diff --git a/packaging/Debian/debian/README.build b/packaging/Debian/debian/README.build
new file mode 100644
index 0000000000..0a11a1f6ea
--- /dev/null
+++ b/packaging/Debian/debian/README.build
@@ -0,0 +1,397 @@
+From: Steve Langasek <vorlon@netexpress.net>
+To: "Eloy A. Paris" <eloy.paris@usa.net>
+Date: Thu, 23 Aug 2001 21:20:05 -0500 (CDT)
+Subject: Re: autobuilder failure on arm for samba-2.2.1a-3
+In-Reply-To: <20010823100906.A1092@antenas>
+Message-ID: <Pine.LNX.4.30.0108231744090.11071-100000@tennyson.netexpress.net>
+MIME-Version: 1.0
+Content-Type: TEXT/PLAIN; charset=US-ASCII
+
+On Thu, 23 Aug 2001, Eloy A. Paris wrote:
+
+> On Wed, Aug 22, 2001 at 03:01:01PM -0500, Steve Langasek wrote:
+
+> > Hmm.  Maybe the thing to do is to focus on getting config.cache (not log,
+> > cache) support into the package.  Issues like this are frequent enough with
+> > Samba, and the configure tests add enough time to the build process, that I
+> > think there'd be much benefit in being able to step past a lot of these.
+
+> Uhhmmm... I don't know, I guess I don't like much the idea of
+> maintaining a config.cache. It looks like extra work plus a
+> compilation process that is "synthetic" or atificial. What happens if
+> the Samba Team adds a new test, or modifies the configure script, will
+> the config.cache pick those up?
+
+> In any case, you are the expert, so if you think that's the way to go,
+> and the burden far exceeds the problems we have right now I say let's
+> go for it. I am not well versed on autoconf and the configure process,
+> that's all...
+
+Well, I'll attach my work to the bottom of this message and let you judge it
+for yourself.
+
+The config.cache I'm trying to generate here is not equivalent to what
+a configure script outputs.  The only values I'm including are those which 1)
+are no-brainers on any glibc-based platform, 2) are questions we need to force
+a particular value for regardless of the kernel being built against, or 3) are
+questions about specific bizarre features of proprietary Unices that we'll
+always get an answer of 'no' to.
+
+I've removed all of the config.cache variables related to headers, or to
+checks for particular libraries; I think it's pretty safe to assert that glibc
+provides basic C functions like select(), setenv(), and waitpid() on all our
+build targets, but I think it's less safe to assert that they'll always be
+provided by particular header files.
+
+So the config.cache won't automatically be updated with answers to new
+configure tests, but it also doesn't need to in order to be useful.  There's
+really only a handful of variables in there that we /need/ in order to
+guarantee correctly-built packages, and if you want to leave out everything
+else, that's perfectly ok too.  Everything from the fifth stanza on down is
+just a build-time speed-up for some of the slower architectures.  Well, it
+also has the fringe benefit that the packages will FAIL to build if someone
+tries rebuilding for a really bizarre (non-Linux, non-glibc) architecture.  I
+see that as a plus :), you may disagree, but in any case my next trick would
+be to add a global variable developers can set to bypass the provided
+config.cache.
+
+
+It is a little artificial, but the whole point of .debs is to be able to build
+binaries in a controlled environment.  Right now, we don't really have control
+over what happens in the autobuilders.  We have even /less/ control over what
+happens in a stable release:  it's been two weeks now since I built binaries
+for bug #94380, and they haven't been uploaded to security.d.o yet.  I'm
+guessing they won't be uploaded until Wichert is back from vacation, either --
+which is fine, but it would be nice if we didn't have to worry about
+mis-builds by the security team, or about putting the security team to extra
+trouble after the fact to get packages fixed.
+
+With a pre-loaded config.cache, we can ensure that bugs of this kind don't
+happen in woody.  We can take the arm autobuilder problem into our own hands,
+and not have to worry about quirkiness in the build environment.  We can even
+close bug #109773, since we no longer have to worry about detecting the
+setuid() routines.
+
+
+So to me, it definitely seems worth it.  But you're the maintainer, and I
+won't ask you to put anything in the package that you're not comfortable with.
+
+
+> By the way, I think I remember someone was able to build 2.2.x succesfully on
+> the ARM. If this is the case, could it be that there's something weird
+> with Phillip's setup?
+
+It could be.  There are arm packages for 2.2.1a-1, so at /some/ point the
+autobuilder was able to pass the locking test.
+
+
+> P.S. How did you know about the ARM build problems? I don't see any
+> bugs about this...
+
+<http://ftp-master.debian.org/testing/>, follow the links for samba...  The
+exact reference for the arm autobuilder is at
+<http://buildd.armlinux.org/~buildd/build.php?pkg=samba&ver=2.2.1a-4&arch=arm>.
+
+Regards,
+Steve Langasek
+postmodern programmer
+
+
+diff -uNrw samba-2.2.1a-bak/debian/changelog samba-2.2.1a/debian/changelog
+--- samba-2.2.1a-bak/debian/changelog	Thu Aug 23 10:27:54 2001
++++ samba-2.2.1a/debian/changelog	Thu Aug 23 10:28:08 2001
+@@ -1,3 +1,12 @@
++samba (2.2.1a-4.1) unstable; urgency=low
++
++  * Fix up the build system to avoid needing to run configure as root to
++    answer questions we already know the answers to.
++  * In the process, make surprising progress towards being able to
++    cross-compile the samba packages.
++
++ -- Steve Langasek <vorlon@debian.org>  Wed, 22 Aug 2001 23:35:00 -0500
++
+ samba (2.2.1a-4) unstable; urgency=low
+
+   * Fixed typo in smbmount's mount page.
+diff -uNrw samba-2.2.1a-bak/debian/config.cache samba-2.2.1a/debian/config.cache
+--- samba-2.2.1a-bak/debian/config.cache	Wed Dec 31 18:00:00 1969
++++ samba-2.2.1a/debian/config.cache	Thu Aug 23 10:28:08 2001
+@@ -0,0 +1,231 @@
++#
++# 22 August 2001  Steve Langasek <vorlon@debian.org>
++#
++# This file is a shell script that caches the results of configure
++# tests run on this system so they can be shared between configure
++# scripts and configure runs.  It is not useful on other systems.
++# If it contains results you don't want to keep, you may remove or edit it.
++#
++# By default, configure uses ./config.cache as the cache file,
++# creating it if it does not exist already.  You can give configure
++# the --cache-file=FILE option to use a different cache file; that is
++# what configure does when it calls configure scripts in
++# subdirectories, so they share the cache.
++# Giving --cache-file=/dev/null disables caching, for debugging configure.
++# config.status only pays attention to the cache file if you give it the
++# --recheck option to rerun configure.
++#
++#
++# This config.cache file contains a list of acceptable autoconf
++# values which can be used in compiling Samba for Debian woody/sid.
++#
++# Autoconf sorts options alphabetically in its output.  This file
++# groups options logically.
++
++
++# Load any architecture-specific settings
++if [ -n "$DEB_HOST_GNU_TYPE" \
++     -a -f ../debian/config.cache.${DEB_HOST_GNU_TYPE} ]; then
++	. ../debian/config.cache.${DEB_HOST_GNU_TYPE}
++fi
++
++
++# This is at the top because it's most in need of regular tweaking.
++# These are options which are supported on 2.4 kernels, but not on 2.2
++# kernels.
++
++samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no}
++samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no}
++samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=no}
++
++
++# These are present in 2.2 kernels, but not in 2.0...
++
++samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
++samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
++samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
++
++
++# POSIX ACL support not present in Linux 2.2; not allowed in the
++# Debian packages, even if present on the build machine.
++
++ac_cv_header_sys_acl_h=${ac_cv_header_sys_acl_h=no}
++
++
++# Various basic libc/compiler stuff that it's blindingly obvious that
++# Linux supports (now watch me get bitten for saying that)
++
++ac_cv_c_const=${ac_cv_c_const=yes}
++ac_cv_c_inline=${ac_cv_c_inline=inline}
++samba_cv_volatile=${samba_cv_volatile=yes}
++ac_cv_dirent_d_off=${ac_cv_dirent_d_off=yes}
++ac_cv_func_bzero=${ac_cv_func_bzero=yes}
++ac_cv_func_chmod=${ac_cv_func_chmod=yes}
++ac_cv_func_chown=${ac_cv_func_chown=yes}
++ac_cv_func_chroot=${ac_cv_func_chroot=yes}
++ac_cv_func_connect=${ac_cv_func_connect=yes}
++ac_cv_func_dup2=${ac_cv_func_dup2=yes}
++ac_cv_func_execl=${ac_cv_func_execl=yes}
++ac_cv_func_fchmod=${ac_cv_func_fchmod=yes}
++ac_cv_func_fchown=${ac_cv_func_fchown=yes}
++ac_cv_func_fstat=${ac_cv_func_fstat=yes}
++ac_cv_func_fsync=${ac_cv_func_fsync=yes}
++ac_cv_func_ftruncate=${ac_cv_func_ftruncate=yes}
++ac_cv_func_getcwd=${ac_cv_func_getcwd=yes}
++ac_cv_func_getgrent=${ac_cv_func_getgrent=yes}
++ac_cv_func_getgrnam=${ac_cv_func_getgrnam=yes}
++ac_cv_func_getspnam=${ac_cv_func_getspnam=yes}
++ac_cv_func_glob=${ac_cv_func_glob=yes}
++ac_cv_func_grantpt=${ac_cv_func_grantpt=yes}
++ac_cv_func_initgroups=${ac_cv_func_initgroups=yes}
++ac_cv_func_llseek=${ac_cv_func_llseek=yes}
++ac_cv_func_memcmp_clean=${ac_cv_func_memcmp_clean=yes}
++ac_cv_func_memmove=${ac_cv_func_memmove=yes}
++ac_cv_func_memset=${ac_cv_func_memset=yes}
++ac_cv_func_mktime=${ac_cv_func_mktime=yes}
++ac_cv_func_pipe=${ac_cv_func_pipe=yes}
++ac_cv_func_poll=${ac_cv_func_poll=yes}
++ac_cv_func_pread=${ac_cv_func_pread=yes}
++ac_cv_func_pwrite=${ac_cv_func_pwrite=yes}
++ac_cv_func_rand=${ac_cv_func_rand=yes}
++ac_cv_func_random=${ac_cv_func_random=yes}
++ac_cv_func_readlink=${ac_cv_func_readlink=yes}
++ac_cv_func_rename=${ac_cv_func_rename=yes}
++ac_cv_func_select=${ac_cv_func_select=yes}
++ac_cv_func_setenv=${ac_cv_func_setenv=yes}
++ac_cv_func_setgroups=${ac_cv_func_setgroups=yes}
++ac_cv_func_setsid=${ac_cv_func_setsid=yes}
++ac_cv_func_sigaction=${ac_cv_func_sigaction=yes}
++ac_cv_func_sigblock=${ac_cv_func_sigblock=yes}
++ac_cv_func_sigprocmask=${ac_cv_func_sigprocmask=yes}
++ac_cv_func_snprintf=${ac_cv_func_snprintf=yes}
++ac_cv_func_srand=${ac_cv_func_srand=yes}
++ac_cv_func_srandom=${ac_cv_func_srandom=yes}
++ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp=yes}
++ac_cv_func_strchr=${ac_cv_func_strchr=yes}
++ac_cv_func_strdup=${ac_cv_func_strdup=yes}
++ac_cv_func_strerror=${ac_cv_func_strerror=yes}
++ac_cv_func_strftime=${ac_cv_func_strftime=yes}
++ac_cv_func_strpbrk=${ac_cv_func_strpbrk=yes}
++ac_cv_func_strtoul=${ac_cv_func_strtoul=yes}
++ac_cv_func_symlink=${ac_cv_func_symlink=yes}
++ac_cv_func_usleep=${ac_cv_func_usleep=yes}
++ac_cv_func_utime=${ac_cv_func_utime=yes}
++ac_cv_func_utimes=${ac_cv_func_utimes=yes}
++ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes}
++ac_cv_func_waitpid=${ac_cv_func_waitpid=yes}
++ac_cv_type_ino_t=${ac_cv_type_ino_t=yes}
++ac_cv_type_mode_t=${ac_cv_type_mode_t=yes}
++ac_cv_type_pid_t=${ac_cv_type_pid_t=yes}
++ac_cv_type_size_t=${ac_cv_type_size_t=yes}
++ac_cv_type_uid_t=${ac_cv_type_uid_t=yes}
++samba_cv_socklen_t=${samba_cv_socklen_t=yes}
++
++# Yes, we know Linux supports fcntl locking.  Just ignore
++# any errors caused by building on an NFS mount.
++samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
++
++
++# smbwrapper doesn't work because the glibc maintainers don't want
++# to support transparent userland VFS.  We might as well preempt
++# any checks for shadowed symbols that are only useful for smbwrapper.
++
++ac_cv_func___acl=${ac_cv_func___acl=no}
++ac_cv_func__acl=${ac_cv_func__acl=no}
++ac_cv_func___chdir=${ac_cv_func___chdir=no}
++ac_cv_func__chdir=${ac_cv_func__chdir=no}
++ac_cv_func___close=${ac_cv_func___close=no}
++ac_cv_func__close=${ac_cv_func__close=no}
++ac_cv_func___closedir=${ac_cv_func___closedir=no}
++ac_cv_func__closedir=${ac_cv_func__closedir=no}
++ac_cv_func___dup=${ac_cv_func___dup=no}
++ac_cv_func__dup=${ac_cv_func__dup=no}
++ac_cv_func___dup2=${ac_cv_func___dup2=no}
++ac_cv_func__dup2=${ac_cv_func__dup2=no}
++ac_cv_func___facl=${ac_cv_func___facl=no}
++ac_cv_func__facl=${ac_cv_func__facl=no}
++ac_cv_func___fchdir=${ac_cv_func___fchdir=no}
++ac_cv_func__fchdir=${ac_cv_func__fchdir=no}
++ac_cv_func___fcntl=${ac_cv_func___fcntl=no}
++ac_cv_func__fcntl=${ac_cv_func__fcntl=no}
++ac_cv_func___fork=${ac_cv_func___fork=no}
++ac_cv_func__fork=${ac_cv_func__fork=no}
++ac_cv_func___fstat=${ac_cv_func___fstat=no}
++ac_cv_func__fstat=${ac_cv_func__fstat=no}
++ac_cv_func___fstat64=${ac_cv_func___fstat64=no}
++ac_cv_func__fstat64=${ac_cv_func__fstat64=no}
++ac_cv_func___fxstat=${ac_cv_func___fxstat=no}
++ac_cv_func___getcwd=${ac_cv_func___getcwd=no}
++ac_cv_func__getcwd=${ac_cv_func__getcwd=no}
++ac_cv_func___getdents=${ac_cv_func___getdents=no}
++ac_cv_func__getdents=${ac_cv_func__getdents=no}
++ac_cv_func___llseek=${ac_cv_func___llseek=no}
++ac_cv_func___sys_llseek=${ac_cv_func___sys_llseek=no}
++ac_cv_func__llseek=${ac_cv_func__llseek=no}
++ac_cv_func___lseek=${ac_cv_func___lseek=no}
++ac_cv_func__lseek=${ac_cv_func__lseek=no}
++ac_cv_func___lstat=${ac_cv_func___lstat=no}
++ac_cv_func__lstat=${ac_cv_func__lstat=no}
++ac_cv_func___lstat64=${ac_cv_func___lstat64=no}
++ac_cv_func__lstat64=${ac_cv_func__lstat64=no}
++ac_cv_func___lxstat=${ac_cv_func___lxstat=no}
++ac_cv_func___open=${ac_cv_func___open=no}
++ac_cv_func__open=${ac_cv_func__open=no}
++ac_cv_func___open64=${ac_cv_func___open64=no}
++ac_cv_func__open64=${ac_cv_func__open64=no}
++ac_cv_func___opendir=${ac_cv_func___opendir=no}
++ac_cv_func__opendir=${ac_cv_func__opendir=no}
++ac_cv_func___pread=${ac_cv_func___pread=no}
++ac_cv_func__pread=${ac_cv_func__pread=no}
++ac_cv_func___pread64=${ac_cv_func___pread64=no}
++ac_cv_func__pread64=${ac_cv_func__pread64=no}
++ac_cv_func___pwrite=${ac_cv_func___pwrite=no}
++ac_cv_func__pwrite=${ac_cv_func__pwrite=no}
++ac_cv_func___pwrite64=${ac_cv_func___pwrite64=no}
++ac_cv_func__pwrite64=${ac_cv_func__pwrite64=no}
++ac_cv_func___read=${ac_cv_func___read=no}
++ac_cv_func__read=${ac_cv_func__read=no}
++ac_cv_func___readdir=${ac_cv_func___readdir=no}
++ac_cv_func__readdir=${ac_cv_func__readdir=no}
++ac_cv_func___readdir64=${ac_cv_func___readdir64=no}
++ac_cv_func__readdir64=${ac_cv_func__readdir64=no}
++ac_cv_func___seekdir=${ac_cv_func___seekdir=no}
++ac_cv_func__seekdir=${ac_cv_func__seekdir=no}
++ac_cv_func___stat=${ac_cv_func___stat=no}
++ac_cv_func__stat=${ac_cv_func__stat=no}
++ac_cv_func___stat64=${ac_cv_func___stat64=no}
++ac_cv_func__stat64=${ac_cv_func__stat64=no}
++ac_cv_func___telldir=${ac_cv_func___telldir=no}
++ac_cv_func__telldir=${ac_cv_func__telldir=no}
++ac_cv_func___write=${ac_cv_func___write=no}
++ac_cv_func__write=${ac_cv_func__write=no}
++ac_cv_func___xstat=${ac_cv_func___xstat=no}
++
++
++
++# Miscellaneous stuff that isn't, and shouldn't be, available
++# in Debian.  Those interested in building debs for other systems may
++# need to remove some of these defines.
++
++ac_cv_func_bigcrypt=${ac_cv_func_bigcrypt=no}
++ac_cv_func_crypt16=${ac_cv_func_crypt16=no}
++ac_cv_func_getauthuid=${ac_cv_func_getauthuid=no}
++ac_cv_func_getprpwnam=${ac_cv_func_getprpwnam=no}
++ac_cv_func_getpwanam=${ac_cv_func_getpwanam=no}
++ac_cv_func_putprpwnam=${ac_cv_func_putprpwnam=no}
++ac_cv_func_rdchk=${ac_cv_func_rdchk=no}
++ac_cv_func_set_auth_parameters=${ac_cv_func_set_auth_parameters=no}
++ac_cv_func_setgidx=${ac_cv_func_setgidx=no}
++ac_cv_func_setluid=${ac_cv_func_setluid=no}
++ac_cv_func_setpriv=${ac_cv_func_setpriv=no}
++ac_cv_func_setuidx=${ac_cv_func_setuidx=no}
++ac_cv_lib_sec_bigcrypt=${ac_cv_lib_sec_bigcrypt=no}
++ac_cv_lib_sec_getprpwnam=${ac_cv_lib_sec_getprpwnam=no}
++ac_cv_lib_sec_getspnam=${ac_cv_lib_sec_getspnam=no}
++ac_cv_lib_sec_putprpwnam=${ac_cv_lib_sec_putprpwnam=no}
++ac_cv_lib_sec_set_auth_parameters=${ac_cv_lib_sec_set_auth_parameters=no}
++ac_cv_lib_security_bigcrypt=${ac_cv_lib_security_bigcrypt=no}
++ac_cv_lib_security_getprpwnam=${ac_cv_lib_security_getprpwnam=no}
++ac_cv_lib_security_getspnam=${ac_cv_lib_security_getspnam=no}
++ac_cv_lib_security_putprpwnam=${ac_cv_lib_security_putprpwnam=no}
++ac_cv_lib_security_set_auth_parameters=${ac_cv_lib_security_set_auth_parameters=no}
+diff -uNrw samba-2.2.1a-bak/debian/config.cache.alpha-linux samba-2.2.1a/debian/config.cache.alpha-linux
+--- samba-2.2.1a-bak/debian/config.cache.alpha-linux	Wed Dec 31 18:00:00 1969
++++ samba-2.2.1a/debian/config.cache.alpha-linux	Thu Aug 23 10:28:08 2001
+@@ -0,0 +1,12 @@
++# 22 Aug 2001  Steve Langasek <vorlon@debian.org>
++
++# This file contains autoconf settings specific to the alpha-linux
++# platform that should be preloaded when building for this architecture.
++
++
++# Linux 2.2 on Alpha doesn't have a functional setresgid() call, but
++# Linux 2.4 does.  Ensure that packages compiled for woody remain
++# compatible with 2.2 kernels, even if the build machine is running 2.4.
++samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
++samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
++samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
+diff -uNrw samba-2.2.1a-bak/debian/rules samba-2.2.1a/debian/rules
+--- samba-2.2.1a-bak/debian/rules	Thu Aug 23 10:27:54 2001
++++ samba-2.2.1a/debian/rules	Thu Aug 23 10:28:08 2001
+@@ -15,6 +15,14 @@
+ # This has to be exported to make some magic below work.
+ export DH_OPTIONS
+
++# Set the host and build architectures for use with config.cache loading,
++# cross-building, etc.
++DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
++DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
++
++export DEB_HOST_GNU_TYPE
++export DEB_BUILD_GNU_TYPE
++
+ BVARS = SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb
+
+ DESTDIR=`pwd`/debian/samba
+@@ -48,8 +56,11 @@
+ #     ./configure --with-fhs --prefix=/usr --sysconfdir=/etc \
+ #        --localstatedir=/var
+
++	if [ -f debian/config.cache ]; then \
++		cp -f debian/config.cache source/config.cache; \
++	fi
+ #	[ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp)
+-	[ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --sysconfdir=/etc --with-privatedir=/etc/samba --with-lockdir=/var/state/samba --localstatedir=/var --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp --with-readline --with-pam_smbpass)
++	[ -f source/Makefile ] || (cd source && ./configure --host=$(DEB_HOST_GNU_TYPE)-gnu --build=$(DEB_BUILD_GNU_TYPE)-gnu --with-fhs --prefix=/usr --sysconfdir=/etc --with-privatedir=/etc/samba --with-lockdir=/var/state/samba --localstatedir=/var --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp --with-readline --with-pam_smbpass)
+
+ 	touch configure-stamp
+
diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian
new file mode 100644
index 0000000000..82be3f4df4
--- /dev/null
+++ b/packaging/Debian/debian/README.debian
@@ -0,0 +1,71 @@
+Samba for Debian
+----------------
+
+This package was built by Eloy Paris <peloy@debian.org> and Steve
+Langasek <vorlon@debian.org>, current maintainers of the Samba packages
+for Debian, based on work from Bruce Perens <Bruce@Pixar.com>, Andrew
+Howell <andrew@it.com.au>, Klee Dienes <klee@debian.org> and Michael
+Meskes <meskes@topsystem.de>, all previous maintainers of the packages
+samba and sambades (now merged together - see below).
+
+As of Samba 2.0.6-1, the Debian version of Samba is compiled with
+Pluggable Authentication Modules (PAM) support. PAM support was 
+discontinued during the libc5 -> libc6 migration process and I never
+brought it back until 2.0.6-1.
+
+The smbfs package does not support the 2.0.x Linux kernels anymore.
+This has been the case since the very first packages of the CVS sources
+that eventually became Samba 2.2. To use the smbfs package you need to
+run a 2.2.x kernel or later.
+
+Starting with the Debian packages for Samba 2.2, the Samba log files (for
+nmbd and smbd) have been moved to a new location: /var/log/samba/. The
+files also have new names: log.nmbd and log.smbd. The old files
+(/var/log/{nmb,smb} were moved to the new location.
+
+As of Samba 2.2.2-11, the Samba sources produce the following binary
+packages:
+
+samba: A LanManager like file and printer server for Unix.
+samba-common: Samba common files used by both the server and the client.
+smbclient: A LanManager like simple client for Unix.
+swat: Samba Web Administration Tool
+samba-doc: Samba documentation.
+smbfs: Mount and umount commands for the smbfs (works with 2.2.x and
+	above kernels, not with 2.0.x kernels.)
+libpam-smbpass: pluggable authentication module for SMB password
+	database.
+libsmbclient: Shared library that allows applications to talk to SMB servers.
+libsmbclient-dev: libsmbclient shared libraries.
+
+
+Please note that the package smbwrapper (a shared library that provides
+SMB client services that existed between Samba 2.0.0-1 and Samba-2.0.5a-4
+does not exist any more. The reason is that starting with Samba 2.0.6-1, that
+code does not even compile, and the upstream author (Andrew Tridgell)
+recommended to disable the compilation of smbwrapper until some issues
+with glibc2.1 get cleared out (the problem is with glibc, not with Samba
+itself).
+
+Support for NT Domains
+----------------------
+
+Samba 2.2 includes preliminary support for NT domains. A Samba server
+can now be part of a Windows NT domain whose Primary Domain Controller
+is a Windows NT server. This feature is supposed to be stable although I
+haven't tried it myself. Read the documentation in the samba-doc package
+for help on how to do this (hint: "security = domain" in the smb.conf
+file).
+
+Samba 2.2 has also experimental support for Primary Domain
+Controller. This means that a Samba server can act now as a PDC. There
+are no special flags needed to compile Samba with NT domain PDC
+support. Please read the NTDOM PDC FAQ at www.samba.org (Documentation
+section).
+
+Please note that NT domain PDC support is far from complete and is still 
+experimental.
+
+Eloy A. Paris <peloy@debian.org>
+Steve Langasek <vorlon@debian.org>
+January 14, 2002
diff --git a/packaging/Debian/debian/TODO b/packaging/Debian/debian/TODO
new file mode 100644
index 0000000000..95bcd64e2b
--- /dev/null
+++ b/packaging/Debian/debian/TODO
@@ -0,0 +1,10 @@
+In no particular order:
+
+- New packages for winbind stuff.
+- Fix stuff in packaging/Debian/ (add infrastructure for stable
+  builds)
+- Compile with LDAP support.
+- Finish debconf support.
+- Test debconf support.
+- Review /etc/init.d/samba (Brian White reports problems, should add
+  --oknodo to start-stop-daemon)
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
new file mode 100644
index 0000000000..93bb6d4f04
--- /dev/null
+++ b/packaging/Debian/debian/changelog
@@ -0,0 +1,1559 @@
+samba (2.2.2.cvs20020201-1) unstable; urgency=low
+
+  * Getting ready for Samba 2.2.3.
+  * Using a poor's man build system to keep our patches to upstream
+    under the debian/ directory.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri,  1 Feb 2002 16:10:58 -0500
+
+samba (2.2.2-12) unstable; urgency=high
+
+  * (Steve) Patch for source/client/client.c.
+    Closes: #86438 smbclient: Transfering several GB causes the average
+            speed to be messed up.
+  * Uploading with urgency=high to expedite the move from unstable
+    to testing because of the security problem fixed in -11.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 25 Jan 2002 22:31:12 -0500
+
+samba (2.2.2-11) unstable; urgency=low
+
+  * Building with --with-libsmbclient. We have created two new
+    packages: libsmbclient and libsmbclient-dev. Hopefully this
+    will help some people that want to add the capability of
+    speaking SMB to their applications.
+    Closes: #117132 - libsmbclient support library?
+  * (Steve) Make swat do the right thing when reading (parsing)
+    the saved preferences in smb.conf.
+    Closes: #55617 swat mutilates the linpopup message command.
+  * Updated README.Debian. Updated descriptions in debian/control.
+  * Remembered to bump up version number in source/include/version.h
+    (need to automate this or else I'll keep forgetting.)
+  * (Steve) one liner for source/web/diagnose.c.
+    Closes: #106976 - smbd/nmbd not running message with swat/linuxconf.
+  * Added '|| true' to the post-rotate script so logrotate doesn't
+    fail if either nmbd or smbd is not running.
+    Closes: #127897 - /etc/logrotate.d/samba fails if there is no smbd process.
+  * Fixed incorrect file locations in swat's man page and added a
+    Debian-specific note to /usr/share/doc/swat/README.
+    Closes: #71586 swat: needs documentation fixes for debian.
+  * smbmount in the smbfs package does not have the setuid bit set.
+    Apparently, smbmount uses libsmb without checking the environment.
+    Thanks to Christian Jaeger <christian.jaeger@sl.ethz.ch> for
+    finding the local root exploit.
+  * Applied old patch from Jerry) Carter" <jerry@samba.org> to correct
+    the following two problems in Samba 2.2.2:
+    - %U and %G could not be used in services names
+      in smb.conf.
+    - %G would fail to be expanded in an "include = ..."
+      line.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 19 Jan 2002 21:35:26 -0500
+
+samba (2.2.2-10) unstable; urgency=low
+
+  * (Steve) Add missing manual pages.
+    Closes: Bug#128928: missing manpages in smbfs.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 13 Jan 2002 14:39:55 -0500
+
+samba (2.2.2-9) unstable; urgency=low
+
+  * (Steve) Fix broken URL's in HTML docs.
+    Closes: Bug#17741: bad links in html docs (at last!!!)
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 11 Jan 2002 13:37:07 -0500
+
+samba (2.2.2-8) unstable; urgency=low
+
+  * Added "Replaces: samba (<= 2.2.2-5)" to the smbclient section in
+    debian/control so rpcclient.1, which was in samba-2.2.2-5, does not
+    cause problems now that it is part of smbclient (>= 2.2.2-6).  Closes:
+    Closes: Bug#128684: error upgrading smbclient in sid.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 11 Jan 2002 11:42:40 -0500
+
+samba (2.2.2-7) unstable; urgency=low
+
+  * (Steve) Patch to make behavior honor what the docs. say about "hosts allow"
+    taking precedence over "hosts deny".
+    Closes: Bug#49249: swat: error with host deny ?!
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 10 Jan 2002 12:36:58 -0500
+
+samba (2.2.2-6) unstable; urgency=low
+
+  * (Steve) Adds manpage for rpcclient to the proper file,
+    removes smbtorture from the distro because this tool isn't intended for
+    widespread consumption.
+    Closes: #63057 - no manual page for smbtorture.
+  * (Steve) Removed -gnu from the configure arguments (--build, --host) in
+    debian/rules so config.sub is able to properly create the host and target
+    tuples.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed,  9 Jan 2002 14:39:51 -0500
+
+samba (2.2.2-5) unstable; urgency=low
+
+  * Fixes from vorlon:
+  * Use /usr/bin/pager instead of more.
+    Closes: #125603: smbclient violates pager policy.
+  * Make /etc/logrotate.d/samba a conffile, send smbd and nmbd
+    a SIGHUP to have the log files reopened, fixes to
+    /etc/logrotate.d/samba.
+    Closes: #127897: log file rotation.
+    Closes: #118277: /etc/logrotate.d/samba not listed in conffiles.
+  * s/covert/convert/.
+    Closes: #121653 probable typo in install message.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun,  6 Jan 2002 03:14:58 -0500
+
+samba (2.2.2-4) unstable; urgency=low
+
+  * Applied patch from Steve to work around problem in glibc that affects the
+    HPPA architecure. The patch detects the error condition at configure time
+    and compiles without LFS support if necessary.
+    Closes: Bug#126763: samba completely broken on hppa.
+  * Including unicode_map.1251.
+    Closes: Bug#126719: samba-common: unicode_map.1251 missing.
+  * Updated smbd daemon version to match Debian package version.
+    Closes: Bug#127199: Package version and smbd daemon version don't match.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 31 Dec 2001 14:32:47 -0500
+
+samba (2.2.2-3) unstable; urgency=low
+
+  * Added some spaces in package description in debian/control.
+    Closes: #120730 - missing spaces in package description for nice
+            alignment.
+  * Spelling fixes.
+    Closes: #125328, #125329, #125330, #125367, #125365, #125403.
+  * Steve Langasek <vorlon@debian.org> is the co-maintainer of the Debian
+    Samba packages!!! Added him to the uploaders field in debian/control.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 18 Dec 2001 00:54:25 -0500
+
+samba (2.2.2-2) unstable; urgency=low
+
+  * Backed out changes to source/filename.c per Andrew Tridgell's request.
+    This changes were introduced in 2.2.1a-7 as an attempt to fix #47493.
+    Tridge found out that they break smbd.
+  * Changed version number in source/includes/version.h so it is clear that
+    this is a version of Samba packaged for Debian. This is another request from
+    Tridge and will help the Samba Team to get bogus bug reports.
+  * Added Samba-HOWTO-Collection.pdf and other README files to the
+    /usr/share/doc/<package>/ directories.
+  * Installing libnss_winbind.so and pam_winbind.so.
+    Closes: #116790: nss and pam modules for winbind missing.
+  * Removed user-emacs-settings from changelog.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 29 Oct 2001 19:16:26 -0500
+
+samba (2.2.2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Temporary fix for #113763 (Steve Langasek)
+  * Quick hack to avoid smbmount reveal password length. Please note
+    that even with this hack there is a small window when password is
+    completely visible with 'ps aux'. There are other methods that should
+    be used to automate mounting of SMB shares.
+    Closes: #112195: smbmount-2.2.x reveals password length.
+  * Applied patch from Steve Langasek <vorlon@debian.org> to prevent
+    forcing use of setresuid() in Sparc.
+    Closes: #112779: samba build forces use of setresuid, which causes
+                     smbd to fail on Sparc.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 15 Oct 2001 10:26:10 -0400
+
+samba (2.2.1a-9) unstable; urgency=low
+
+  * Replaced $(LD) with $(CC) all the way through source/Makefile.
+    Closes: #111036: ld shouldn't be used to link shlibs.
+  * s/\/bin\/mail/\/usr\/bin\/mail/ in smb.conf's man page (HTML and
+    sgml as well.)
+    Closes: #110963: smb.conf: mail should be /usr/bin/mail.
+  * Documented better smbclient's -W behavior. Patch from Steve
+    Langasek.
+    Closes: #53672: smbclient: -W flag is interpreted as domain, not
+            workgroup.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue,  4 Sep 2001 23:10:41 -0400
+
+samba (2.2.1a-8) unstable; urgency=low
+
+  * Set some reasonable default perms for the samba logdir (again,
+    thanks to vorlon :-)
+    Closes: #72529: insecure permissions on log files.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 26 Aug 2001 15:40:47 -0400
+
+samba (2.2.1a-7) unstable; urgency=low
+
+  * Another attempt at fixing #47493. Patch from Steve Langasek
+    <vorlon@netexpress.net>. Let's keep our fingers crossed Steve!
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 26 Aug 2001 13:37:06 -0400
+
+samba (2.2.1a-6) unstable; urgency=low
+
+  * Backed out fix to #47493 introduced in 2.2.1a-4 as it is causing
+    smbd to die with signal 11 under some unidentified situations.
+    Closes: #109774: Latest debian version breaks printer driver download.
+    Closes: #109946: not all files appear in samba-exported directories.
+  * Another patch from Steve Langasek. This one adds quotes around 
+    printer names for print systems it's reasonable for Debian to
+    support. Together with the patch in #29957 (see changelog for
+    2.2.1a-4), this should take care of the problems with multi-word 
+    printer names in Samba.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 24 Aug 2001 21:12:27 -0400
+
+samba (2.2.1a-5) unstable; urgency=low
+
+  * Important changes that affect how Samba is built on Debian
+    machines are implemented in this release. All of this changes
+    were suggested by the energetic Steve Langasek <vorlon@debian.org>,
+    and his arguments were so sound and reasonable that I decided
+    to implement them. Here's Steve's original changelog:
+
+       * Fix up the build system to avoid needing to run configure 
+         as root to answer questions we already know the answers to.
+       * In the process, make surprising progress towards being able to
+         cross-compile the samba packages.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 24 Aug 2001 01:08:06 -0400
+
+samba (2.2.1a-4) unstable; urgency=low
+
+  * Fixed typo in smbmount's mount page.
+    Closes: #109317: smbfs: mistype in smbmount manpage.
+  * Included symlink to smbspool to better support CUPS printing.
+    Closes: #109509: include symlink for cups samba support.
+  * Applied patch from Steve Langasek <vorlon@netexpress.net> to
+    fix bug #29957.
+    Closes: #29957: samba strips trailing " from strings in smb.conf.
+  * First attempt at fixing #47493. Another patch from Steve "I want
+    a bug-free Samba" Langasek.
+    Closes: #47493: Samba doesn't handle ':' in dir names right.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 21 Aug 2001 23:26:38 -0400
+
+samba (2.2.1a-3) unstable; urgency=low
+
+  * Steve Langasek <vorlon@netexpress.net> has been hard at work in
+    the last few days looking at the long list of open bugs filed
+    against the Samba packages. I don't know how to thank him. It's been
+    a pleasure working with Steve, and all the fixes, patches, etc. in
+    this release come from him. The bug list is greatly reduced thanks
+    to Steve's efforts.
+  * Steve's additions/modifications/patches/etc. are:
+    - New package that (libpam-smbpass) provides pam_smbpass. Before, this
+      was provided in another package but now the sources are part of
+      the Samba sources so we can start providing it from here.
+      Closes: #107043 - pam_smbpass now present in Samba source,
+        should be built from there
+    - Patch to source/smbd/service.c that allows admins to call
+      /bin/umount from the root postexec of a Samba share.
+      Closes: #40561 - samba pre/postexec commands do not work.
+    - Clear TMPDIR before starting smbd in /etc/init.d/samba.
+      Closes: #51295 - Problems with Samba and TMPDIR.
+    - Correction to documentation of "guest only".
+      Closes #38282 - "guest only" share still requires a password.
+  * Applied patch from Santiago Vila <sanvila@unex.es> to convert
+    /usr/sbin/mksmbpasswd from a shell script into a real awk script.
+    Sorry it took so long, Santiago; I hadn't realized you even
+    provided a patch :-)
+    Closes: #77891 - mksmbpasswd could be a real awk script.
+  * Updated description of the smbfs and smbclient packages. Also have
+    each package recommend the other.
+    Closes: #108650: Should suggest or recommend smbfs.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 13 Aug 2001 22:21:55 -0400
+
+samba (2.2.1a-2) unstable; urgency=low
+
+  * Build-depends: depend on debhelper (>=2.0.103).
+    Closes: #105795: Build-Depends are wrong.
+  * Run samba's preinst and postinst scripts without -e so failed commands
+    do not abort installation.
+    Closes: #106384: postinstall crashes abnormally. (And really closes
+      #104471.)
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 26 Jul 2001 00:30:37 -0400
+
+samba (2.2.1a-1) unstable; urgency=low
+
+  * New upstream version.
+  * Make sure samba's postinst script exits with a zero status.
+    Closes: #104471: Samba postinst problem.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 12 Jul 2001 21:55:21 -0400
+
+samba (2.2.1-1) unstable; urgency=low
+
+  * New upstream version.
+    Closes: #103339: config.guess and config.sub update required.
+    Closes: #98518: Samba 2.2 can't act as PDC for NT4/W2K due to 
+                    incompatibility with PAM.
+    Closes: #97447: nmbd crashes due to bugs in DAVE 2.5.2.
+    Closes: #95777: Samba 2.2 is unable to join or authenticate against 
+                    Samba 2.2 PDC domain.
+    Closes: #68842: samba should use PAM for password changing (I
+                    haven't personally tried this one, but it's been
+                    advertised this works.)
+    Closes: #102506: PAM account checking fails.
+    Closes: #102518: Complains about unknown paramter "obey pam
+                     restrictions"
+    Closes: #94774: Build failure on PARISC machines.
+  * Moved away from /etc/cron.weekly/samba for log file rotation.
+    Now using logrotate.
+    Closes: #95548: typo in /etc/cron.weekly/samba.
+    Closes: #74951: nmbd does not rename its log file.
+  * Removed Debian-specific addtosmbpass.8 man page since this script
+    is not longer provided upstream. Users should use the smbpasswd
+    program instead.
+  * Updated sample /etc/samba/smb.conf to reflect the recent changes
+    affecting handling of PAM authentication. Also updated
+    /etc/pam.d/samba.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 11 Jul 2001 00:44:14 -0400
+
+samba (2.2.0.final.a-1) unstable; urgency=high
+
+  * New upstream version (contains security fix from DSA-065-1.)
+    Closes: #97241: samba 2.2.0 fails to process hostnames in
+      "hosts allow" config line.
+  * Removed Debian-specific addtosmbpass.8 man page since this script
+    is not longer provided upstream. Users should use the smbpasswd
+    program instead.
+    Closes: #98365: addtosmbpass is missing from 2.2.0.final-2.
+  * Updated sample /etc/samba/smb.conf to reflect the recent changes
+    affecting handling of PAM authentication. Also updated
+    /etc/pam.d/samba.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 24 Jun 2001 11:11:59 -0400
+
+samba (2.2.0.final-2) unstable; urgency=low
+
+  * Added libcupsys2-dev to Build-Depends.
+  * Samba depends now (again) on netbase so update-inetd is always
+    available for the Samba maintainer scripts.
+    Closes: #86063: Fails to uninstall if inetd is not installed.
+  * Updated source/config.{sub,guess} so ARM built doesn't fail.
+    Closes: #94480: config.sub out of date; can't build on arm.
+    Closes: #85801: config.sub/guess out of date.
+  * Not using brace expansion, i.e. {foo,bar} in any of the maintainers
+    scripts nor in debian/rules.
+    Closes: #88007: samba postrm has is not POSIX sh compliant.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 21 Apr 2001 17:27:18 -0400
+
+samba (2.2.0.final-1) unstable; urgency=low
+
+  * New upstream release. Lots of new things. See WHATSNEW.txt.
+  * Goofy version number because of my stupidity when assigning version
+    numbers to the CVS packages I have been uploading to experimental.
+    Will be fixed when 2.2.1 is released. I've no doubts a 2.2.1 release
+    will follow soon.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 17 Apr 2001 22:58:14 -0400
+
+samba (2.2.0.cvs20010416-1) experimental; urgency=low
+
+  * CVS update.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 16 Apr 2001 21:25:15 -0400
+
+samba (2.2.0.cvs20010410-1) experimental; urgency=low
+
+  * CVS update.
+  * Added libreadline4-dev to Build-Depends.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 10 Apr 2001 16:53:45 -0400
+
+samba (2.2.0.cvs20010407-1) experimental; urgency=low
+
+  * CVS update. Includes what is in 2.2.0alpha3.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat,  7 Apr 2001 16:00:33 -0400
+
+samba (2.2.0.cvs20010316-1) experimental; urgency=low
+
+  * Started working on Samba 2.2.0. Using the SAMBA_2_2_0 branch
+    from Samba CVS.
+  * Not compiling rpctorture as it has compile errors. Change in
+    debian/rules.
+  * Removed Linux kernel 2.0.x and smbfs compatibility baggage. Now
+    the smbfs does not support 2.0.x kernels; a kernel > 2.2.x is
+    needed to use smbfs. Updated debian/control, debian/rules and
+    README.Debian to reflect this change.
+  * Added to swat a versioned dependency on samba (so a user is forced to
+    install a new version of swat each time a new version of samba is
+    installed.)
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 18 Mar 2001 14:21:14 -0500
+
+samba (2.0.7-5) unstable; urgency=medium
+
+  * Transition from suidmanager to dpkg-statoverride.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 18 Jan 2001 23:51:56 -0500
+
+samba (2.0.7-4) unstable; urgency=medium
+
+  * Applied Urban Widmark <urban@teststation.com> fixes to smbmount. Urban
+    is the maintainer of the smbfs in the kernel and of the userland
+    utilities.
+  * Links to HTML documents are correct now.
+    Closes: #69439: swat: Broken help file symlinks
+    Closes: #72615: samba-doc directory changed: removed htmldocs from path
+    Closes: #75847: swat: Wrong symlink
+    Closes: #66857: Wrong links to html documents.
+    Closes: #77912: misplaced documentation symlinks for swat
+  * Building Samba with CUPS support. For this I reverted the change to
+    source/configure.in that I did in 2.0.7-3 and re-ran autoconf.
+    Closes: #59038: samba: not compiled with cups support.
+  * Fix against previous known/unknown user time difference patch to swat
+    (make username / password lookups take the same time.) Remove CGI
+    logging code in Swat.
+    Closes: #76341 - Security holes in swat
+  * Updated Build-depends.
+  * Updated debian/copyright to refer to the correct location of the GPL.
+  * debian/rules: changed DESTDIR to `pwd`/debian/samba (was
+    `pwd`/debian/tmp.)
+  * debian/rules: added '--sourcedir=debian/samba' to dh_movefiles (for some
+    strange reason dh_installdirs is not creating debian/tmp/ so I needed
+    to tweak everything to install stuff in debian/samba rather than in
+    debian/tmp.)
+  * debian/control: changed section of samba-docs to 'doc' (was 'docs')
+  * Using relative symlinks in /usr/share/samba/swat/ (changed debian/rules
+    and source/scripts/installswat.sh.)
+  * Fixed (by tweaking debian/rules)
+    /usr/bin/{smbmnt,smbumount-2.*,smbmount-2.*} to be suid.
+  * Added "Provides: samba-client" to smbclient's section in control.
+    Closes: #71143: smbclient: Smbclient should provide samba-client.
+  * Fix for desired_access being zero in map_share_mode() (patch to
+    source/smbd/nttrans.c.) Thanks to Gary Wilson
+    <wilsong@sergievsky.cpmc.columbia.edu> for bringing this patch to my
+    attention.
+  * Hacked source/lib/util_sec.c so smbd works fine in both 2.0.x and
+    2.2.x kernels even when the build is done in a system running
+    a 2.2.x kernel.
+    Closes: #78858: samba-common: samba2.0.7 needs kernel 2.2.x but
+                    doesnt depend on it.
+    Closes: #72758: README.Debian should comment on 2.0.x kernels.
+    Closes: #56935: Samba 2.0.6 and Kernel 2.0.x.
+    Closes: #58126: Samba 2.0.6 and Kernel 2.0.x -- more info.
+    Closes: #60580: samba: failed to set gid.
+    Closes: #64280: Samba panics, can't set gid.
+    Closes: #66816: Must deal with brokenness under 2.0.x.
+    Closes: #67682: potatoe samba 2.0.7-3 out of order, 2.0.5a-1 OK.
+    Closes: #69735: PANIC: failed to set gid
+    Closes: #66122: "smbclient -L localhost -U%" returns with "tree
+                    connect failed: code 0".
+    Closes: #57637: Samba says tree connect error.
+    Closes: #58015: potato samba wins support is broken.
+  * Fixed comments in sample smb.conf to point to the correct location.
+    Closes: #69578: comments in smb.conf points to wrong path.
+  * Move codepages from /etc/samba/codepages/ to
+    /usr/share/samba/codepages/.
+    Closes: #63813: samba; codepages should go in /usr/lib.
+  * Moved /var/samba/ to /var/state/samba/.
+    Closes: #49011: samba package not FHS compliant.
+  * Hacked source/configure.in (and re-ran autoconf) so yp_get_default_domain()
+    is found.
+    Closes: #44558: netgroup support missing in samba 2.0.5a-1.
+  * /etc/init.d/samba was calling start-stop-daemon with both --pidfile and
+    --exec. Got rid of --exec so --pidfile works.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 11 Jan 2001 00:15:57 -0500
+
+samba (2.0.7-3) frozen unstable; urgency=high
+
+  * Release manager: this closes a RC bug.
+  * Commented out the section in source/configure.in that auto-detects
+    CUPS support and then ran autoconf to generate a new configure
+    script. This was done to prevent machines that have libcupsys-dev
+    installed from detecting CUPS support and adding an unwanted
+    dependency on libcupsys. This way the whole printing system
+    won't break on upgrades. CUPS support should be added after
+    Potato is released.
+    Closes: #65185: samba-common: Upgrading removes printing system.
+    Closes: #64496: smbfs: smbfs on powerpc has a dependency on cupsys.
+  * Updated README.debian.
+    Closes: #64594: Old README.Debian in /usr/share/doc/samba.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 20 Jun 2000 19:16:04 -0400
+
+samba (2.0.7-2) frozen unstable; urgency=high
+
+  * Release manager: this closes RC bug #63839 that prevents Samba
+    to be built from source.
+  * Fixed a stupid typo in debian/rules that was preventing Samba
+    to be built from source.
+    Closes: #63839: samba_2.0.7-1(frozen): build error (SAMBABOOK dir)
+  * I forgot to mention that O'Reilly's book "Using Samba" was donated
+    to the Open Source community. The book was included in Samba 2.0.7
+    in HTML format and is part of the Debian Samba package since 
+    Samba 2.0.7-1.
+  * In Samba 2.0.7-1, the "Using Samba" book and a number of HTML help
+    files were supposed to be provided in both the swat and the samba-doc
+    packages. This duplication was a waste of space. Starting with
+    Samba 2.0.7-2, swat recommends samba-doc and the book and the HTML
+    files are included only in samba-doc, and are accessed via symlinks
+    from within swat.
+    Closes: #58810: superfluous files in swat?
+  * Added a 'echo "."' to /etc/init.d/samba in the reload) section.
+    Closes: #63394: "echo ." missing in reload section of init.d script
+  * Fixed typo in docs/htmldocs/using_samba/ch06_05.html.
+    Closes: #64344: typo "encrypted passwords"
+  * Cleaned up samba's postrm script so important common files aren't
+    deleted when samba is purged. Created a samba-common.postrm script.
+    Closes: #62675: purging samba removes /etc/samba/smb.conf.
+    Closes: #63386: samba --purge removes /etc/samba dir even though
+            smbclient/smbfs/samba-common packages are still installed
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed,  3 May 2000 02:42:07 -0400
+
+samba (2.0.7-1) frozen unstable; urgency=low
+
+  * New upstream version. Dear Release Manager: please allow this 
+    package to go to frozen as it contains fixes to a _lot_ of problems.
+    You can take a look at all the problems fixed by this release in
+    the official upstream announcement at
+    http://us1.samba.org/samba/whatsnew/samba-2.0.7.html.
+  * Added --with-utmp to add utmp support to smbd (this is new in Samba
+    2.0.7)
+  * Closes: #62148 - samba not rotating filled logs.
+  * Closes: #56711: Samba doesn't manage well long share name (please note
+      that it's possible to connect to shares with names longer than
+      14 characters but the share will be listed with a name truncated to
+      13 characters.)
+  * Closes: #51752 - NT DOMAIN - NET USE * /HOME not mapping (error 67).
+    Closes: #50907 - logon path not working.
+    This is not a bug, it's just Samba doing the same thing an NT server
+    does. See WHATSNEW.txt and smb.conf's man page for details.
+  * Closes: #48497 - error executing smbsh in debian-potato. (smbwrapper
+    is not supported anymore.)
+  * Closes: #58994 swat: typo in swat description.
+  * Closes: #45931 - Samba dies with SIGILL on startup. (Hardware 
+    problems, person that reported the bug never came back.)
+    Closes: #54398 - smbadduser fails, looks for ypcat.
+  * Fixed swat's man page to include Debian specific installation
+    instructions. There's not necessary to edit /etc/services or 
+    /etc/inetd.conf.
+    (Closes: #58616 - incomplete install config && incorrect installation
+      instructions.)
+  * s/SBINDIR/\"/usr/sbin\"/g in source/web/startstop.c to prevent swat
+    to look for smbd and nmbd in the wrong place when requested to start or
+    stop smbd or nmbd.
+    (Closes: #55028 - swat can't start samba servers.)
+  * Closes: #37274: smbclient does not honour pot. (Tested and seems to be
+    working now.)
+  * Not confirmed, but should fix #56699, #62185, #56247, #52218, #43492,
+    #50479, #39818, #54383, #59411.
+    (please re-open any of this if the problem still exists - I was unable
+    to confirm any of this because I could never reproduce them.)
+    Closes: #56699 - Samba's nmbd causes random kernel oops several
+      times in a row.
+    Closes: #62185 - nmbd's forking until no more file descriptors are 
+      available.
+    Closes: #56247 - session setup failed: ERRSRV - ERRbadpw.
+    Closes: #52218 - Either wins proxy does not work, or I don't understand
+      it.
+    Closes: #43492 - intermittent problem changing password.
+    Closes: #50479 - Can't access windows 2000 shares with samba.
+    Closes: #39818 - samba-common: Upgrading Samba from the Slink version.
+    Closes: #54383 - samba-common: Missing /etc/smb.conf.
+    Closes: #59411 - smbclient: cannot browse Win2k shares.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 27 Apr 2000 16:07:45 -0400
+
+samba (2.0.6-5) frozen unstable; urgency=low
+
+  * Oppsss! samba-common doesn't depend on libcupsys1 so the binaries
+    in this package are broken unless libcupsys1 is installed.
+    samba-common has a "grave" bug because of this. Instead of adding 
+    libcupsys1 to the Depends: list of each package in debian/control
+    I investigated why dh_shlibs was not picking the dependency
+    automatically. It turns out that it's probably a bug in libcupsys1
+    because the format of its shlibs file is not correct. I fixed that
+    file (/var/lib/dpkg/info/libcupsys1.shlibs) and now dependencies are
+    picked correctly. I'll talk to the libcupsys1 maintainer.
+
+    I think the addition of CUPS support to Samba is a big change that
+    should not go into Frozen. So, I decided to back up the addition
+    of CUPS support I did in 2.0.6-4 to minimize problems. I'll add
+    CUPS support again when I start working on Samba for Woody.
+    (Closes: #59337 - samba-common has a missing dependency)
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed,  1 Mar 2000 08:40:02 -0500
+
+samba (2.0.6-4) frozen unstable; urgency=low
+
+  * It seems that sometimes nmbd or smbd are not killed when upgrading.
+    I think it is because in samba's prerm script I was calling
+    start-stop-daemon with the --pidfile switch and in old versions of
+    Samba the nmbd and smbd daemons did not store their PIDs in a file in
+    /var/samba/. I changed debian/samba.prerm so the existence of the
+    PID files is checked before calling "start-stop-daemon --pidfile ..."
+    If the PID files do not exist then start-stop-daemon is called
+    without the --pidfile parameter.
+    (Closes: #58058 - upgrade from slink went badly)
+  * Fixed typo in description of swat package in debian/control.
+  * Installed libcupsys1-dev so the configure script picks up CUPS
+    and Samba is compiled with CUPS support. Also added libcupsys1 to
+    the Depends: list of package samba in debian/control.
+    (Closes: #59038 - samba not compiled with cups support)
+  * Added a small paragraph to debian/README.debian warning about possible
+    problems with the WINS code in Samba 2.0.6.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 28 Feb 2000 14:00:42 -0500
+
+samba (2.0.6-3) frozen unstable; urgency=low
+
+  * Applied patch posted by Jeremy Allison to the samba mailing list
+    that should take care of the internal errors reported in bug #52698
+    (release-critical). Wichert: please test as I never could reproduce
+    it here.
+    (Closes: #52698 - samba gets interbal errors)
+  * Moved samba-docs to the 'docs' section.
+    (Closes: #51077 - samba-doc: wrong section)
+  * Added reload capability to /etc/init.d/samba (only for smbd because
+    nmbd does not support reloading after receiving a signal).
+    (Closes: #50954 - patch to add reload support to /etc/init.d/samba)
+  * Corrected "passwd chat" parameter in sample /etc/samba/smb.conf so
+    Unix password syncronization works with the passwd program currently
+    in Potato. Thanks to Augustin Luton <aluton@hybrigenics.fr> for
+    the correct chat script.
+  * Stole source/lib/util_sec.c from the CVS tree of what will become
+    Samba 2.0.7 or whatever so we can use the same binaries under
+    both 2.0.x and 2.2.x kernels.
+    (Closes: #51331 - PANIC: failed to set gid)
+  * smbadduser is now provided as an example and it's customized for Debian.
+    I am not providing this script in /usr/sbin/ because then I would need
+    a dependency on csh, something that I don't want to do.
+    (Closes: #51697, #54052)
+  * Fixed the short description of the smbfs package in debian/control.
+    (Closes: 53534 - one-line description out of date).
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 23 Nov 1999 16:32:12 -0500
+
+samba (2.0.6-2) unstable; urgency=low
+
+  * samba-common now depends on libpam-modules (not on libpam-pwdb, which
+    I have been told is obsolete). I modified /etc/pam.d/samba accordingly
+    to reflect the change.
+    (Closes: Bug#50722: pam pwdb dependence?).
+  * The old /etc/pam.d/samba file which had references to pam_pwdb caused
+    smbd to die with a signal 11. The new /etc/pam.d/samba file fixes
+    this problem.
+    (Closes: #50876, #50838, #50698)
+  * Compiled with syslog support (use at your own risk: syslog support
+    is still experimental in Samba). I added the parameters "syslog = 0"
+    and "syslog only = no" to the sample smb.conf to avoid pestering
+    users that do not want Samba to log through syslog.
+    (Closes: Bug#50703 - syslog only option doesn't work)
+  * Removed the stupid code in the smbmount wrapper script that tries
+    to load the smbfs module if smbfs is not listed in /proc/filesystems.
+    (Closes: Bug#50759 - Non-root can't run smbmount if SMBFS is compiled
+    as a module in the kernel)
+  * Added /bin/mount.smb as a symlink pointing to /usr/bin/smbmount so
+    'mount -t smb ...' works just as 'mount -t smbfs ...'.
+    (Closes: Bug#50763 - 'mount -t smb' doesn't work)
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 20 Nov 1999 18:53:35 -0500
+
+samba (2.0.6-1) unstable; urgency=low
+
+  * Samba 2.0.6 has been released. This is the first try of the Debian
+    Samba packages. I know for sure that smbd won't work properly on
+    2.0.x kernels because the patch that Wichert sent me does not apply
+    to the new source/lib/util_sec.c in Samba 2.0.6. That file was
+    completely re-written by Tridge.
+  * Updated README.Debian.
+  * A new client utility called smbspool appeared in Samba 2.0.6. I added
+    this utility to the smbclient package, although I haven't tried it yet.
+  * Added the symlink /sbin/mount.smbfs that points to /usr/bin/smbmount.
+    This is to be able to type "mouont -t smbfs ...". This symlink goes
+    in the smbfs package, of course.
+  * This new release should close the following bugs (some of these
+    are fixed for sure in this new upstream release, some others I could
+    not reproduce but I believe they are fixed if they were real bugs.
+    As always, please feel free to re-open the bugs if the problem is not
+    solved).
+      Closes: Bug#33240: icmp mask needs a bug workaround.
+      Closes: Bug#37692: samba: Has problems detecting interfaces.
+      Closes: Bug#38988: samba: Truly bizzare behavour from nmbd.
+      Closes: Bug#46432: samba-2.0.5a-2: nmbd does not appear to broadcast
+                          properly.
+      Closes: Bug#44131: smbfs: no longer possible to set file and
+                          directory-modes.
+      Closes: Bug#46992: smbmount-2.2.x manpage wrong.
+      Closes: Bug#42335: smbfs: missing options from the new 2.2.x commandline.
+      Closes: Bug#46605: smbmnt segfaults.
+      Closes: Bug#48186: smbmount.
+      Closes: Bug#38040: smbfs: Please add /sbin/mount.smb [included].
+      Closes: Bug#47332: smbmount: could -f and -P be added back?
+  * Samba has been compiled with PAM support (closes: Bug#39512 - samba PAM
+    module). To succesfully add PAM support, I created /etc/pam.d/samba and
+    added this file as a conffile for the samba-common package. I also made
+    samba-common depend on libpam-pwdb.
+  * Added simple man pages for the wrapper scripts smbmount and smbmount.
+    (Closes: Bug#44705 - Missing smbmount man page)
+  * Installed libreadlineg2-dev in my system so smbclient now has a
+    "history" command and libreadline support :-)
+  * This time I did add a check to the smbmount wrapper script to see if
+    the kernel has support for smbfs, as suggested by Jeroen Schaap
+    <J.Schaap@physiology.medfac.leidenuniv.nl>. I mentioned in the changelog
+    for samba-2.0.5a-3 that I did this but I forgot at the end.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 11 Nov 1999 12:08:15 -0500
+
+samba (2.0.5a-5) unstable; urgency=low
+
+  * I am sorry to report that the smbwrapper package is gone for the
+    moment. The reason for this is twofold: first of all, smbwrapper
+    is completely broken in Samba-2.0.5a (it compiles but it doesn't
+    run) and in the upcoming Samba-2.0.6 it doesn't even compile. Second,
+    when I asked Andrew Tridgell (father of Samba) about the state of
+    smbwrapper he told me that Ulrich Drepper (head of the glibc project)
+    broke on purpose the glibc stuff in which smbwrapper is based.
+    Consequently, Tridge recommended me to compile Samba without
+    support for smbwrapper. When, I have no idea. Sorry folks. Here is
+    the original message I received from Andrew:
+    
+    > 1) 2.0.5a's smbwrapper doesn't work under glibc2.1, and pre-2.0.6's
+    > smbwrapper doesn't even compile under glibc2.1.
+    
+    yep, Ulrich deliberately broke it. It won't get fixed till glibc
+    allows the sorts of games it plays to work again. I suggest you turn
+    it off in your build scripts until that gets sorted out.
+    
+  * Swat's file are now in /usr/share/samba/ instead of
+    /usr/lib/samba/ (bug #49011).
+  * Man pages now in /usr/share/man/ instead of /usr/man/ (bug #49011).
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue,  2 Nov 1999 12:59:13 -0500
+
+samba (2.0.5a-4) unstable; urgency=low
+
+  * Applied patch from our fearless leader (Wichert) to fix the darn bug
+    that prevents Samba to work on 2.0.x kernels if it was compiled
+    in a system running a 2.2.x kernel. This closes #40645 (build uses
+    setresuid which doesn't work under 2.0.34 (does apparently under
+    2.2.x) ).
+  * Fixed the entry that swat's postinst script adds to /etc/inetd.conf
+    so it is '#<off># swat\t\tstream\ttcp\tnowait.400 ...' instead of
+    '#<off>#swat\t\tstream\ttcp\tnowait.400 ...'. The old way caused
+    'update-inetd --enable swat' to leave the entry for swat disabled.
+    Thanks to Dave Burchell <burchell@inetnebr.com> for finding out
+    this problem. This closes #48762 (swat uses non-standard syntax to 
+    comment out inetd.conf entry).
+  * /usr/sbin/swat does not think anymore that the smbd daemon lives
+    in /usr/local/samba/bin/. To fix this I am running now source/configure
+    with "--prefix=/usr --exec-prefix=/usr". This closes #47716 (samba
+    'swat' fails: incorrect hardwired path in the binary).
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 31 Oct 1999 03:42:38 -0500
+
+samba (2.0.5a-3) unstable; urgency=low
+
+  * I am pretty darn busy with my MBA, I apologize for the long time it's
+    taking to squash bugs in the Samba packages.
+  * Built with debhelper v2 for FHS compliancy. Changed a couple of
+    things in debian/rules to accomodate for the new place for the docs.
+    I also had to change debian/{samba.postinst,samba.prerm,swat.postinst}
+    to make sure that the symlink from /usr/doc/xxx exists and points to
+    /usr/share/doc/xxx (the reason for this is that I am not letting
+    debhelper to create these scripts for me automatically).
+  * Built with latest libc6.
+  * smbfs: finally, the nasty bug that causes smbmount to die after
+    a while is gone thanks to Ben Tilly <Ben_Tilly@trepp.com>.
+    The problem was just a typo in source/client/smbmount.c.
+    This closes grave bug #42764 (smbmount dies) and #43341 
+    (smbfs-2.2.x won't function after a while).
+  * Fixed the smbmount wrapper script to eliminate a bashism (closes
+    #45202 - "wrapper scripts use $* instead of "$@") and to recognize 
+    2.3.x and 2.4.x kernels (closes #47688 - "smbfs: does not recognize 
+    kernel 2.3.x").
+  * Added a check to the smbmount wrapper script to see if the
+    kernel has support for smbfs, as suggested by Jeroen Schaap
+    <J.Schaap@physiology.medfac.leidenuniv.nl>.
+  * swat's man page is now part of the swat package, not of the samba
+    package. This closes #44808 (Samba has a man page for swat, but 
+    the binary is not included).
+  * The interface program smbrun is not longer needed by smbd because
+    of the availability of execl() under Linux. Because of this, the
+    smbrun is not even being compiled. Since there is no need for smbrun
+    now, the smbrun man page was taken out of the samba package. This
+    closes #45266 (/usr/bin/smbrun missing).
+  * smbpasswd is now part of the samba-common package, and not part of
+    the samba package. This is to let administrators that do not want
+    to install a full Samba server administer passwords in remote
+    machines. This closes bug #42624 (smbpasswd should be included in 
+    smbclient). This bug report also suggests that swat becomes part of 
+    the samba package, that smbfs becomes part of the smbclient package,
+    and that the binary smbpasswd becomes part of the smbclient package.
+    I moved smbpasswd to the samba-common package but I am reluctant to 
+    do the other things the bug report suggests.
+  * In order to keep dpkg happy when moving smbpasswd from the samba
+    package to samba-common, I had to add a "Replaces: samba (<= 2.0.5a-2)"
+    in the control section of the samba-common package and a
+    "Replaces: samba-common (<= 2.0.5a-2)" in the control section of the
+    samba package (in debian.control).
+  * Samba is now being compiled with the "--with-netatalk" option. This
+    closes #47480 (Could samba be compiled with the --with-netatalk option).
+  * All packages that depend on samba-common have a versioned dependency
+    now. This was accomplished by adding "(= ${Source-Version})" to the
+    relevant sections of debian/control. Thanks t Antti-Juhani Kaijanaho
+    <gaia@iki.fi> for the hint. This closes #42985 (samba should probably
+    have a versioned depends on samba-common).
+  * Made sure the file docs/textdocs/DIAGNOSIS.txt gets installed in all
+    the Samba packages. This closes bug #42049 (no DIAGNOSTICS.txt file).
+  * Added the smbadduser helper script to the samba package. This closes
+    #44480 (Samba doesn't come with the smbadduser program).
+  * Applied patch from szasz@triton.sch.bme.hu that prevents smbmount
+    to leave an entry in /etc/mtab for a share that could not be mounted
+    because of invalid user of password. The patch also allows smbumount
+    to unmount the share in the event that something goes wrong with the
+    smbmount process. This closes bug #48613 (Mount/umount problems + 
+    patch) as well as #44130 (failed mount is still mounted).
+  * smbmount-2.2.x is now setuid root. This is needed for the patch
+    applied above to be effective. If smbmount-2.2.x is not setuid root
+    then an entry will be left in /etc/mtab even when the mount
+    fails. I had to add "usr/bin/smbmount-2.2.x" to debian/smbfs.suid
+    for this to work.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 27 Oct 1999 10:36:13 -0400
+
+samba (2.0.5a-2) unstable; urgency=low
+
+  * This version is basically the same as 2.0.5a-1 but it was compiled
+    on a Potato system with glibc2.1. See below the change log for 2.0.5a-1
+    for more information.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 27 Jul 1999 02:25:29 -0400
+
+samba (2.0.5a-1) stable; urgency=high
+
+  * I'm back from the Honey Moon. We are pretty busy because we are moving
+    to Pittsburgh (from Caracas, Venezuela) in aprox. 24 hours and we still
+    have plenty of things to pack and to do. Samba 2.0.5 was released
+    while I was in the Honey Moon and it is just now (almost 3 AM) when
+    I have time to package it.
+  * Because of the security problems fixed in 2.0.5, this upload goes
+    to both stable and unstable (the Security Team asked for this).
+  * This release (2.0.5a-1) was compiled on a Slink system. 2.0.5a-2 will
+    be compiled on a Potato system.
+  * Added a "Replaces: samba (<= 1.9.18p10-7)" to the samba-common
+    section in debian/control (as suggested by Steve Haslam
+    <araqnid@debian.org>) to fix the problems that appear when upgrading 
+    from the Samba package in Slink. Please test this as I am completely 
+    unable to do so. This should fix bug #39818 (Upgrading Samba from the 
+    Slink version).
+  * Removed the hacks to the autoconf stuff that I added to 2.0.4b-2 in 
+    order to have defined several socket options when compiling with
+    Linux 2.2.x kernel headers - the fix is now upstream.
+  * Finally!!! smbmount was re-written (thanks Tridge :-) to use a command
+    line syntax similar to the one used by the old smbmount (for 2.0.x 
+    kernels). This means that the wrapper script is no longer necessary
+    so I removed it. In its place there is a simple wrapper script that
+    calls smbmount-2.0.x or smbmount-2.2.x depending on the kernel that is
+    running.
+  * Because of the wedding, the Honey Moon, and our move to Pittsburgh,
+    I can't work on fixing other bugs in this release.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 27 Jul 1999 02:18:51 -0400
+
+samba (2.0.4b-3) unstable; urgency=low
+
+  * Stupid mistake: I forgot to add /usr/bin/smbumount to debian/smbfs.files
+    and because of this /usr/bin/smbumount was part of the samba package
+    instead of part of the smbfs package.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu,  1 Jul 1999 01:51:24 -0400
+
+samba (2.0.4b-2) unstable; urgency=low
+
+  * Dark (and archive maintainers): please remove from Potato the smbfsx 
+    binary package and also the old source package for smbfs. smbfs and 
+    smbfsx have been merged starting with this version.
+  * Merged the old smbfs package with Samba. Now there is only one package
+    for the smbfs utilities and is called "smbfs". The package smbfsx
+    does not exist any more and this new smbfs package must be used
+    for both 2.0.x and > 2.1.x kernels.
+  * A wrapper script was added to handle the syntax change in smbmount
+    in the new smbfs utilities (required for kernels > 2.1.70). The
+    home page for this script is http://www.wittsend.com/mhw/smbmount.html.
+    Please _note_ that this will change (for good) in Samba 2.0.5 :-)
+  * Added debian/smbumount.sh. It's another wrapper that calls smbumount-2.2.x
+    or smbumount-2.0.x depending on the kernel currently running.
+  * Not using -t for savelog in cron.weekly script.
+  * Recompiled without libreadlineg-dev (Samba does not seem to be using
+    it so unnecessary dependencies are produced).
+  * glibc2.1 build.
+  * Removed smbpasswd.8 man page from the debian/ directory because it is
+    now being provided upstream.
+  * Got rid of the ugly hack I put in source/lib/util_sock.c to have
+    IPTOS_LOWDELAY and IPTOS_THROUGHPUT defined. Now I patched the
+    autoconf stuff to #include <netinet/ip.h>. I've sent the patch to
+    Jeremy Allison so we have this upstream.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 28 Jun 1999 17:47:19 -0400
+
+samba (2.0.4b-1) unstable; urgency=low
+
+  * New upstream release. This release fixes the following Debian bugs:
+    #33838 (Amanda/ Samba 2.0.2 and backing up large filesystems) and
+    #33867 (Amanda 2.4.1 and Samba 2.0.2 and large filesystems). Jeremy
+    Allison released Samba 2.0.4 and found out that there were a couple
+    of minor bugs so he released 2.0.4a. Then he found out about more
+    serious bugs and released 2.0.4b. I have built this package several
+    times between yesterday and today because of this. Now I am releasing
+    the Debian packages for Samba with what I believe will be the latest
+    release the Samba Team will make at least in the next 4 days (Jeremy
+    is taking a short vacation).
+  * Still compiling against glibc2.0 (sorry about that :-)
+  * Hacked source/smbwrapper/smbsh.c to fix the problem
+    of smbsh not finding the shared library smbwrapper.so. It looks
+    now in /usr/lib/samba/ for this file. This fixes #32971, #32989,
+    #33278, #34911 and #36317.
+  * Made smbfsx depend on samba-common because smbfsx uses /etc/samba/smb.conf
+    and /etc/samba/codepages/. This fixes #33128 (smbmount complains about
+    missing /etc/smb.conf).
+  * Package swat does not depend on httpd anymore (there's no need to).
+    This fixes #35795 (swat requires httpd).
+  * Renamed smbmount-2.1.x and smbumount-2.1.x to smbmount-2.2.x and
+    smbumount-2.2.x. Same applies to the man pages.
+  * Changed minor type in smbmount's man page (changed "\"" by "\'"). This
+    fixes #34070 (wrong quotes in manpage).
+  * Used Fabrizio Polacco's <fpolacco@icenet.fi> procedure to create the
+    Debian package for Samba. This closes #35781 (samba has no pristine 
+    source).
+  * Changes to /etc/cron.weely/samba: rotate /var/log/{nmb,smb}.old only
+    if the size of either is different than 0. Also, added comments at the
+    beginning of this script to explain how rotation of log files works in
+    Samba. Thanks to ujr@physik.phy.tu-dresden.de (Ulf Jaenicke-Roessler)
+    for the suggestions. This closes #37490 (cron.weekly script rotates not
+    used [sn]mb.old files). As I side effect, this should also close
+    #31462 (still trouble with /etc/cron.weekly/samba).
+  * Check for old /etc/pam.d/samba file which is not provided by this version
+    of the Debian Samba package but was provided in older versions. If this
+    file exists we delete it. We check for this in the postinst. This closes
+    #37356 (samba put stuff in pam.d that pam complains about) and #34312 
+    (libpam0g: questions during upgrade).
+  * Make sure the mode of /etc/samba/smbpasswd is set to 600. This is done
+    in the postinst script. This closes #35730 (Security problem with 
+    /etc/samba/smbpasswd when upgrading from samba 1.9.18p8-2 to 2.0.3-1).
+  * I have just checked and it looks like #28748 (smbfsx doesn't "return ")
+    has been fixed. This might have been fixed since a long time ago.
+  * Long long standing bug #18488 (smbclient: internal tar is broken) is
+    closed in this release of Samba. The bug might have been closed for a 
+    long long time, but I did not check for this before.
+  * Temporary fix to the annoying "Unknown socket option IPTOS_LOWDELAY"
+    message. This fixes #33698 (socket option IPTOS_LOWDELAY no longer works),
+    #34148 (warnings from smbd) and #35333 (samba warnings).
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 20 May 1999 00:35:57 -0400
+
+samba (2.0.3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Removed the convert_smbpasswd.pl program I created and put in
+    /usr/doc/samba/ because there's a convert_smbpasswd script in the
+    upstream sources that does the same thing. I modified the postinst
+    script to use this script instead of the one I created.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 28 Feb 1999 01:35:37 -0400
+
+samba (2.0.2-2) unstable; urgency=low
+
+  * Updated the README.Debian file.
+  * Updated the description of the samba package in the control file.
+  * The binaries smbmnt and smbumount-2.1.x in the smbfsx package are now
+    installed setuid root as they should be. This was done by doing a
+    a "chmod u+s" for each binary in debian/rules and by creating the 
+    file debian/smbfsx.suid.
+  * Minor patch to source/client/smbumount.c to allow normal users
+    to umount what they have mounted (problem was a kernel vs. libc6
+    size mismatch). I sent the patch upstream.
+  * Created debian/smbwrapper.dirs so the directory /usr/lib/samba/ is
+    created.
+  * Modified debian/rules to move smbwrapper.so from debian/tmp/usr/bin/ to
+    debian/smbwrapper/usr/lib/samba/.
+  * Hacked source/smbwrapper/smbsh.c to fix the problem
+    of smbsh not finding the shared library smbwrapper.so.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 11 Feb 1999 18:11:34 -0400
+
+samba (2.0.2-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 11 Feb 1999 01:35:51 -0400
+
+samba (2.0.1-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat,  6 Feb 1999 06:51:18 -0400
+
+samba (2.0.0final-4) unstable; urgency=low
+
+  * The samba postinst made an unwarranted assumption that the file
+    /etc/samba/smbpasswd exists. If the file did not exist (which is
+    perfectly valid) the postinst will fail. This fixes #32953.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri,  5 Feb 1999 23:32:46 -0400
+
+samba (2.0.0final-3) unstable; urgency=low
+
+  * Added to debian/control a "Depends: ${shlibs:Depends}" line for the
+    samba-common package so dependencies for this package are set
+    correctly (thanks to Dark for pointing this out).
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu,  4 Feb 1999 09:45:21 -0400
+
+samba (2.0.0final-2) unstable; urgency=low
+
+  * Finally!!! The first upload to unstable. Sorry for the delay folks
+    but I have been quite busy lately :-) Another reason for the delay
+    is that I wanted to ease the migration from Samba 1.9.18p10 and
+    before to Samba 2.0.0. I changed the location of the config. files 
+    from /etc/ to /etc/samba/ and this made things a little bit harder.
+  * This package needs 2.2 kernel headers to compile (well, this is
+    true for the smbfsx package, all others compile fine with 2.0 kernel
+    headers).
+  * Created a preinst script for the samba package to take care of the
+    location migration of smb.conf (from /etc/ to /etc/samba/). The
+    preinst script also takes care of moving /etc/smbpasswd to its new
+    location (/etc/samba/).
+  * Created postinst and postrm scripts to add/remove an entry for swat
+    in /etc/inetd.conf.
+  * I had forgotten to install the sambaconfig script so I changed
+    debian/rules to install this script.
+  * Added a postrm script for the samba package (I had forgotten to add 
+    this script to the new Samba packages after the migration from 1.9.18 
+    to 2.0.0).
+  * Created a small Perl script that is called from the samba postinst
+    to convert the smbpasswd from the old format used in version prior
+    to 2.0.0 to the new one used in 2.0.0 and beyond.
+  * The upgrade process should be automatically now. Please let me know
+    of any problems you encounter.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 23 Jan 1999 09:34:10 -0400
+
+samba (2.0.0final-1) experimental; urgency=low
+
+  * Finally!!! Samba 2.0.0 is here! I am not uploading to unstable
+    because I still have to work out the migration from the old
+    samba packages to the new ones. I also need to work more on the
+    new swat package.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 14 Jan 1999 22:40:02 -0400
+
+samba (2.0.0beta5-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue,  5 Jan 1999 00:37:57 -0400
+
+samba (2.0.0beta4-1) experimental; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 23 Dec 1998 18:37:45 -0400
+
+samba (2.0.0beta3-1) experimental; urgency=low
+
+  * New upstream version.
+  * I have just realized that the documentation patches (for man pages)
+    that I used for the 1.9.18 release are not longer necessary because
+    there was a major re-write of all the Samba documentation that added
+    the missing bits of information. So, I have just removed these minor
+    patches.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue,  8 Dec 1998 12:00:30 -0400
+
+samba (2.0.0beta2-1) experimental; urgency=low
+
+  * New upstream version.
+  * This new version fixes the potential security problem that
+    was posted to debian-private (using the "message command" parameter
+    to execute arbitrary commands from messages sent from LinPopUp).
+  * Changed /etc/init.d/samba to use one of the variables stored in
+    /etc/samba/debian_config to know how Samba is being run (from inetd or
+    as daemons) instead of grepping /etc/inetd.conf which may not exist
+    if the user is running xinetd (this fixes bug #29687 - assumes using 
+    vanilla inetd)
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 23 Nov 1998 23:32:03 -0400
+
+samba (2.0.0beta1-1) experimental; urgency=low
+
+  * First beta release of the samba-2.0.0 code. Before the beta I was
+    working with sources downloaded directly from the CVS server. This
+    package goes into experimental and I plan to release the new
+    samba to unstable as soon as it gets out of beta.
+  * Created several packages out of the Samba sources. They are:
+    samba (nmbd and smbd daemons + related programs), smbclient (FTP
+    like command line utility to retrieve files from SMB servers),
+    swat (Samba Web Administration Tool), samba-common (common files
+    used by samba, smbclient and swat), smbfsx (smbfs utilities for
+    kernels >= 2.1.70), smbwrapper and samba-doc (Samba documentation).
+  * Refreshed debian/samba-doc.docs so recently added docs. are
+    installed in the samba-doc package. New additions include man
+    pages in the /usr/doc/samba-doc/htmldocs/ directory.
+  * Deleted Debian specific nmblookup(1) man page as it is now upstream.
+  * Added smbtorture to smbclient package.
+  * Moved rpcclient from the samba package to the smbclient package.
+  * The Samba daemons (nmbd and smbd) now create a PID file so I changed
+    all calls to start-stop-daemon to use the PID file.
+  * Fixed debian/rules to install mksmbpasswd (fixes #27655).
+  * Modified /etc/init.d/samba so nmbd is started without the -a (append
+    to the log file instead of overwrite) switch. The new behavior of
+    nmbd is to NOT overwrite log files, so the -a switch can be deleted
+    safely.
+  * Moved from debstd to debhelper.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu,  1 Oct 1998 08:37:41 -0400
+
+samba (1.9.18p10-5) frozen unstable; urgency=high
+
+  * Oppsss!!! While fixing bug #26884 I introduced a bug even worse than
+    the one I was trying to fix: in /etc/init.d/samba I got rid of the test
+    that tells us whether the Samba daemons are running from inetd or as
+    standalone daemons. I corrected the problem by editing again
+    /etc/init.d/samba to uncomment the test.
+  * Wishlist bug #28298 (typos in samba) was fixed.
+  * Wishlist bug #28309 (typos in smb.conf) was fixed.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 28 Oct 1998 09:11:47 -0400
+
+samba (1.9.18p10-4) unstable; urgency=low
+
+  * Minor patch to debian/rules to delete *substvars instead of only
+    substvars when doing a "debian/rules clean" (thanks to Daniel Jacobowitz
+    <dmj@andrew.cmu.edu> for this).
+  * Small patch to source/shmem_sysv.c that eases compilation under
+    glibc-2.1 (thanks to Daniel <dmj@andrew.cmu.edu> for this).
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 17 Sep 1998 15:33:49 -0400
+
+samba (1.9.18p10-3) unstable; urgency=low
+
+  * Patched smbclient again to fix minor formatting problem introduced
+    by Magosanyi Arpad's smbclient patch.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu,  3 Sep 1998 11:03:23 -0400
+
+samba (1.9.18p10-2) unstable; urgency=low
+
+  * Sync'ed include files for the smbfs utilities with the ones in
+    kernel 2.1.119.
+  * Added to the /usr/doc/samba/examples/ directory a new script called 
+    wins2dns (courtesy of Jason Gunthorpe <jgg@deltatee.com>) that 
+    generates BIND sonze files for hosts in the WINS database.
+  * Patched smbclient to include enhancements by Magosanyi Arpad 
+    <mag@bunuel.tii.matav.hu> that make scripting easier.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 28 Aug 1998 13:34:54 -0400
+
+samba (1.9.18p10-1) stable unstable; urgency=low
+
+  * New upstream version (see /usr/doc/samba/WHATSNEW.txt for a
+    description of what has changed). I built a 1.9.18p9-1 but I
+    never released it because an obscure bug was found just a couple
+    of days before the official release, so the Samba Team stopped
+    the rollover of 1.9.18p9.
+  * Updated documentation (new files were added to the docs/ directory
+    that were not installed in /usr/doc/samba/).
+  * Fixed long standing bug #7695 (smb.conf's man page doesn't document
+    'printing=lprng') - I made a couple of changes to the man page to 
+    include references to lprng.
+  * Fixes bug #24930 (samba needs to suggest psmisc?). I don't think it
+    is necessary to make samba suggest psmisc just because the postinst
+    script mentions to call killall. So, I removed all references to
+    "killall" in the scripts.
+  * Fixes bug #25999 (Samba does not by default work with unix password
+    sync): I added the "passwd program" and "passwd chat" parameters to
+    the sample smb.conf to reflect the Debian environment.
+
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 21 Aug 1998 08:59:18 -0400
+
+samba (1.9.18p9-1) unstable; urgency=low
+
+  * New upstream version (see /usr/doc/samba/WHATSNEW.txt for a
+    description of what has changed).
+  * Removed Jeremy Allison's patch applied to 1.9.18p8-2 because it is
+    now part of the new upstream version.
+  * Corrected small typo in addtosmbpass' man page (fixes #25629).
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 11 Aug 1998 08:53:08 -0400
+
+samba (1.9.18p8-2) frozen unstable; urgency=medium
+
+  * Applied patch received from Jeremy Allison (Samba Team) that fixes
+    "grave" bug #23903 (samba maps username before authenicating with 
+    NT password server).
+  * Added a "sleep 2" between "start-stop-daemon --stop" and
+    "start-stop-daemon --start" in /etc/init.d/samba so when this script
+    is called with the "restart" parameter the Samba daemons are restarted
+    properly. This fixes bug #24211 (init.d script doesn't restart).
+  * Sent start-stop-daemon output in /etc/init.d/samba to /dev/null to
+    avoid annoying warning messages.
+  * Added perfomance tune parameters to sample /etc/smb.conf (SO_SNDBUF=4096
+    and SO_RCVBUF=4096 to "socket options" in /etc/smb.conf). I can't
+    find who sent this suggestion to me. If you are listening, drop me a
+    note and I'll put your name here :-)
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 29 Jun 1998 08:45:01 -0400
+
+samba (1.9.18p8-1) frozen unstable; urgency=low
+
+  * New upstream release that fixes _lots_ of "ugly" bugs. The list of
+    fixed bugs is too long to include here (see /usr/doc/samba/WHATSNEW.txt).
+  * Fixed postinst to quote arguments to if [ arg .. ] constructs
+    (fixes #22881).
+  * Applied Jeremy Allison's patch (posted to the samba-ntdom mailing
+    list) that solves a problem with username maps (the Samba Team did
+    not catch this problem before final 1.9.18p8).
+  * Made /etc/init.d/samba to print out a warning when Samba is running
+    from inetd and the user runs /etc/init.d/samba to start|stop|restart
+    Samba (there's no point on doing this because inetd will start the
+    daemons again when there is traffic on UDP port 137-139).
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 13 Jun 1998 00:18:25 -0400
+
+samba (1.9.18p7-4) frozen unstable; urgency=medium
+
+  * Fixes the serious problem of having the WINS name server
+    database getting deleted at boot time. That happened because the
+    WINS database was being stored under /var/lock/samba/ and all files
+    under /var/lock/ are deleted at boot time. The place where the WINS
+    database is stored was moved to /var/samba/.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 18 May 1998 20:24:29 -0400
+
+samba (1.9.18p7-3) stable; urgency=high
+
+  * Libc5 version for Bo (stable) that fixes the recently reported
+    security hole.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 18 May 1998 20:19:33 -0400
+
+samba (1.9.18p7-2) frozen unstable; urgency=low
+
+  * Added patches from the non-mantainer upload that make us able
+    to compile Samba on Alpha systems. This fixes bug #22379.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 13 May 1998 20:38:51 -0400
+
+samba (1.9.18p7-1) frozen unstable; urgency=low
+
+  * New upstream release (just bug fixes, no new functionality).
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 13 May 1998 11:47:32 -0400
+
+samba (1.9.18p6-2) frozen unstable; urgency=low
+
+  * Uploaded to frozen (I forgot to upload last version to frozen
+    so it got installed only in unstable).
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 12 May 1998 18:10:17 -0400
+
+samba (1.9.18p6-1.1) unstable; urgency=low
+
+  * non-maintainer upload for Alpha
+  * patch needed for source/quota.c (_syscall4() confusion)
+
+ -- Paul Slootman <paul@debian.org>  Tue, 12 May 1998 20:39:13 +0200
+
+samba (1.9.18p6-1) unstable; urgency=low
+
+  * New upstream release that fixes a possible buffer overflow.
+    This security hole was reported on BugTraq by Drago. The
+    previous Debian version (1.9.18p5-1) was not released because
+    1.9.18p5 and 1.9.18p6 were released very closely.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 11 May 1998 20:28:33 -0400
+
+samba (1.9.18p5-1) unstable; urgency=low
+
+  * New upstream release (no new funcionality, just bug fixes - see 
+    /usr/doc/samba/WHATSNEW.txt.gz).
+  * Backed off Debian patches that were added upstream.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 11 May 1998 08:43:53 -0400
+
+samba (1.9.18p4-2) frozen unstable; urgency=low
+
+  * Patched smbclient(1) man page to not reference the unsopported
+    -A parameter (fixes #6863).
+  * Changes to start nmbd with the -a option (in /etc/init.d/samba
+    and in the entry added to /etc/inetd.conf).
+  * Fixed typo in sample smb.conf (fixes #21484).
+  * Fixed yet another typo in sample smb.conf (fixes #21447).
+  
+ -- Eloy A. Paris <peloy@debian.org>  Fri, 17 Apr 1998 22:19:23 -0400
+
+samba (1.9.18p4-1) frozen unstable; urgency=low
+
+  * New upstream version that fixes several bugs.
+  * New scheme for keeping track of Debian specific configuration.
+    This new scheme fixes bug #18624 (Samba always asks the user about
+    configuration options). New scheme stores Debian specific
+    configuration information in /etc/samba/debian_config.
+  * Changes to /usr/sbin/sambaconfig, prerm and postinst to support the 
+    new configuration scheme.
+  * Moved required kernel 2.1.x include files inside the source tree
+    so I don't have to do very nasty things like creating crazy
+    symlinks in /usr/include to make this package compile. This
+    allows non-root users to build the package and fixes bug
+    #20104.
+  * Fixed address of the FSF in /usr/doc/samba/copyright (problem
+    reported by lintian).
+  * The /etc/init.d/samba script now supports the force-reload
+    argument, as required by the policy (problem reported by lintian).
+  * Added a "rm /etc/cron.weekly/samba" at the end of the postinst.
+  * Now the samba package can be installed even if no nmbd or smbd processes 
+    are running. This fixes the following bugs: #8917, #9334, #10268, 
+    #10411, #11146 and #13387.
+  * Provides the original README in /usr/doc/samba. This fixes bug #9693.
+  * Added a --no-reload option to sambaconfig to not reload Samba
+    after configuration.
+  * Created man pages for sambaconfig(8), addtosmbpass(8),
+    mksmbpasswd(8) and nmblookup(1).
+  * Corrected small typo in sample /etc/smb.conf.
+  * Added two new parameters to /etc/smb.conf: "preserver case" and
+    "short preserve case".
+  * "rm -Rf /var/lock/samba" in postrm when package is being purged.
+  * Patched upstream source (nmbd.c) to not overwrite log files when
+    nmbd is called with the -a parameter (fixes #17704: nmbd ignores
+    -a option).
+  * /etc/init.d/samba now starts the nmbd daemon with the -a parameter
+    to not overwrite log files.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 23 Mar 1998 21:22:03 -0400
+
+samba (1.9.18p3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Oppsss!!! I really screwed it up (actually, debstd did).
+    1.9.18p2-2 still contained man pages (smbmount and smbumount) part
+    of other packages. This version does have this corrected. If not,
+    I no longer deserve to be a Debian developer! So, this version
+    fixes bug #18438 and some of the bugs I claimed to fix in
+    1.9.18p2-2. Oh, by the way, I fixed the problem by running debstd
+    with -m in debian/rules (man pages are installed by "make install"
+    so it's a bad idea to re-install man pages with debstd).
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon, 23 Feb 1998 17:32:42 -0400
+
+samba (1.9.18p2-2) unstable; urgency=low
+
+  * Fixes bugs #18017, #17999, #17961, #17932: old 1.9.18p2-1 provided
+    a man page for smbmount, which conflicts with package smbfs. This
+    was solved by creating a multi-binary package that produces
+    package samba and new package smbfsx.
+  * Fixes bug #18000 (typo in postinst).
+  * Fixes bug #17958 (postinst asks obsolete question). Actually,
+    the question is still asked, but only if Samba is run as daemons.
+  * Created a multi-binary package from the Samba sources: package
+    samba and new package smbfsx which provides SMB mount utilities
+    for kernels > 2.1.70.
+
+ -- Eloy A. Paris <peloy@debian.org>  Mon,  9 Feb 1998 19:47:05 -0400
+
+samba (1.9.18p2-1) unstable; urgency=low
+
+  * New upstream version.
+  * Removed /etc/cron.weekly/samba because Samba does not handle well
+    rotation of log files (if the log file is rotated Samba will
+    continue to log to the rotated file, instead of the just created
+    one). In any case, Samba will rotate log files after an specific
+    file size.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 27 Jan 1998 22:34:27 -0400
+
+samba (1.9.18p1-2) unstable; urgency=low
+
+  * Created a multi-binary package out of the Samba sources to provide
+    packages samba and smbfsx (userland utilities to work with
+    smbfs with kernels > 2.1.x.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sat, 17 Jan 1998 09:23:48 -0400
+
+samba (1.9.18p1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Created /etc/cron.daily/samba to save a copy of /etc/smbpasswd in
+    /var/backups/smbpasswd.bak.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 14 Jan 1998 13:40:56 -0400
+
+samba (1.9.18alpha14-1) unstable; urgency=low
+
+  * New upstream version.
+  * Added a note to the postinst script telling the user that he/she
+    needs to run smbpasswd manually after creating a new /etc/smbpasswd
+    from /etc/passwd.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 23 Dec 1997 23:44:37 -0400
+
+samba (1.9.18alpha13-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 16 Dec 1997 13:02:32 -0400
+
+samba (1.9.18alpha12-1) unstable; urgency=low
+
+  * New upstream version.
+  * Conflicts with the sambades package because the new Samba 1.9.18
+    series do not depend on the DES libraries to support encrypted
+    passwords.
+  * Added parameter "encrypt passwords = yes" to /etc/smb.conf.
+  * Compiled with support for quotas in disk_free().
+  * Home directories are now exported read only by default.
+  * Re-worked debian/rules.
+  * Re-worked sample smb.conf.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu,  4 Dec 1997 22:50:34 -0400
+
+samba (1.9.17p4-1) unstable; urgency=low
+
+  * New upstream version.
+  * Made /etc/smb.conf readable by everybody because some Samba utilities
+    will fail otherwise when run by non-root users.
+  * Dropped PAM support while the PAM libraries are ported to libc6.
+
+ -- Eloy A. Paris <peloy@debian.org>  Tue, 21 Oct 1997 18:08:49 -0400
+
+samba (1.9.17p3-1) unstable; urgency=low
+
+  * New upstream version.
+  * Made /etc/smb.conf readable only by root as suggested by smbd's man page.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 15 Oct 1997 09:21:25 -0400
+
+samba (1.9.17p2-2) unstable; urgency=low
+
+  * Running Samba as daemons instead of from inetd.
+  * Removing netbios entries in /etc/inetd.conf.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 9 Oct 1997 23:37:25 -0400
+
+samba (1.9.17p2-1) unstable; urgency=low
+
+  * New upstream version that fixes a serious security hole.
+  * Removed Debian patches added in 1.9.17-1 and 1.9.17p1-1 because
+    these patches are now part of the upstream release.
+
+ -- Eloy A. Paris <peloy@debian.org>  Sun, 28 Sep 1997 22:54:33 -0400
+
+samba (1.9.17p1-1) unstable; urgency=low
+
+  * New upstream version.
+  * Defined symbol _LINUX_C_LIB_VERSION_MAJOR as 6 in includes.h to shut up
+    compiler warnings.
+  * Included rpcsvc/ypclnt.h in includes.h to shut up compiler warnings.
+  * Included crypt.h to have function prototype for crypt().
+  * Included netinet/tcp.h to have some socket options included.
+  * Included netinet/ip.h to have some socket options included.
+  * Linking with libcrypt (LIBM='... -lcrypt'). Without including this
+    library smbd generates a seg. fault when authenticating users (?).
+
+ -- Eloy A. Paris <debian.org>  Wed, 10 Sep 1997 22:09:18 -0400
+
+samba (1.9.17-1) unstable; urgency=low
+
+  * New upstream version (called the "Browse Fix Release")
+  * Added the option --oknodo to the start-stop-daemon invocation in prerm
+    script. This was because the prerm was failing because start-stop-daemon
+    was returning an error code if no nmbd or smbd daemons were found
+    to kill.
+  * The function yp_get_default_domain(), referenced in three source
+    files was part of libc5 but with libc6 (glibc2) it has been moved
+    to libnss_nis. Since the linker was unable to find the function
+    I had to add LIBSM='-lnss_nis' to debian/rules.
+  * Added -DNO_ASMSIGNALH and -DGLIBC2 to FLAGSM in debian/rules
+    because compiling was failing because of conflicts with glibc2.
+  * Patched source/includes.h to include termios.h if GLIBC2 is defined.
+
+ -- Eloy A. Paris <peloy@debian.org>  Wed, 27 Aug 1997 08:39:32 -0400
+
+samba (1.9.17alpha5-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Eloy A. Paris <peloy@debian.org>  Thu, 14 Aug 1997 18:05:02 -0400
+
+samba (1.9.16p11-3) unstable; urgency=low
+
+  * Fixed accidental omission of /etc/pam.d/samba.
+
+ -- Klee Dienes <klee@debian.org>  Sat, 15 Mar 1997 22:31:26 -0500
+
+samba (1.9.16p11-2) unstable; urgency=low
+
+  * Recompiled against newer PAM libraries.
+  * Added /etc/pam.d/samba.
+
+ -- Klee Dienes <klee@debian.org>  Sat, 8 Mar 1997 01:16:28 -0500
+
+samba (1.9.16p11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Added PAM support.
+
+ -- Klee Dienes <klee@debian.org>  Tue, 25 Feb 1997 18:00:12 -0500
+
+samba (1.9.16p9-2) unstable; urgency=low
+
+  * minor packaging changes
+
+ -- Klee Dienes <klee@sauron.sedona.com>  Sun, 3 Nov 1996 11:45:37 -0700
+
+samba (1.9.16p9-1) unstable; urgency=low
+
+  * upgraded to new upstream version
+
+ -- Klee Dienes <klee@sauron.sedona.com>  Sat, 26 Oct 1996 21:38:20 -0700
+
+1.9.16alpha10-1:
+ 960714
+ * Removed Package_Revision from control file.
+ * Removed -m486 compiler option.
+ * Added Architecture, Section and Priority fields to control file.
+ * Upgraded to latest upstream version.
+ * Uses update-inetd now.
+ * Added shadow passwords support.
+ * Fixed Bug#1946: nmbd won't browse
+
+1.9.15p4-1:
+ 951128
+ * Upgraded to latest upstream version.
+   * Fixed many bugs.
+   * Adds Master Browsing support.
+ * Converted to ELF.
+ * Fixed bug #1825 - nmbd is now killed when removing samba.
+
+1.9.14-1:
+ 950926 Andrew Howell <andrew@it.com.au>
+ * Upgraded to latest version.
+ * Fixed Bug #1139 - samba won't print
+
+1.9.14alpha5-1:
+ * Fixes killing of inetd problem in debian.postint and debian.postrm 
+
+1.9.14alpha5-0:
+ 950704 Andrew Howell <andrew@it.com.au>
+ * Taken over samba package from Bruce Perens.
+ * Upgraded to newest version of samba.
+
+1.9.02-1:
+ 9-January-1994 Bruce Perens <Bruce@Pixar.com>
+ * Added Debian GNU/Linux package maintenance system files, and
+   configured for Debian systems.
diff --git a/packaging/Debian/debian/config.cache b/packaging/Debian/debian/config.cache
new file mode 100644
index 0000000000..c0a70a5b19
--- /dev/null
+++ b/packaging/Debian/debian/config.cache
@@ -0,0 +1,231 @@
+#
+# 22 August 2001  Steve Langasek <vorlon@debian.org>
+#
+# This file is a shell script that caches the results of configure
+# tests run on this system so they can be shared between configure
+# scripts and configure runs.  It is not useful on other systems.
+# If it contains results you don't want to keep, you may remove or edit it.
+#
+# By default, configure uses ./config.cache as the cache file,
+# creating it if it does not exist already.  You can give configure
+# the --cache-file=FILE option to use a different cache file; that is
+# what configure does when it calls configure scripts in
+# subdirectories, so they share the cache.
+# Giving --cache-file=/dev/null disables caching, for debugging configure.
+# config.status only pays attention to the cache file if you give it the
+# --recheck option to rerun configure.
+#
+#
+# This config.cache file contains a list of acceptable autoconf
+# values which can be used in compiling Samba for Debian woody/sid.
+#
+# Autoconf sorts options alphabetically in its output.  This file
+# groups options logically.
+
+
+# Load any architecture-specific settings
+if [ -n "$DEB_HOST_GNU_TYPE" \
+     -a -f ../debian/config.cache.${DEB_HOST_GNU_TYPE} ]; then
+	. ../debian/config.cache.${DEB_HOST_GNU_TYPE}
+fi
+
+
+# This is at the top because it's most in need of regular tweaking.
+# These are options which are supported on 2.4 kernels, but not on 2.2
+# kernels.
+
+samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=${samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=no}
+samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=${samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=no}
+samba_cv_HAVE_KERNEL_SHARE_MODES=${samba_cv_HAVE_KERNEL_SHARE_MODES=no}
+
+
+# These are present in 2.2 kernels, but not in 2.0...
+
+samba_cv_have_setresuid=${samba_cv_have_setresuid=yes}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=yes}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=yes}
+
+
+# POSIX ACL support not present in Linux 2.2; not allowed in the
+# Debian packages, even if present on the build machine.
+
+ac_cv_header_sys_acl_h=${ac_cv_header_sys_acl_h=no}
+
+
+# Various basic libc/compiler stuff that it's blindingly obvious that
+# Linux supports (now watch me get bitten for saying that)
+
+ac_cv_c_const=${ac_cv_c_const=yes}
+ac_cv_c_inline=${ac_cv_c_inline=inline}
+samba_cv_volatile=${samba_cv_volatile=yes}
+ac_cv_dirent_d_off=${ac_cv_dirent_d_off=yes}
+ac_cv_func_bzero=${ac_cv_func_bzero=yes}
+ac_cv_func_chmod=${ac_cv_func_chmod=yes}
+ac_cv_func_chown=${ac_cv_func_chown=yes}
+ac_cv_func_chroot=${ac_cv_func_chroot=yes}
+ac_cv_func_connect=${ac_cv_func_connect=yes}
+ac_cv_func_dup2=${ac_cv_func_dup2=yes}
+ac_cv_func_execl=${ac_cv_func_execl=yes}
+ac_cv_func_fchmod=${ac_cv_func_fchmod=yes}
+ac_cv_func_fchown=${ac_cv_func_fchown=yes}
+ac_cv_func_fstat=${ac_cv_func_fstat=yes}
+ac_cv_func_fsync=${ac_cv_func_fsync=yes}
+ac_cv_func_ftruncate=${ac_cv_func_ftruncate=yes}
+ac_cv_func_getcwd=${ac_cv_func_getcwd=yes}
+ac_cv_func_getgrent=${ac_cv_func_getgrent=yes}
+ac_cv_func_getgrnam=${ac_cv_func_getgrnam=yes}
+ac_cv_func_getspnam=${ac_cv_func_getspnam=yes}
+ac_cv_func_glob=${ac_cv_func_glob=yes}
+ac_cv_func_grantpt=${ac_cv_func_grantpt=yes}
+ac_cv_func_initgroups=${ac_cv_func_initgroups=yes}
+ac_cv_func_llseek=${ac_cv_func_llseek=yes}
+ac_cv_func_memcmp_clean=${ac_cv_func_memcmp_clean=yes}
+ac_cv_func_memmove=${ac_cv_func_memmove=yes}
+ac_cv_func_memset=${ac_cv_func_memset=yes}
+ac_cv_func_mktime=${ac_cv_func_mktime=yes}
+ac_cv_func_pipe=${ac_cv_func_pipe=yes}
+ac_cv_func_poll=${ac_cv_func_poll=yes}
+ac_cv_func_pread=${ac_cv_func_pread=yes}
+ac_cv_func_pwrite=${ac_cv_func_pwrite=yes}
+ac_cv_func_rand=${ac_cv_func_rand=yes}
+ac_cv_func_random=${ac_cv_func_random=yes}
+ac_cv_func_readlink=${ac_cv_func_readlink=yes}
+ac_cv_func_rename=${ac_cv_func_rename=yes}
+ac_cv_func_select=${ac_cv_func_select=yes}
+ac_cv_func_setenv=${ac_cv_func_setenv=yes}
+ac_cv_func_setgroups=${ac_cv_func_setgroups=yes}
+ac_cv_func_setsid=${ac_cv_func_setsid=yes}
+ac_cv_func_sigaction=${ac_cv_func_sigaction=yes}
+ac_cv_func_sigblock=${ac_cv_func_sigblock=yes}
+ac_cv_func_sigprocmask=${ac_cv_func_sigprocmask=yes}
+ac_cv_func_snprintf=${ac_cv_func_snprintf=yes}
+ac_cv_func_srand=${ac_cv_func_srand=yes}
+ac_cv_func_srandom=${ac_cv_func_srandom=yes}
+ac_cv_func_strcasecmp=${ac_cv_func_strcasecmp=yes}
+ac_cv_func_strchr=${ac_cv_func_strchr=yes}
+ac_cv_func_strdup=${ac_cv_func_strdup=yes}
+ac_cv_func_strerror=${ac_cv_func_strerror=yes}
+ac_cv_func_strftime=${ac_cv_func_strftime=yes}
+ac_cv_func_strpbrk=${ac_cv_func_strpbrk=yes}
+ac_cv_func_strtoul=${ac_cv_func_strtoul=yes}
+ac_cv_func_symlink=${ac_cv_func_symlink=yes}
+ac_cv_func_usleep=${ac_cv_func_usleep=yes}
+ac_cv_func_utime=${ac_cv_func_utime=yes}
+ac_cv_func_utimes=${ac_cv_func_utimes=yes}
+ac_cv_func_vsnprintf=${ac_cv_func_vsnprintf=yes}
+ac_cv_func_waitpid=${ac_cv_func_waitpid=yes}
+ac_cv_type_ino_t=${ac_cv_type_ino_t=yes}
+ac_cv_type_mode_t=${ac_cv_type_mode_t=yes}
+ac_cv_type_pid_t=${ac_cv_type_pid_t=yes}
+ac_cv_type_size_t=${ac_cv_type_size_t=yes}
+ac_cv_type_uid_t=${ac_cv_type_uid_t=yes}
+samba_cv_socklen_t=${samba_cv_socklen_t=yes}
+
+# Yes, we know Linux supports fcntl locking.  Just ignore
+# any errors caused by building on an NFS mount.
+samba_cv_HAVE_FCNTL_LOCK=${samba_cv_HAVE_FCNTL_LOCK=yes}
+
+
+# smbwrapper doesn't work because the glibc maintainers don't want
+# to support transparent userland VFS.  We might as well preempt
+# any checks for shadowed symbols that are only useful for smbwrapper.
+
+ac_cv_func___acl=${ac_cv_func___acl=no}
+ac_cv_func__acl=${ac_cv_func__acl=no}
+ac_cv_func___chdir=${ac_cv_func___chdir=no}
+ac_cv_func__chdir=${ac_cv_func__chdir=no}
+ac_cv_func___close=${ac_cv_func___close=no}
+ac_cv_func__close=${ac_cv_func__close=no}
+ac_cv_func___closedir=${ac_cv_func___closedir=no}
+ac_cv_func__closedir=${ac_cv_func__closedir=no}
+ac_cv_func___dup=${ac_cv_func___dup=no}
+ac_cv_func__dup=${ac_cv_func__dup=no}
+ac_cv_func___dup2=${ac_cv_func___dup2=no}
+ac_cv_func__dup2=${ac_cv_func__dup2=no}
+ac_cv_func___facl=${ac_cv_func___facl=no}
+ac_cv_func__facl=${ac_cv_func__facl=no}
+ac_cv_func___fchdir=${ac_cv_func___fchdir=no}
+ac_cv_func__fchdir=${ac_cv_func__fchdir=no}
+ac_cv_func___fcntl=${ac_cv_func___fcntl=no}
+ac_cv_func__fcntl=${ac_cv_func__fcntl=no}
+ac_cv_func___fork=${ac_cv_func___fork=no}
+ac_cv_func__fork=${ac_cv_func__fork=no}
+ac_cv_func___fstat=${ac_cv_func___fstat=no}
+ac_cv_func__fstat=${ac_cv_func__fstat=no}
+ac_cv_func___fstat64=${ac_cv_func___fstat64=no}
+ac_cv_func__fstat64=${ac_cv_func__fstat64=no}
+ac_cv_func___fxstat=${ac_cv_func___fxstat=no}
+ac_cv_func___getcwd=${ac_cv_func___getcwd=no}
+ac_cv_func__getcwd=${ac_cv_func__getcwd=no}
+ac_cv_func___getdents=${ac_cv_func___getdents=no}
+ac_cv_func__getdents=${ac_cv_func__getdents=no}
+ac_cv_func___llseek=${ac_cv_func___llseek=no}
+ac_cv_func___sys_llseek=${ac_cv_func___sys_llseek=no}
+ac_cv_func__llseek=${ac_cv_func__llseek=no}
+ac_cv_func___lseek=${ac_cv_func___lseek=no}
+ac_cv_func__lseek=${ac_cv_func__lseek=no}
+ac_cv_func___lstat=${ac_cv_func___lstat=no}
+ac_cv_func__lstat=${ac_cv_func__lstat=no}
+ac_cv_func___lstat64=${ac_cv_func___lstat64=no}
+ac_cv_func__lstat64=${ac_cv_func__lstat64=no}
+ac_cv_func___lxstat=${ac_cv_func___lxstat=no}
+ac_cv_func___open=${ac_cv_func___open=no}
+ac_cv_func__open=${ac_cv_func__open=no}
+ac_cv_func___open64=${ac_cv_func___open64=no}
+ac_cv_func__open64=${ac_cv_func__open64=no}
+ac_cv_func___opendir=${ac_cv_func___opendir=no}
+ac_cv_func__opendir=${ac_cv_func__opendir=no}
+ac_cv_func___pread=${ac_cv_func___pread=no}
+ac_cv_func__pread=${ac_cv_func__pread=no}
+ac_cv_func___pread64=${ac_cv_func___pread64=no}
+ac_cv_func__pread64=${ac_cv_func__pread64=no}
+ac_cv_func___pwrite=${ac_cv_func___pwrite=no}
+ac_cv_func__pwrite=${ac_cv_func__pwrite=no}
+ac_cv_func___pwrite64=${ac_cv_func___pwrite64=no}
+ac_cv_func__pwrite64=${ac_cv_func__pwrite64=no}
+ac_cv_func___read=${ac_cv_func___read=no}
+ac_cv_func__read=${ac_cv_func__read=no}
+ac_cv_func___readdir=${ac_cv_func___readdir=no}
+ac_cv_func__readdir=${ac_cv_func__readdir=no}
+ac_cv_func___readdir64=${ac_cv_func___readdir64=no}
+ac_cv_func__readdir64=${ac_cv_func__readdir64=no}
+ac_cv_func___seekdir=${ac_cv_func___seekdir=no}
+ac_cv_func__seekdir=${ac_cv_func__seekdir=no}
+ac_cv_func___stat=${ac_cv_func___stat=no}
+ac_cv_func__stat=${ac_cv_func__stat=no}
+ac_cv_func___stat64=${ac_cv_func___stat64=no}
+ac_cv_func__stat64=${ac_cv_func__stat64=no}
+ac_cv_func___telldir=${ac_cv_func___telldir=no}
+ac_cv_func__telldir=${ac_cv_func__telldir=no}
+ac_cv_func___write=${ac_cv_func___write=no}
+ac_cv_func__write=${ac_cv_func__write=no}
+ac_cv_func___xstat=${ac_cv_func___xstat=no}
+
+
+
+# Miscellaneous stuff that isn't, and shouldn't be, available
+# in Debian.  Those interested in building debs for other systems may
+# need to remove some of these defines.
+
+ac_cv_func_bigcrypt=${ac_cv_func_bigcrypt=no}
+ac_cv_func_crypt16=${ac_cv_func_crypt16=no}
+ac_cv_func_getauthuid=${ac_cv_func_getauthuid=no}
+ac_cv_func_getprpwnam=${ac_cv_func_getprpwnam=no}
+ac_cv_func_getpwanam=${ac_cv_func_getpwanam=no}
+ac_cv_func_putprpwnam=${ac_cv_func_putprpwnam=no}
+ac_cv_func_rdchk=${ac_cv_func_rdchk=no}
+ac_cv_func_set_auth_parameters=${ac_cv_func_set_auth_parameters=no}
+ac_cv_func_setgidx=${ac_cv_func_setgidx=no}
+ac_cv_func_setluid=${ac_cv_func_setluid=no}
+ac_cv_func_setpriv=${ac_cv_func_setpriv=no}
+ac_cv_func_setuidx=${ac_cv_func_setuidx=no}
+ac_cv_lib_sec_bigcrypt=${ac_cv_lib_sec_bigcrypt=no}
+ac_cv_lib_sec_getprpwnam=${ac_cv_lib_sec_getprpwnam=no}
+ac_cv_lib_sec_getspnam=${ac_cv_lib_sec_getspnam=no}
+ac_cv_lib_sec_putprpwnam=${ac_cv_lib_sec_putprpwnam=no}
+ac_cv_lib_sec_set_auth_parameters=${ac_cv_lib_sec_set_auth_parameters=no}
+ac_cv_lib_security_bigcrypt=${ac_cv_lib_security_bigcrypt=no}
+ac_cv_lib_security_getprpwnam=${ac_cv_lib_security_getprpwnam=no}
+ac_cv_lib_security_getspnam=${ac_cv_lib_security_getspnam=no}
+ac_cv_lib_security_putprpwnam=${ac_cv_lib_security_putprpwnam=no}
+ac_cv_lib_security_set_auth_parameters=${ac_cv_lib_security_set_auth_parameters=no}
diff --git a/packaging/Debian/debian/config.cache.alpha-linux b/packaging/Debian/debian/config.cache.alpha-linux
new file mode 100644
index 0000000000..6d17192026
--- /dev/null
+++ b/packaging/Debian/debian/config.cache.alpha-linux
@@ -0,0 +1,12 @@
+# 22 Aug 2001  Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the alpha-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Alpha doesn't have a functional setresgid() call, but
+# Linux 2.4 does.  Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian/config.cache.sparc-linux b/packaging/Debian/debian/config.cache.sparc-linux
new file mode 100644
index 0000000000..a2a21b1d3a
--- /dev/null
+++ b/packaging/Debian/debian/config.cache.sparc-linux
@@ -0,0 +1,13 @@
+# 24 Spe 2001  Steve Langasek <vorlon@debian.org>
+
+# This file contains autoconf settings specific to the sparc-linux
+# platform that should be preloaded when building for this architecture.
+
+
+# Linux 2.2 on Sparc doesn't have setresgid() or setresuid(), but
+# Linux 2.4 does.  Ensure that packages compiled for woody remain
+# compatible with 2.2 kernels, even if the build machine is running 2.4.
+samba_cv_have_setresuid=${samba_cv_have_setresuid=no}
+samba_cv_have_setresgid=${samba_cv_have_setresgid=no}
+samba_cv_USE_SETRESUID=${samba_cv_USE_SETRESUID=no}
+samba_cv_USE_SETREUID=${samba_cv_USE_SETREUID=yes}
diff --git a/packaging/Debian/debian/control b/packaging/Debian/debian/control
new file mode 100644
index 0000000000..2054da9f18
--- /dev/null
+++ b/packaging/Debian/debian/control
@@ -0,0 +1,151 @@
+Source: samba
+Section: net
+Priority: optional
+Maintainer: Eloy A. Paris <peloy@debian.org>
+Uploaders: Steve Langasek <vorlon@debian.org>
+Build-Depends: debhelper (>=2.0.103), libpam0g-dev, libreadline4-dev, libcupsys2-dev
+Standards-Version: 3.1.1
+
+Package: samba
+Architecture: any
+Depends: samba-common (= ${Source-Version}), netbase, logrotate, ${shlibs:Depends}
+Replaces: samba-common (<= 2.0.5a-2)
+Suggests: samba-doc
+Description: A LanManager like file and printer server for Unix.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the components necessary to turn your
+ Debian GNU/Linux box into a powerful file and printer server.
+ .
+ As of Samba 2.2.1a-3, the Samba Debian packages consist of the following:
+ .
+  samba - A LanManager like file and printer server for Unix.
+  samba-common - Samba common files used by both the server and the client.
+  smbclient - A LanManager like simple client for Unix.
+  swat - Samba Web Administration Tool
+  samba-doc - Samba documentation.
+  smbfs - Mount and umount commands for the smbfs (kernels 2.0.x and above).
+  libpam-smbpass - pluggable authentication module for SMB password database
+  libsmbclient - Shared library that allows applications to talk to SMB servers
+  libsmbclient-dev - libsmbclient shared libraries
+
+Package: samba-common
+Architecture: any
+Depends: libpam-modules, ${shlibs:Depends}
+Replaces: samba (<= 2.0.5a-2)
+Description: Samba common files used by both the server and the client.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the common files that are used by both the server
+ (provided in the samba package) and the client (provided in the smbclient
+ package).
+
+Package: smbclient
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: samba (<= 2.2.2-5)
+Provides: samba-client
+Suggests: smbfs
+Description: A LanManager like simple client for Unix.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains some client components of the Samba suite. In
+ particular it includes the command line utilities smbclient, smbtar,
+ and smbspool. If you want to mount shares exported from Microsoft
+ Windows machines or a Samba server you must install the smbfs package.
+
+Package: swat
+Architecture: any
+Depends: samba (= ${Source-Version}), ${shlibs:Depends}
+Recommends: samba-doc
+Description: Samba Web Administration Tool
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains the components of the Samba suite that are needed
+ for Web administration of the Samba server.
+
+Package: samba-doc
+Section: doc
+Architecture: all
+Description: Samba documentation.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or NetBIOS protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball.
+
+Package: smbfs
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Suggests: smbclient
+Replaces: smbfsx
+Conflicts: smbfsx, suidmanager (<< 0.50)
+Description: mount and umount commands for the smbfs (for kernels >= than 2.2.x)
+ Smbfs is a filesystem which understands the SMB protocol.
+ This is the protocol Windows for Workgroups, Windows NT or
+ LAN Manager use to talk to each other. It was inspired by
+ samba, the program by Andrew Tridgell that turns any unix
+ site into a file server for DOS or Windows clients.
+ .
+ If you want to use command-line utilities like smbclient, smbtar
+ and/or smbspool just need to install the smbclient package.
+ .
+ Starting with the Debian Samba packages version 2.2.0-1, the old smbfs
+ utilities for 2.0.x have been removed. There are no wrapper scripts
+ that call a specific smbmount/smbmount depending on the kernel version.
+ If you are using a 2.0.x kernel please upgrade or use the latest Samba
+ 2.0.7 Debian package.
+
+Package: libpam-smbpass
+Section: admin
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Suggests: samba
+Description: pluggable authentication module for SMB password database
+ This is a stackable PAM module that allows a system administrator to easily
+ migrate to using encrypted passwords for Samba and to keep smb passwords in
+ sync with unix passwords.  Unlike other solutions, it does this without
+ requiring users to change their existing passwords or login to Samba using
+ cleartext passwords.
+
+Package: libsmbclient
+Section: libs
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Shared library that allows applications to talk to SMB servers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient shared library.
+
+Package: libsmbclient-dev
+Section: devel
+Priority: extra
+Architecture: any
+Depends: libsmbclient (= ${Source-Version}), ${shlibs:Depends}
+Description: libsmbclient static libraries and headers
+ libsmbclient allows to write applications that use the SMB protocol.
+ This gives applications the ability to talk to Microsoft Windows servers
+ and Unix servers running Samba.
+ .
+ This package contains the libsmbclient static libraries and headers
+ needed to build applications that use SMB services.
diff --git a/packaging/Debian/debian/control.smbwrapper b/packaging/Debian/debian/control.smbwrapper
new file mode 100644
index 0000000000..70444ca5f5
--- /dev/null
+++ b/packaging/Debian/debian/control.smbwrapper
@@ -0,0 +1,111 @@
+Source: samba
+Section: net
+Priority: optional
+Maintainer: Eloy A. Paris <peloy@debian.org>
+Standards-Version: 2.4.0.0
+
+Package: samba
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: samba-common (<= 2.0.5a-2)
+Suggests: samba-doc
+Description: A LanManager like file and printer server for Unix.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains all the components necessary to turn your
+ Debian GNU/Linux box into a powerful file and printer server.
+ .
+ As of Samba 2.0.0, the Samba Debian packages consist of the following:
+ .
+ samba - A LanManager like file and printer server for Unix.
+ samba-common - Samba common files used by both the server and the client.
+ smbclient - A LanManager like simple client for Unix.
+ swat - Samba Web Administration Tool
+ samba-doc - Samba documentation.
+ smbfsx - Mount and umount commands for the smbfs and kernels > 2.1.70.
+ smbwrapper - A shared library that provides SMB client services
+
+Package: samba-common
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: samba (<= 2.0.5a-2)
+Description: Samba common files used by both the server and the client.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains the common files that are used by both the server
+ (provided in the samba package) and the client (provided in the smbclient
+ package).
+
+Package: smbclient
+Architecture: any
+Depends: samba-common (= ${Source-Version}), ${shlibs:Depends}
+Description: A LanManager like simple client for Unix.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains the client components of the Samba suite.
+
+Package: swat
+Architecture: any
+Depends: samba, ${shlibs:Depends}
+Description: Samba Web Administration Tool
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains the components of the Samba suite that are needed
+ for Web administration fo the Samba server.
+
+Package: samba-doc
+Architecture: all
+Description: Samba documentation.
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains all the documentation that comes in the original
+ tarball.
+
+Package: smbfs
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: netbase (>= 2.02), samba-common (= ${Source-Version}), ${shlibs:Depends}
+Replaces: smbfsx
+Conflicts: smbfsx
+Description: Mount and umount commands for the smbfs (2.0.x and 2.1.x kernels)
+ Smbfs is a filesystem which understands the SMB protocol.
+ This is the protocol Windows for Workgroups, Windows NT or
+ Lan Manager use to talk to each other. It was inspired by
+ samba, the program by Andrew Tridgell that turns any unix
+ site into a file server for DOS or Windows clients.
+ .
+ Starting with the Debian Samba packages version 2.0.4b-2, the old smbfs
+ utilities for 2.0.x and the new smbfs utilities for 2.2.x kernels have been
+ merged in a single package called smbfs. A wrapper script called smbmount.sh
+ identifies the version of the kernel running and calls the correct binary.
+
+Package: smbwrapper
+Section: otherosfs
+Priority: optional
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: A shared library that provides SMB client services
+ The Samba software suite is a collection of programs that
+ implements the SMB protocol for unix systems, allowing you to serve
+ files and printers to Windows, NT, OS/2 and DOS clients. This protocol
+ is sometimes also referred to as the LanManager or Netbios protocol.
+ .
+ This package contains prelodable shared library that provides SMB client 
+ services for existing executables. Using this you can simulate a smb
+ filesystem.
diff --git a/packaging/Debian/debian/copyright b/packaging/Debian/debian/copyright
new file mode 100644
index 0000000000..95bac89a54
--- /dev/null
+++ b/packaging/Debian/debian/copyright
@@ -0,0 +1,36 @@
+This is the Debian Linux prepackaged version of the Samba SMB
+(LAN-Manager) server. Samba was written by Andrew Tridgell
+<Andrew.Tridgell@anu.edu.au> and many others.
+
+This package was put together by Eloy Paris <peloy@debian.org>
+based on previous work by Klee Dienes <klee@debian.org>, 
+Andrew Howell <andrew@it.com.au> and Bruce Perens <bruce@pixar.com>
+from sources found at <URL:ftp://samba.anu.edu.au/pub/samba>.
+
+As of early in the samba-2.0.0alpha series, the Samba package for Debian
+was split into the following packages:
+
+- samba (the Samba server)
+- smbclient (a LAN Manager client - like the ftp program)
+- swat (Samba Web Administration Tool)
+- smbfs (smbfs userland utilities for kernels > 2.0.x)
+- samba-doc (Samba documentation).
+
+Copyright:
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program;  if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+   MA 02111-1307, USA
+
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/packaging/Debian/debian/libpam-smbpass.files b/packaging/Debian/debian/libpam-smbpass.files
new file mode 100644
index 0000000000..4263df5c0f
--- /dev/null
+++ b/packaging/Debian/debian/libpam-smbpass.files
@@ -0,0 +1 @@
+lib/security/pam_smbpass.so
diff --git a/packaging/Debian/debian/libsmbclient-dev.files b/packaging/Debian/debian/libsmbclient-dev.files
new file mode 100644
index 0000000000..3ca6033fe7
--- /dev/null
+++ b/packaging/Debian/debian/libsmbclient-dev.files
@@ -0,0 +1,2 @@
+usr/lib/libsmbclient.a
+usr/include/libsmbclient.h
diff --git a/packaging/Debian/debian/libsmbclient.files b/packaging/Debian/debian/libsmbclient.files
new file mode 100644
index 0000000000..18b7f3b165
--- /dev/null
+++ b/packaging/Debian/debian/libsmbclient.files
@@ -0,0 +1,2 @@
+usr/lib/libsmbclient.so.0.1
+usr/lib/libsmbclient.so.0
diff --git a/packaging/Debian/debian/libsmbclient.postinst b/packaging/Debian/debian/libsmbclient.postinst
new file mode 100644
index 0000000000..76f61de067
--- /dev/null
+++ b/packaging/Debian/debian/libsmbclient.postinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# postinst script for libsmbclient
+#
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
diff --git a/packaging/Debian/debian/libsmbclient.shlibs b/packaging/Debian/debian/libsmbclient.shlibs
new file mode 100644
index 0000000000..74329f2c08
--- /dev/null
+++ b/packaging/Debian/debian/libsmbclient.shlibs
@@ -0,0 +1 @@
+libsmbclient	0.1	libsmbclient (>= 2.2.2-11)
diff --git a/packaging/Debian/debian/mksmbpasswd.8 b/packaging/Debian/debian/mksmbpasswd.8
new file mode 100644
index 0000000000..0a500102e8
--- /dev/null
+++ b/packaging/Debian/debian/mksmbpasswd.8
@@ -0,0 +1,28 @@
+.TH MKSMBPASSWD 8 12-Apr-1998
+.SH NAME
+mksmbpasswd \- formats a /etc/passwd entry for a smbpasswd file
+.SH SYNOPSIS
+mksmbpasswd cat /etc/passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+.SH DESCRIPTION
+.B mksmbpasswd
+should be used only once, the first time Samba is installed. The idea
+is to ease accounts creation by transferring all user accounts from 
+/etc/passwd to /etc/samba/smbpasswd.
+.PP
+Please note that passwords are not transferred automatically from
+/etc/passwd to the new /etc/samba/smbpasswd file. After running
+.B mksmbpasswd
+all accounts are disabled so the system administrator must run
+smbpasswd for each account that needs to be enable.
+.SH FILES
+.TP
+/etc/passwd
+System wide accounts file
+.TP
+/etc/samba/smbpasswd
+Encrypted passwords file for the Samba daemons
+.SH SEE ALSO
+samba(7), nmbd(8), smbd(8)
+.SH AUTHOR
+Eloy A. Paris <peloy@debian.org> (man page based on sendmailconfig's man page
+by Robert Leslie <rob@mars.org>)
diff --git a/packaging/Debian/debian/mksmbpasswd.awk b/packaging/Debian/debian/mksmbpasswd.awk
new file mode 100644
index 0000000000..a7b41a725d
--- /dev/null
+++ b/packaging/Debian/debian/mksmbpasswd.awk
@@ -0,0 +1,5 @@
+#!/usr/bin/awk -f
+BEGIN {FS=":"
+	printf("#\n# SMB password file.\n#\n")
+	}
+{ printf( "%s:%s:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX:[U          ]:LCT-00000000:%s\n", $1, $3, $5) }
diff --git a/packaging/Debian/debian/patches/Makefile.patch b/packaging/Debian/debian/patches/Makefile.patch
new file mode 100644
index 0000000000..2b28da5c3a
--- /dev/null
+++ b/packaging/Debian/debian/patches/Makefile.patch
@@ -0,0 +1,49 @@
+--- samba-2.2.2.cvs20020120.orig/source/Makefile.in
++++ samba-2.2.2.cvs20020120/source/Makefile.in
+@@ -91,7 +91,7 @@
+ 
+ SPROGS = bin/smbd bin/nmbd bin/swat
+ PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/make_printerdef @RUNPROG@ 
+-PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT@
++PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ @PDBEDIT@ @LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
+ MPROGS = @MPROGS@
+ LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
+ PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup
+@@ -614,13 +614,15 @@
+ 	@echo Linking shared library $@
+ 	@$(SHLD) -32 @LDSHFLAGS@ -o $@ $(PICOBJS32) $(LIBS)
+ 
+-libsmbclient: $(LIBSMBCLIENT_PICOBJS)
+-	@echo Linking libsmbclient shared library bin/$@.@SHLIBEXT@
+-	@$(SHLD) @LDSHFLAGS@ -o  bin/$@.@SHLIBEXT@ \
++bin/libsmbclient.so: $(LIBSMBCLIENT_PICOBJS)
++	@echo Linking libsmbclient shared library $@
++	@$(SHLD) @LDSHFLAGS@ -o  $@ \
+ 		$(LIBSMBCLIENT_PICOBJS) $(LIBS) \
+ 		@SONAMEFLAG@libsmbclient.so.$(LIBSMBCLIENT_MAJOR)
+-	@echo Linking libsmbclient non-shared library bin/$@.a
+-	@-$(AR) -rc bin/$@.a $(LIBSMBCLIENT_PICOBJS)
++
++bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS)
++	@echo Linking libsmbclient non-shared library $@
++	@-$(AR) -rc $@ $(LIBSMBCLIENT_PICOBJS)
+ 
+ bin/smbsh: $(SMBSH_OBJ) bin/.dummy
+ 	@echo Linking $@
+@@ -673,10 +675,12 @@
+ installswat: installdirs
+ 	@$(SHELL) $(srcdir)/script/installswat.sh $(SWATDIR) $(srcdir)
+ 
+-installclientlib:
+-	-$(INSTALLCMD) bin/libsmbclient.so
+-	-$(INSTALLCMD) -d ${prefix}/include
+-	-$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
++installclientlib: bin/libsmbclient.so bin/libsmbclient.a
++	# Installed (in the wrong location, BTW) by installbin above (peloy@debian.org)
++	# -$(INSTALLCMD) bin/libsmbclient.so $(BASEDIR)/lib
++	# -$(INSTALLCMD) bin/libsmbclient.a $(BASEDIR)/lib
++	-$(INSTALLCMD) -d $(INCLUDEDIR)
++	-$(INSTALLCMD) include/libsmbclient.h $(INCLUDEDIR)
+ 
+ # revert to the previously installed version
+ revert:
diff --git a/packaging/Debian/debian/patches/configure.patch b/packaging/Debian/debian/patches/configure.patch
new file mode 100644
index 0000000000..497455120d
--- /dev/null
+++ b/packaging/Debian/debian/patches/configure.patch
@@ -0,0 +1,6044 @@
+--- samba-2.2.2.cvs20020120.orig/source/configure
++++ samba-2.2.2.cvs20020120/source/configure
+@@ -1077,7 +1077,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-for ac_prog in gawk mawk nawk awk
++for ac_prog in mawk gawk nawk awk
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+@@ -1537,6 +1537,47 @@
+ rm -fr conftest*
+ fi
+ 
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++          if test "$cross_compiling" = yes; then
++  LINUX_LFS_SUPPORT=cross
++else
++  cat > conftest.$ac_ext <<EOF
++#line 1546 "configure"
++#include "confdefs.h"
++
++#include <unistd.h>
++#include <sys/types.h>
++#include <fcntl.h>
++main() {
++   unsigned int *padding;
++   struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0};
++   int fd = open("/dev/null", O_RDWR);
++
++   /* Yes, we're depending on the internals of the Linux flock structure
++      here -- but this test is explicitly Linux-specific to begin with. */
++   padding = (unsigned int *)&foo_lock;
++   padding[1] = 0xffffffff;
++   foo_lock.l_start = 0;
++   if (fcntl(fd, F_SETLK, &foo_lock) < 0)
++      exit(1);
++
++   exit(0);
++}
++
++EOF
++if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++then
++  LINUX_LFS_SUPPORT=yes
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -fr conftest*
++  LINUX_LFS_SUPPORT=no
++fi
++rm -fr conftest*
++fi
++
++	fi
+         CPPFLAGS="$old_CPPFLAGS"
+         if test x$LINUX_LFS_SUPPORT = xyes ; then
+           CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
+@@ -1546,14 +1587,14 @@
+ 
+     *hurd*)
+         echo $ac_n "checking for LFS support""... $ac_c" 1>&6
+-echo "configure:1550: checking for LFS support" >&5
++echo "configure:1591: checking for LFS support" >&5
+         old_CPPFLAGS="$CPPFLAGS"
+         CPPFLAGS="-D_LARGEFILE64_SOURCE -D_GNU_SOURCE $CPPFLAGS"
+         if test "$cross_compiling" = yes; then
+   GLIBC_LFS_SUPPORT=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1557 "configure"
++#line 1598 "configure"
+ #include "confdefs.h"
+ 
+ #include <unistd.h>
+@@ -1565,7 +1606,7 @@
+ #endif
+ }
+ EOF
+-if { (eval echo configure:1569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   GLIBC_LFS_SUPPORT=yes
+ else
+@@ -1587,21 +1628,21 @@
+ esac
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:1591: checking for inline" >&5
++echo "configure:1632: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 1598 "configure"
++#line 1639 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1646: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -1627,7 +1668,7 @@
+ esac
+ 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1631: checking how to run the C preprocessor" >&5
++echo "configure:1672: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+@@ -1642,13 +1683,13 @@
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 1646 "configure"
++#line 1687 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1693: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1659,13 +1700,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 1663 "configure"
++#line 1704 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1676,13 +1717,13 @@
+   rm -rf conftest*
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 1680 "configure"
++#line 1721 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   :
+@@ -1707,12 +1748,12 @@
+ echo "$ac_t""$CPP" 1>&6
+ 
+ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+-echo "configure:1711: checking for ANSI C header files" >&5
++echo "configure:1752: checking for ANSI C header files" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1716 "configure"
++#line 1757 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -1720,7 +1761,7 @@
+ #include <float.h>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -1737,7 +1778,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1741 "configure"
++#line 1782 "configure"
+ #include "confdefs.h"
+ #include <string.h>
+ EOF
+@@ -1755,7 +1796,7 @@
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ cat > conftest.$ac_ext <<EOF
+-#line 1759 "configure"
++#line 1800 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ EOF
+@@ -1776,7 +1817,7 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1780 "configure"
++#line 1821 "configure"
+ #include "confdefs.h"
+ #include <ctype.h>
+ #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
+@@ -1787,7 +1828,7 @@
+ exit (0); }
+ 
+ EOF
+-if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:1832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   :
+ else
+@@ -1815,12 +1856,12 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
+-echo "configure:1819: checking for $ac_hdr that defines DIR" >&5
++echo "configure:1860: checking for $ac_hdr that defines DIR" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1824 "configure"
++#line 1865 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -1828,7 +1869,7 @@
+ DIR *dirp = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   eval "ac_cv_header_dirent_$ac_safe=yes"
+ else
+@@ -1853,7 +1894,7 @@
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+ echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
+-echo "configure:1857: checking for opendir in -ldir" >&5
++echo "configure:1898: checking for opendir in -ldir" >&5
+ ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1861,7 +1902,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldir  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1865 "configure"
++#line 1906 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1872,7 +1913,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1894,7 +1935,7 @@
+ 
+ else
+ echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
+-echo "configure:1898: checking for opendir in -lx" >&5
++echo "configure:1939: checking for opendir in -lx" >&5
+ ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1902,7 +1943,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lx  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1906 "configure"
++#line 1947 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -1913,7 +1954,7 @@
+ opendir()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -1936,12 +1977,12 @@
+ fi
+ 
+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
+-echo "configure:1940: checking whether time.h and sys/time.h may both be included" >&5
++echo "configure:1981: checking whether time.h and sys/time.h may both be included" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1945 "configure"
++#line 1986 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -1950,7 +1991,7 @@
+ struct tm *tp;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_time=yes
+ else
+@@ -1971,12 +2012,12 @@
+ fi
+ 
+ echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
+-echo "configure:1975: checking for sys/wait.h that is POSIX.1 compatible" >&5
++echo "configure:2016: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 1980 "configure"
++#line 2021 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -1992,7 +2033,7 @@
+ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2037: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_sys_wait_h=yes
+ else
+@@ -2016,17 +2057,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2020: checking for $ac_hdr" >&5
++echo "configure:2061: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2025 "configure"
++#line 2066 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2056,17 +2097,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2060: checking for $ac_hdr" >&5
++echo "configure:2101: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2065 "configure"
++#line 2106 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2111: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2096,17 +2137,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2100: checking for $ac_hdr" >&5
++echo "configure:2141: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2105 "configure"
++#line 2146 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2136,17 +2177,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2140: checking for $ac_hdr" >&5
++echo "configure:2181: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2145 "configure"
++#line 2186 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2191: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2176,17 +2217,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2180: checking for $ac_hdr" >&5
++echo "configure:2221: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2185 "configure"
++#line 2226 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2231: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2216,17 +2257,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2220: checking for $ac_hdr" >&5
++echo "configure:2261: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2225 "configure"
++#line 2266 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2271: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2256,17 +2297,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2260: checking for $ac_hdr" >&5
++echo "configure:2301: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2265 "configure"
++#line 2306 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2296,17 +2337,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2300: checking for $ac_hdr" >&5
++echo "configure:2341: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2305 "configure"
++#line 2346 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2351: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2340,14 +2381,14 @@
+ case "$host_os" in
+     *hpux*)
+ 		cat > conftest.$ac_ext <<EOF
+-#line 2344 "configure"
++#line 2385 "configure"
+ #include "confdefs.h"
+ #include <shadow.h>
+ int main() {
+ struct spwd testme
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_header_shadow_h=yes
+ else
+@@ -2369,17 +2410,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2373: checking for $ac_hdr" >&5
++echo "configure:2414: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2378 "configure"
++#line 2419 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2409,17 +2450,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2413: checking for $ac_hdr" >&5
++echo "configure:2454: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2418 "configure"
++#line 2459 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2423: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2449,17 +2490,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2453: checking for $ac_hdr" >&5
++echo "configure:2494: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2458 "configure"
++#line 2499 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2504: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2489,17 +2530,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2493: checking for $ac_hdr" >&5
++echo "configure:2534: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2498 "configure"
++#line 2539 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2503: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2544: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2529,17 +2570,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2533: checking for $ac_hdr" >&5
++echo "configure:2574: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2538 "configure"
++#line 2579 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2571,17 +2612,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2575: checking for $ac_hdr" >&5
++echo "configure:2616: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2580 "configure"
++#line 2621 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2613,17 +2654,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2617: checking for $ac_hdr" >&5
++echo "configure:2658: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2622 "configure"
++#line 2663 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2627: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2655,17 +2696,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2659: checking for $ac_hdr" >&5
++echo "configure:2700: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2664 "configure"
++#line 2705 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2669: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -2693,7 +2734,7 @@
+ 
+ 
+ echo $ac_n "checking size of int""... $ac_c" 1>&6
+-echo "configure:2697: checking size of int" >&5
++echo "configure:2738: checking size of int" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2701,18 +2742,19 @@
+   ac_cv_sizeof_int=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2705 "configure"
++#line 2746 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(int));
+-  return(0);
++  exit(0);
+ }
+ EOF
+-if { (eval echo configure:2716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_int=`cat conftestval`
+ else
+@@ -2732,7 +2774,7 @@
+ 
+ 
+ echo $ac_n "checking size of long""... $ac_c" 1>&6
+-echo "configure:2736: checking size of long" >&5
++echo "configure:2778: checking size of long" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2740,18 +2782,19 @@
+   ac_cv_sizeof_long=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2744 "configure"
++#line 2786 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(long));
+-  return(0);
++  exit(0);
+ }
+ EOF
+-if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_long=`cat conftestval`
+ else
+@@ -2771,7 +2814,7 @@
+ 
+ 
+ echo $ac_n "checking size of short""... $ac_c" 1>&6
+-echo "configure:2775: checking size of short" >&5
++echo "configure:2818: checking size of short" >&5
+ if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2779,18 +2822,19 @@
+   ac_cv_sizeof_short=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2783 "configure"
++#line 2826 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+-int main()
++#include <sys/types.h>
++main()
+ {
+   FILE *f=fopen("conftestval", "w");
+-  if (!f) return(1);
++  if (!f) exit(1);
+   fprintf(f, "%d\n", sizeof(short));
+-  return(0);
++  exit(0);
+ }
+ EOF
+-if { (eval echo configure:2794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_sizeof_short=`cat conftestval`
+ else
+@@ -2811,12 +2855,12 @@
+ 
+ 
+ echo $ac_n "checking for working const""... $ac_c" 1>&6
+-echo "configure:2815: checking for working const" >&5
++echo "configure:2859: checking for working const" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2820 "configure"
++#line 2864 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+@@ -2865,7 +2909,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2869: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_const=yes
+ else
+@@ -2886,21 +2930,21 @@
+ fi
+ 
+ echo $ac_n "checking for inline""... $ac_c" 1>&6
+-echo "configure:2890: checking for inline" >&5
++echo "configure:2934: checking for inline" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+   cat > conftest.$ac_ext <<EOF
+-#line 2897 "configure"
++#line 2941 "configure"
+ #include "confdefs.h"
+ 
+ int main() {
+ } $ac_kw foo() {
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_inline=$ac_kw; break
+ else
+@@ -2926,14 +2970,14 @@
+ esac
+ 
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:2930: checking whether byte ordering is bigendian" >&5
++echo "configure:2974: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 2937 "configure"
++#line 2981 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -2944,11 +2988,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 2952 "configure"
++#line 2996 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -2959,7 +3003,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_c_bigendian=yes
+ else
+@@ -2979,7 +3023,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 2983 "configure"
++#line 3027 "configure"
+ #include "confdefs.h"
+ main () {
+   /* Are we little or big endian?  From Harbison&Steele.  */
+@@ -2992,7 +3036,7 @@
+   exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:2996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_bigendian=no
+ else
+@@ -3016,14 +3060,14 @@
+ fi
+ 
+ echo $ac_n "checking whether char is unsigned""... $ac_c" 1>&6
+-echo "configure:3020: checking whether char is unsigned" >&5
++echo "configure:3064: checking whether char is unsigned" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_char_unsigned'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test "$GCC" = yes; then
+   # GCC predefines this symbol on systems where it applies.
+ cat > conftest.$ac_ext <<EOF
+-#line 3027 "configure"
++#line 3071 "configure"
+ #include "confdefs.h"
+ #ifdef __CHAR_UNSIGNED__
+   yes
+@@ -3045,7 +3089,7 @@
+     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3049 "configure"
++#line 3093 "configure"
+ #include "confdefs.h"
+ /* volatile prevents gcc2 from optimizing the test away on sparcs.  */
+ #if !defined(__STDC__) || __STDC__ != 1
+@@ -3055,7 +3099,7 @@
+   volatile char c = 255; exit(c < 0);
+ }
+ EOF
+-if { (eval echo configure:3059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_c_char_unsigned=yes
+ else
+@@ -3080,12 +3124,12 @@
+ 
+ 
+ echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+-echo "configure:3084: checking return type of signal handlers" >&5
++echo "configure:3128: checking return type of signal handlers" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3089 "configure"
++#line 3133 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -3102,7 +3146,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3150: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_type_signal=void
+ else
+@@ -3121,12 +3165,12 @@
+ 
+ 
+ echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+-echo "configure:3125: checking for uid_t in sys/types.h" >&5
++echo "configure:3169: checking for uid_t in sys/types.h" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3130 "configure"
++#line 3174 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ EOF
+@@ -3155,12 +3199,12 @@
+ fi
+ 
+ echo $ac_n "checking for mode_t""... $ac_c" 1>&6
+-echo "configure:3159: checking for mode_t" >&5
++echo "configure:3203: checking for mode_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3164 "configure"
++#line 3208 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3188,12 +3232,12 @@
+ fi
+ 
+ echo $ac_n "checking for off_t""... $ac_c" 1>&6
+-echo "configure:3192: checking for off_t" >&5
++echo "configure:3236: checking for off_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3197 "configure"
++#line 3241 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3221,12 +3265,12 @@
+ fi
+ 
+ echo $ac_n "checking for size_t""... $ac_c" 1>&6
+-echo "configure:3225: checking for size_t" >&5
++echo "configure:3269: checking for size_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3230 "configure"
++#line 3274 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3254,12 +3298,12 @@
+ fi
+ 
+ echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+-echo "configure:3258: checking for pid_t" >&5
++echo "configure:3302: checking for pid_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3263 "configure"
++#line 3307 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3287,12 +3331,12 @@
+ fi
+ 
+ echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6
+-echo "configure:3291: checking for st_rdev in struct stat" >&5
++echo "configure:3335: checking for st_rdev in struct stat" >&5
+ if eval "test \"`echo '$''{'ac_cv_struct_st_rdev'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3296 "configure"
++#line 3340 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -3300,7 +3344,7 @@
+ struct stat s; s.st_rdev;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_struct_st_rdev=yes
+ else
+@@ -3321,12 +3365,12 @@
+ fi
+ 
+ echo $ac_n "checking for d_off in dirent""... $ac_c" 1>&6
+-echo "configure:3325: checking for d_off in dirent" >&5
++echo "configure:3369: checking for d_off in dirent" >&5
+ if eval "test \"`echo '$''{'ac_cv_dirent_d_off'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3330 "configure"
++#line 3374 "configure"
+ #include "confdefs.h"
+ 
+ #include <unistd.h>
+@@ -3336,7 +3380,7 @@
+ struct dirent d; d.d_off;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3340: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_dirent_d_off=yes
+ else
+@@ -3357,12 +3401,12 @@
+ fi
+ 
+ echo $ac_n "checking for ino_t""... $ac_c" 1>&6
+-echo "configure:3361: checking for ino_t" >&5
++echo "configure:3405: checking for ino_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_ino_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3366 "configure"
++#line 3410 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3390,12 +3434,12 @@
+ fi
+ 
+ echo $ac_n "checking for loff_t""... $ac_c" 1>&6
+-echo "configure:3394: checking for loff_t" >&5
++echo "configure:3438: checking for loff_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_loff_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3399 "configure"
++#line 3443 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3423,12 +3467,12 @@
+ fi
+ 
+ echo $ac_n "checking for offset_t""... $ac_c" 1>&6
+-echo "configure:3427: checking for offset_t" >&5
++echo "configure:3471: checking for offset_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_offset_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3432 "configure"
++#line 3476 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3456,12 +3500,12 @@
+ fi
+ 
+ echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
+-echo "configure:3460: checking for ssize_t" >&5
++echo "configure:3504: checking for ssize_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3465 "configure"
++#line 3509 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3489,12 +3533,12 @@
+ fi
+ 
+ echo $ac_n "checking for wchar_t""... $ac_c" 1>&6
+-echo "configure:3493: checking for wchar_t" >&5
++echo "configure:3537: checking for wchar_t" >&5
+ if eval "test \"`echo '$''{'ac_cv_type_wchar_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3498 "configure"
++#line 3542 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if STDC_HEADERS
+@@ -3526,7 +3570,7 @@
+ # for cups support we need libcups, and a handful of header files
+ 
+ echo $ac_n "checking for httpConnect in -lcups""... $ac_c" 1>&6
+-echo "configure:3530: checking for httpConnect in -lcups" >&5
++echo "configure:3574: checking for httpConnect in -lcups" >&5
+ ac_lib_var=`echo cups'_'httpConnect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3534,7 +3578,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcups  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3538 "configure"
++#line 3582 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3545,7 +3589,7 @@
+ httpConnect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3580,17 +3624,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:3584: checking for $ac_hdr" >&5
++echo "configure:3628: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3589 "configure"
++#line 3633 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:3594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:3638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -3629,7 +3673,7 @@
+ ############################################
+ # we need libdl for PAM and the new VFS code
+ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:3633: checking for dlopen in -ldl" >&5
++echo "configure:3677: checking for dlopen in -ldl" >&5
+ ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3637,7 +3681,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3641 "configure"
++#line 3685 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -3648,7 +3692,7 @@
+ dlopen()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -3676,13 +3720,13 @@
+ ############################################
+ # check if the compiler can do immediate structures
+ echo $ac_n "checking for immediate structures""... $ac_c" 1>&6
+-echo "configure:3680: checking for immediate structures" >&5
++echo "configure:3724: checking for immediate structures" >&5
+ if eval "test \"`echo '$''{'samba_cv_immediate_structures'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3686 "configure"
++#line 3730 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -3694,7 +3738,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_immediate_structures=yes
+ else
+@@ -3717,13 +3761,13 @@
+ ############################################
+ # check for unix domain sockets
+ echo $ac_n "checking for unix domain sockets""... $ac_c" 1>&6
+-echo "configure:3721: checking for unix domain sockets" >&5
++echo "configure:3765: checking for unix domain sockets" >&5
+ if eval "test \"`echo '$''{'samba_cv_unixsocket'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3727 "configure"
++#line 3771 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3738,7 +3782,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_unixsocket=yes
+ else
+@@ -3759,13 +3803,13 @@
+ fi
+ 
+ echo $ac_n "checking for socklen_t type""... $ac_c" 1>&6
+-echo "configure:3763: checking for socklen_t type" >&5
++echo "configure:3807: checking for socklen_t type" >&5
+ if eval "test \"`echo '$''{'samba_cv_socklen_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3769 "configure"
++#line 3813 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3778,7 +3822,7 @@
+ socklen_t i = 0
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_socklen_t=yes
+ else
+@@ -3799,13 +3843,13 @@
+ fi
+ 
+ echo $ac_n "checking for sig_atomic_t type""... $ac_c" 1>&6
+-echo "configure:3803: checking for sig_atomic_t type" >&5
++echo "configure:3847: checking for sig_atomic_t type" >&5
+ if eval "test \"`echo '$''{'samba_cv_sig_atomic_t'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3809 "configure"
++#line 3853 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -3818,7 +3862,7 @@
+ sig_atomic_t i = 0
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3822: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3866: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_sig_atomic_t=yes
+ else
+@@ -3841,20 +3885,20 @@
+ # stupid headers have the functions but no declaration. grrrr.
+ 
+  echo $ac_n "checking for errno declaration""... $ac_c" 1>&6
+-echo "configure:3845: checking for errno declaration" >&5
++echo "configure:3889: checking for errno declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_errno_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3851 "configure"
++#line 3895 "configure"
+ #include "confdefs.h"
+ #include <errno.h>
+ int main() {
+ int i = (int)errno
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3858: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_errno_decl=yes
+ else
+@@ -3876,20 +3920,20 @@
+ 
+ 
+  echo $ac_n "checking for setresuid declaration""... $ac_c" 1>&6
+-echo "configure:3880: checking for setresuid declaration" >&5
++echo "configure:3924: checking for setresuid declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_setresuid_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3886 "configure"
++#line 3930 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int main() {
+ int i = (int)setresuid
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_setresuid_decl=yes
+ else
+@@ -3911,20 +3955,20 @@
+ 
+ 
+  echo $ac_n "checking for setresgid declaration""... $ac_c" 1>&6
+-echo "configure:3915: checking for setresgid declaration" >&5
++echo "configure:3959: checking for setresgid declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_setresgid_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3921 "configure"
++#line 3965 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ int main() {
+ int i = (int)setresgid
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_setresgid_decl=yes
+ else
+@@ -3946,20 +3990,20 @@
+ 
+ 
+  echo $ac_n "checking for asprintf declaration""... $ac_c" 1>&6
+-echo "configure:3950: checking for asprintf declaration" >&5
++echo "configure:3994: checking for asprintf declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_asprintf_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3956 "configure"
++#line 4000 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ int i = (int)asprintf
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3963: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_asprintf_decl=yes
+ else
+@@ -3981,20 +4025,20 @@
+ 
+ 
+  echo $ac_n "checking for vasprintf declaration""... $ac_c" 1>&6
+-echo "configure:3985: checking for vasprintf declaration" >&5
++echo "configure:4029: checking for vasprintf declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_vasprintf_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 3991 "configure"
++#line 4035 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ int i = (int)vasprintf
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_vasprintf_decl=yes
+ else
+@@ -4016,20 +4060,20 @@
+ 
+ 
+  echo $ac_n "checking for vsnprintf declaration""... $ac_c" 1>&6
+-echo "configure:4020: checking for vsnprintf declaration" >&5
++echo "configure:4064: checking for vsnprintf declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_vsnprintf_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 4026 "configure"
++#line 4070 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ int i = (int)vsnprintf
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4033: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4077: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_vsnprintf_decl=yes
+ else
+@@ -4051,20 +4095,20 @@
+ 
+ 
+  echo $ac_n "checking for snprintf declaration""... $ac_c" 1>&6
+-echo "configure:4055: checking for snprintf declaration" >&5
++echo "configure:4099: checking for snprintf declaration" >&5
+ if eval "test \"`echo '$''{'ac_cv_have_snprintf_decl'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 4061 "configure"
++#line 4105 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ int i = (int)snprintf
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4112: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   ac_cv_have_snprintf_decl=yes
+ else
+@@ -4088,7 +4132,7 @@
+ # and glibc has setresuid under linux but the function does
+ # nothing until kernel 2.1.44! very dumb.
+ echo $ac_n "checking for real setresuid""... $ac_c" 1>&6
+-echo "configure:4092: checking for real setresuid" >&5
++echo "configure:4136: checking for real setresuid" >&5
+ if eval "test \"`echo '$''{'samba_cv_have_setresuid'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4097,12 +4141,12 @@
+   samba_cv_have_setresuid=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4101 "configure"
++#line 4145 "configure"
+ #include "confdefs.h"
+ #include <errno.h>
+ main() { setresuid(1,1,1); setresuid(2,2,2); exit(errno==EPERM?0:1);}
+ EOF
+-if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_have_setresuid=yes
+ else
+@@ -4127,7 +4171,7 @@
+ # Do the same check for setresguid...
+ #
+ echo $ac_n "checking for real setresgid""... $ac_c" 1>&6
+-echo "configure:4131: checking for real setresgid" >&5
++echo "configure:4175: checking for real setresgid" >&5
+ if eval "test \"`echo '$''{'samba_cv_have_setresgid'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4136,13 +4180,13 @@
+   samba_cv_have_setresgid=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4140 "configure"
++#line 4184 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ #include <errno.h>
+ main() { errno = 0; setresgid(1,1,1); exit(errno != 0 ? (errno==EPERM ? 0 : 1) : 0);}
+ EOF
+-if { (eval echo configure:4146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_have_setresgid=yes
+ else
+@@ -4165,7 +4209,7 @@
+ fi
+ 
+ echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6
+-echo "configure:4169: checking for 8-bit clean memcmp" >&5
++echo "configure:4213: checking for 8-bit clean memcmp" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -4173,7 +4217,7 @@
+   ac_cv_func_memcmp_clean=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4177 "configure"
++#line 4221 "configure"
+ #include "confdefs.h"
+ 
+ main()
+@@ -4183,7 +4227,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:4187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:4231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   ac_cv_func_memcmp_clean=yes
+ else
+@@ -4207,7 +4251,7 @@
+ 
+ # test for where we get readline() from
+ echo $ac_n "checking whether to use readline""... $ac_c" 1>&6
+-echo "configure:4211: checking whether to use readline" >&5
++echo "configure:4255: checking whether to use readline" >&5
+ # Check whether --with-readline or --without-readline was given.
+ if test "${with_readline+set}" = set; then
+   withval="$with_readline"
+@@ -4219,17 +4263,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4223: checking for $ac_hdr" >&5
++echo "configure:4267: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4228 "configure"
++#line 4272 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4233: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4277: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4259,17 +4303,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4263: checking for $ac_hdr" >&5
++echo "configure:4307: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4268 "configure"
++#line 4312 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4317: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4300,17 +4344,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4304: checking for $ac_hdr" >&5
++echo "configure:4348: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4309 "configure"
++#line 4353 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4358: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4333,7 +4377,7 @@
+  
+       for termlib in ncurses curses termcap terminfo termlib; do
+        echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
+-echo "configure:4337: checking for tgetent in -l${termlib}" >&5
++echo "configure:4381: checking for tgetent in -l${termlib}" >&5
+ ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4341,7 +4385,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l${termlib}  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4345 "configure"
++#line 4389 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4352,7 +4396,7 @@
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4374,7 +4418,7 @@
+ 
+       done
+       echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6
+-echo "configure:4378: checking for rl_callback_handler_install in -lreadline" >&5
++echo "configure:4422: checking for rl_callback_handler_install in -lreadline" >&5
+ ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4382,7 +4426,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline $TERMLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4386 "configure"
++#line 4430 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4393,7 +4437,7 @@
+ rl_callback_handler_install()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4444,17 +4488,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4448: checking for $ac_hdr" >&5
++echo "configure:4492: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4453 "configure"
++#line 4497 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4458: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4484,17 +4528,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4488: checking for $ac_hdr" >&5
++echo "configure:4532: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4493 "configure"
++#line 4537 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4498: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4525,17 +4569,17 @@
+ do
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4529: checking for $ac_hdr" >&5
++echo "configure:4573: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4534 "configure"
++#line 4578 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4583: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+   rm -rf conftest*
+@@ -4558,7 +4602,7 @@
+  
+       for termlib in ncurses curses termcap terminfo termlib; do
+        echo $ac_n "checking for tgetent in -l${termlib}""... $ac_c" 1>&6
+-echo "configure:4562: checking for tgetent in -l${termlib}" >&5
++echo "configure:4606: checking for tgetent in -l${termlib}" >&5
+ ac_lib_var=`echo ${termlib}'_'tgetent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4566,7 +4610,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-l${termlib}  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4570 "configure"
++#line 4614 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4577,7 +4621,7 @@
+ tgetent()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4599,7 +4643,7 @@
+ 
+       done
+       echo $ac_n "checking for rl_callback_handler_install in -lreadline""... $ac_c" 1>&6
+-echo "configure:4603: checking for rl_callback_handler_install in -lreadline" >&5
++echo "configure:4647: checking for rl_callback_handler_install in -lreadline" >&5
+ ac_lib_var=`echo readline'_'rl_callback_handler_install | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4607,7 +4651,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lreadline $TERMLIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4611 "configure"
++#line 4655 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4618,7 +4662,7 @@
+ rl_callback_handler_install()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4673,12 +4717,12 @@
+ for ac_func in connect
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4677: checking for $ac_func" >&5
++echo "configure:4721: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4682 "configure"
++#line 4726 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4701,7 +4745,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4729,7 +4773,7 @@
+     case "$LIBS" in
+     *-lnsl*) ;;
+     *) echo $ac_n "checking for printf in -lnsl_s""... $ac_c" 1>&6
+-echo "configure:4733: checking for printf in -lnsl_s" >&5
++echo "configure:4777: checking for printf in -lnsl_s" >&5
+ ac_lib_var=`echo nsl_s'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4737,7 +4781,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl_s  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4741 "configure"
++#line 4785 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4748,7 +4792,7 @@
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4779,7 +4823,7 @@
+     case "$LIBS" in
+     *-lnsl*) ;;
+     *) echo $ac_n "checking for printf in -lnsl""... $ac_c" 1>&6
+-echo "configure:4783: checking for printf in -lnsl" >&5
++echo "configure:4827: checking for printf in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'printf | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4787,7 +4831,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4791 "configure"
++#line 4835 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4798,7 +4842,7 @@
+ printf()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4829,7 +4873,7 @@
+     case "$LIBS" in
+     *-lsocket*) ;;
+     *) echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:4833: checking for connect in -lsocket" >&5
++echo "configure:4877: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4837,7 +4881,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsocket  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4841 "configure"
++#line 4885 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4848,7 +4892,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4879,7 +4923,7 @@
+     case "$LIBS" in
+     *-linet*) ;;
+     *) echo $ac_n "checking for connect in -linet""... $ac_c" 1>&6
+-echo "configure:4883: checking for connect in -linet" >&5
++echo "configure:4927: checking for connect in -linet" >&5
+ ac_lib_var=`echo inet'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -4887,7 +4931,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-linet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4891 "configure"
++#line 4935 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -4898,7 +4942,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -4942,12 +4986,12 @@
+ for ac_func in yp_get_default_domain
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4946: checking for $ac_func" >&5
++echo "configure:4990: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4951 "configure"
++#line 4995 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -4970,7 +5014,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -4996,7 +5040,7 @@
+ 
+ if test x"$ac_cv_func_yp_get_default_domain" = x"no"; then
+ 	echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6
+-echo "configure:5000: checking for yp_get_default_domain in -lnsl" >&5
++echo "configure:5044: checking for yp_get_default_domain in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -5004,7 +5048,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 5008 "configure"
++#line 5052 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -5015,7 +5059,7 @@
+ yp_get_default_domain()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -5045,12 +5089,12 @@
+ for ac_func in execl
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5049: checking for $ac_func" >&5
++echo "configure:5093: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5054 "configure"
++#line 5098 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5073,7 +5117,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5106,12 +5150,12 @@
+ for ac_func in waitpid getcwd strdup strtoul strerror chown fchown chmod fchmod chroot link
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5110: checking for $ac_func" >&5
++echo "configure:5154: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5115 "configure"
++#line 5159 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5134,7 +5178,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5161,12 +5205,12 @@
+ for ac_func in fstat strchr utime utimes getrlimit fsync bzero memset setpgid mknod mknod64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5165: checking for $ac_func" >&5
++echo "configure:5209: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5170 "configure"
++#line 5214 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5189,7 +5233,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5216,12 +5260,12 @@
+ for ac_func in memmove vsnprintf snprintf asprintf vasprintf setsid glob strpbrk pipe crypt16 getauthuid
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5220: checking for $ac_func" >&5
++echo "configure:5264: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5225 "configure"
++#line 5269 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5244,7 +5288,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5271,12 +5315,12 @@
+ for ac_func in strftime sigprocmask sigblock sigaction sigset innetgr setnetgrent getnetgrent endnetgrent
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5275: checking for $ac_func" >&5
++echo "configure:5319: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5280 "configure"
++#line 5324 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5299,7 +5343,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5326,12 +5370,12 @@
+ for ac_func in initgroups select poll rdchk getgrnam getgrent pathconf realpath
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5330: checking for $ac_func" >&5
++echo "configure:5374: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5335 "configure"
++#line 5379 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5354,7 +5398,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5381,12 +5425,12 @@
+ for ac_func in setpriv setgidx setuidx setgroups sysconf mktime rename ftruncate stat64 fstat64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5385: checking for $ac_func" >&5
++echo "configure:5429: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5390 "configure"
++#line 5434 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5409,7 +5453,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5436,12 +5480,12 @@
+ for ac_func in lstat64 fopen64 atexit grantpt dup2 lseek64 ftruncate64 readdir64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5440: checking for $ac_func" >&5
++echo "configure:5484: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5445 "configure"
++#line 5489 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5464,7 +5508,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5468: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5491,12 +5535,12 @@
+ for ac_func in fseek64 fseeko64 ftell64 ftello64 setluid getpwanam setlinebuf
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5495: checking for $ac_func" >&5
++echo "configure:5539: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5500 "configure"
++#line 5544 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5519,7 +5563,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5546,12 +5590,12 @@
+ for ac_func in srandom random srand rand setenv usleep strcasecmp fcvt fcvtl symlink readlink
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5550: checking for $ac_func" >&5
++echo "configure:5594: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5555 "configure"
++#line 5599 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5574,7 +5618,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5601,12 +5645,12 @@
+ for ac_func in syslog vsyslog
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5605: checking for $ac_func" >&5
++echo "configure:5649: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5610 "configure"
++#line 5654 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5629,7 +5673,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5658,12 +5702,12 @@
+ for ac_func in syscall
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5662: checking for $ac_func" >&5
++echo "configure:5706: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5667 "configure"
++#line 5711 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5686,7 +5730,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5714,12 +5758,12 @@
+ for ac_func in _dup _dup2 _opendir _readdir _seekdir _telldir _closedir
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5718: checking for $ac_func" >&5
++echo "configure:5762: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5723 "configure"
++#line 5767 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5742,7 +5786,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5769,12 +5813,12 @@
+ for ac_func in __dup __dup2 __opendir __readdir __seekdir __telldir __closedir
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5773: checking for $ac_func" >&5
++echo "configure:5817: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5778 "configure"
++#line 5822 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5797,7 +5841,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5824,12 +5868,12 @@
+ for ac_func in __getcwd _getcwd
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5828: checking for $ac_func" >&5
++echo "configure:5872: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5833 "configure"
++#line 5877 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5852,7 +5896,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5879,12 +5923,12 @@
+ for ac_func in __xstat __fxstat __lxstat
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5883: checking for $ac_func" >&5
++echo "configure:5927: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5888 "configure"
++#line 5932 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5907,7 +5951,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:5955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5934,12 +5978,12 @@
+ for ac_func in _stat _lstat _fstat __stat __lstat __fstat
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5938: checking for $ac_func" >&5
++echo "configure:5982: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5943 "configure"
++#line 5987 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -5962,7 +6006,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -5989,12 +6033,12 @@
+ for ac_func in _acl __acl _facl __facl _open __open _chdir __chdir
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:5993: checking for $ac_func" >&5
++echo "configure:6037: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 5998 "configure"
++#line 6042 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6017,7 +6061,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6044,12 +6088,12 @@
+ for ac_func in _close __close _fchdir __fchdir _fcntl __fcntl
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6048: checking for $ac_func" >&5
++echo "configure:6092: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6053 "configure"
++#line 6097 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6072,7 +6116,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6099,12 +6143,12 @@
+ for ac_func in getdents _getdents __getdents _lseek __lseek _read __read
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6103: checking for $ac_func" >&5
++echo "configure:6147: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6108 "configure"
++#line 6152 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6127,7 +6171,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6154,12 +6198,12 @@
+ for ac_func in _write __write _fork __fork
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6158: checking for $ac_func" >&5
++echo "configure:6202: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6163 "configure"
++#line 6207 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6182,7 +6226,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6209,12 +6253,12 @@
+ for ac_func in _stat64 __stat64 _fstat64 __fstat64 _lstat64 __lstat64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6213: checking for $ac_func" >&5
++echo "configure:6257: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6218 "configure"
++#line 6262 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6237,7 +6281,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6264,12 +6308,12 @@
+ for ac_func in __sys_llseek llseek _llseek __llseek readdir64 _readdir64 __readdir64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6268: checking for $ac_func" >&5
++echo "configure:6312: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6273 "configure"
++#line 6317 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6292,7 +6336,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6319,12 +6363,12 @@
+ for ac_func in pread _pread __pread pread64 _pread64 __pread64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6323: checking for $ac_func" >&5
++echo "configure:6367: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6328 "configure"
++#line 6372 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6347,7 +6391,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6374,12 +6418,12 @@
+ for ac_func in pwrite _pwrite __pwrite pwrite64 _pwrite64 __pwrite64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6378: checking for $ac_func" >&5
++echo "configure:6422: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6383 "configure"
++#line 6427 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6402,7 +6446,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6429,12 +6473,12 @@
+ for ac_func in open64 _open64 __open64 creat64
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6433: checking for $ac_func" >&5
++echo "configure:6477: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6438 "configure"
++#line 6482 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6457,7 +6501,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6488,9 +6532,9 @@
+ 
+ if test x$ac_cv_func_stat64 = xno ; then
+   echo $ac_n "checking for stat64 in <sys/stat.h>""... $ac_c" 1>&6
+-echo "configure:6492: checking for stat64 in <sys/stat.h>" >&5
++echo "configure:6536: checking for stat64 in <sys/stat.h>" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 6494 "configure"
++#line 6538 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -6502,7 +6546,7 @@
+ struct stat64 st64; exit(stat64(".",&st64));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_stat64=yes
+ else
+@@ -6521,9 +6565,9 @@
+ 
+ if test x$ac_cv_func_lstat64 = xno ; then
+   echo $ac_n "checking for lstat64 in <sys/stat.h>""... $ac_c" 1>&6
+-echo "configure:6525: checking for lstat64 in <sys/stat.h>" >&5
++echo "configure:6569: checking for lstat64 in <sys/stat.h>" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 6527 "configure"
++#line 6571 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -6535,7 +6579,7 @@
+ struct stat64 st64; exit(lstat64(".",&st64));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_lstat64=yes
+ else
+@@ -6554,9 +6598,9 @@
+ 
+ if test x$ac_cv_func_fstat64 = xno ; then
+   echo $ac_n "checking for fstat64 in <sys/stat.h>""... $ac_c" 1>&6
+-echo "configure:6558: checking for fstat64 in <sys/stat.h>" >&5
++echo "configure:6602: checking for fstat64 in <sys/stat.h>" >&5
+   cat > conftest.$ac_ext <<EOF
+-#line 6560 "configure"
++#line 6604 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -6568,7 +6612,7 @@
+ struct stat64 st64; exit(fstat64(0,&st64));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_cv_func_fstat64=yes
+ else
+@@ -6593,7 +6637,7 @@
+ 
+ if test x$ac_cv_func_strcasecmp = xno ; then
+ 	echo $ac_n "checking for strcasecmp in -lresolv""... $ac_c" 1>&6
+-echo "configure:6597: checking for strcasecmp in -lresolv" >&5
++echo "configure:6641: checking for strcasecmp in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'strcasecmp | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6601,7 +6645,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lresolv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6605 "configure"
++#line 6649 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6612,7 +6656,7 @@
+ strcasecmp()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6648,12 +6692,12 @@
+   *-lsecurity*) for ac_func in putprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6652: checking for $ac_func" >&5
++echo "configure:6696: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6657 "configure"
++#line 6701 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6676,7 +6720,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6701,7 +6745,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for putprpwnam in -lsecurity""... $ac_c" 1>&6
+-echo "configure:6705: checking for putprpwnam in -lsecurity" >&5
++echo "configure:6749: checking for putprpwnam in -lsecurity" >&5
+ ac_lib_var=`echo security'_'putprpwnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6709,7 +6753,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6713 "configure"
++#line 6757 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6720,7 +6764,7 @@
+ putprpwnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6724: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6750,12 +6794,12 @@
+      for ac_func in putprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6754: checking for $ac_func" >&5
++echo "configure:6798: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6759 "configure"
++#line 6803 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6778,7 +6822,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6826: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6809,12 +6853,12 @@
+   *-lsec*) for ac_func in putprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6813: checking for $ac_func" >&5
++echo "configure:6857: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6818 "configure"
++#line 6862 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6837,7 +6881,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6862,7 +6906,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for putprpwnam in -lsec""... $ac_c" 1>&6
+-echo "configure:6866: checking for putprpwnam in -lsec" >&5
++echo "configure:6910: checking for putprpwnam in -lsec" >&5
+ ac_lib_var=`echo sec'_'putprpwnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -6870,7 +6914,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 6874 "configure"
++#line 6918 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -6881,7 +6925,7 @@
+ putprpwnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -6911,12 +6955,12 @@
+      for ac_func in putprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6915: checking for $ac_func" >&5
++echo "configure:6959: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6920 "configure"
++#line 6964 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6939,7 +6983,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:6943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -6971,12 +7015,12 @@
+   *-lsecurity*) for ac_func in set_auth_parameters
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:6975: checking for $ac_func" >&5
++echo "configure:7019: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 6980 "configure"
++#line 7024 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -6999,7 +7043,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7024,7 +7068,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for set_auth_parameters in -lsecurity""... $ac_c" 1>&6
+-echo "configure:7028: checking for set_auth_parameters in -lsecurity" >&5
++echo "configure:7072: checking for set_auth_parameters in -lsecurity" >&5
+ ac_lib_var=`echo security'_'set_auth_parameters | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7032,7 +7076,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7036 "configure"
++#line 7080 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7043,7 +7087,7 @@
+ set_auth_parameters()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7073,12 +7117,12 @@
+      for ac_func in set_auth_parameters
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7077: checking for $ac_func" >&5
++echo "configure:7121: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7082 "configure"
++#line 7126 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7101,7 +7145,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7132,12 +7176,12 @@
+   *-lsec*) for ac_func in set_auth_parameters
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7136: checking for $ac_func" >&5
++echo "configure:7180: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7141 "configure"
++#line 7185 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7160,7 +7204,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7185,7 +7229,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for set_auth_parameters in -lsec""... $ac_c" 1>&6
+-echo "configure:7189: checking for set_auth_parameters in -lsec" >&5
++echo "configure:7233: checking for set_auth_parameters in -lsec" >&5
+ ac_lib_var=`echo sec'_'set_auth_parameters | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7193,7 +7237,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7197 "configure"
++#line 7241 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7204,7 +7248,7 @@
+ set_auth_parameters()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7234,12 +7278,12 @@
+      for ac_func in set_auth_parameters
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7238: checking for $ac_func" >&5
++echo "configure:7282: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7243 "configure"
++#line 7287 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7262,7 +7306,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7295,12 +7339,12 @@
+   *-lgen*) for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7299: checking for $ac_func" >&5
++echo "configure:7343: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7304 "configure"
++#line 7348 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7323,7 +7367,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7348,7 +7392,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for getspnam in -lgen""... $ac_c" 1>&6
+-echo "configure:7352: checking for getspnam in -lgen" >&5
++echo "configure:7396: checking for getspnam in -lgen" >&5
+ ac_lib_var=`echo gen'_'getspnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7356,7 +7400,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lgen  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7360 "configure"
++#line 7404 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7367,7 +7411,7 @@
+ getspnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7397,12 +7441,12 @@
+      for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7401: checking for $ac_func" >&5
++echo "configure:7445: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7406 "configure"
++#line 7450 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7425,7 +7469,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7457,12 +7501,12 @@
+   *-lsecurity*) for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7461: checking for $ac_func" >&5
++echo "configure:7505: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7466 "configure"
++#line 7510 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7485,7 +7529,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7510,7 +7554,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for getspnam in -lsecurity""... $ac_c" 1>&6
+-echo "configure:7514: checking for getspnam in -lsecurity" >&5
++echo "configure:7558: checking for getspnam in -lsecurity" >&5
+ ac_lib_var=`echo security'_'getspnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7518,7 +7562,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7522 "configure"
++#line 7566 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7529,7 +7573,7 @@
+ getspnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7559,12 +7603,12 @@
+      for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7563: checking for $ac_func" >&5
++echo "configure:7607: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7568 "configure"
++#line 7612 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7587,7 +7631,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7635: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7618,12 +7662,12 @@
+   *-lsec*) for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7622: checking for $ac_func" >&5
++echo "configure:7666: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7627 "configure"
++#line 7671 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7646,7 +7690,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7671,7 +7715,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for getspnam in -lsec""... $ac_c" 1>&6
+-echo "configure:7675: checking for getspnam in -lsec" >&5
++echo "configure:7719: checking for getspnam in -lsec" >&5
+ ac_lib_var=`echo sec'_'getspnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7679,7 +7723,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7683 "configure"
++#line 7727 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7690,7 +7734,7 @@
+ getspnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7720,12 +7764,12 @@
+      for ac_func in getspnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7724: checking for $ac_func" >&5
++echo "configure:7768: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7729 "configure"
++#line 7773 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7748,7 +7792,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7780,12 +7824,12 @@
+   *-lsecurity*) for ac_func in bigcrypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7784: checking for $ac_func" >&5
++echo "configure:7828: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7789 "configure"
++#line 7833 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7808,7 +7852,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7833,7 +7877,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for bigcrypt in -lsecurity""... $ac_c" 1>&6
+-echo "configure:7837: checking for bigcrypt in -lsecurity" >&5
++echo "configure:7881: checking for bigcrypt in -lsecurity" >&5
+ ac_lib_var=`echo security'_'bigcrypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -7841,7 +7885,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 7845 "configure"
++#line 7889 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -7852,7 +7896,7 @@
+ bigcrypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -7882,12 +7926,12 @@
+      for ac_func in bigcrypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7886: checking for $ac_func" >&5
++echo "configure:7930: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7891 "configure"
++#line 7935 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7910,7 +7954,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:7958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7941,12 +7985,12 @@
+   *-lsec*) for ac_func in bigcrypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:7945: checking for $ac_func" >&5
++echo "configure:7989: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 7950 "configure"
++#line 7994 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -7969,7 +8013,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:7973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -7994,7 +8038,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for bigcrypt in -lsec""... $ac_c" 1>&6
+-echo "configure:7998: checking for bigcrypt in -lsec" >&5
++echo "configure:8042: checking for bigcrypt in -lsec" >&5
+ ac_lib_var=`echo sec'_'bigcrypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8002,7 +8046,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8006 "configure"
++#line 8050 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8013,7 +8057,7 @@
+ bigcrypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8043,12 +8087,12 @@
+      for ac_func in bigcrypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8047: checking for $ac_func" >&5
++echo "configure:8091: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8052 "configure"
++#line 8096 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8071,7 +8115,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8103,12 +8147,12 @@
+   *-lsecurity*) for ac_func in getprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8107: checking for $ac_func" >&5
++echo "configure:8151: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8112 "configure"
++#line 8156 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8131,7 +8175,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8135: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8156,7 +8200,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for getprpwnam in -lsecurity""... $ac_c" 1>&6
+-echo "configure:8160: checking for getprpwnam in -lsecurity" >&5
++echo "configure:8204: checking for getprpwnam in -lsecurity" >&5
+ ac_lib_var=`echo security'_'getprpwnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8164,7 +8208,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsecurity  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8168 "configure"
++#line 8212 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8175,7 +8219,7 @@
+ getprpwnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8205,12 +8249,12 @@
+      for ac_func in getprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8209: checking for $ac_func" >&5
++echo "configure:8253: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8214 "configure"
++#line 8258 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8233,7 +8277,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8264,12 +8308,12 @@
+   *-lsec*) for ac_func in getprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8268: checking for $ac_func" >&5
++echo "configure:8312: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8273 "configure"
++#line 8317 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8292,7 +8336,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8317,7 +8361,7 @@
+ done
+  ;;
+   *) echo $ac_n "checking for getprpwnam in -lsec""... $ac_c" 1>&6
+-echo "configure:8321: checking for getprpwnam in -lsec" >&5
++echo "configure:8365: checking for getprpwnam in -lsec" >&5
+ ac_lib_var=`echo sec'_'getprpwnam | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -8325,7 +8369,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lsec  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 8329 "configure"
++#line 8373 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -8336,7 +8380,7 @@
+ getprpwnam()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -8366,12 +8410,12 @@
+      for ac_func in getprpwnam
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:8370: checking for $ac_func" >&5
++echo "configure:8414: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8375 "configure"
++#line 8419 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -8394,7 +8438,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:8442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -8437,7 +8481,7 @@
+ # Assume non-shared by default and override below
+ BLDSHARED="false" 
+ echo $ac_n "checking ability to build shared libraries""... $ac_c" 1>&6
+-echo "configure:8441: checking ability to build shared libraries" >&5
++echo "configure:8485: checking ability to build shared libraries" >&5
+ 
+ # and these are for particular systems
+ case "$host_os" in
+@@ -8572,7 +8616,7 @@
+ 		*dgux*) # Extract the first word of "groff", so it can be a program name with args.
+ set dummy groff; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:8576: checking for $ac_word" >&5
++echo "configure:8620: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_ROFF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8626,15 +8670,15 @@
+ esac
+ echo "$ac_t""$BLDSHARED" 1>&6
+ echo $ac_n "checking linker flags for shared libraries""... $ac_c" 1>&6
+-echo "configure:8630: checking linker flags for shared libraries" >&5
++echo "configure:8674: checking linker flags for shared libraries" >&5
+ echo "$ac_t""$LDSHFLAGS" 1>&6
+ echo $ac_n "checking compiler flags for position-independent code""... $ac_c" 1>&6
+-echo "configure:8633: checking compiler flags for position-independent code" >&5
++echo "configure:8677: checking compiler flags for position-independent code" >&5
+ echo "$ac_t""$PICFLAGS" 1>&6
+ 
+ # try to work out how to produce pic code with this compiler
+ echo $ac_n "checking whether ${CC-cc} accepts -fpic""... $ac_c" 1>&6
+-echo "configure:8638: checking whether ${CC-cc} accepts -fpic" >&5
++echo "configure:8682: checking whether ${CC-cc} accepts -fpic" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_fpic'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8654,7 +8698,7 @@
+ fi
+ if test x$PICFLAG = x; then
+   echo $ac_n "checking whether ${CC-cc} accepts -KPIC""... $ac_c" 1>&6
+-echo "configure:8658: checking whether ${CC-cc} accepts -KPIC" >&5
++echo "configure:8702: checking whether ${CC-cc} accepts -KPIC" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_KPIC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8675,7 +8719,7 @@
+ fi
+ if test x$PICFLAG = x; then
+   echo $ac_n "checking whether ${CC-cc} accepts -Kpic""... $ac_c" 1>&6
+-echo "configure:8679: checking whether ${CC-cc} accepts -Kpic" >&5
++echo "configure:8723: checking whether ${CC-cc} accepts -Kpic" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_cc_Kpic'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8698,7 +8742,7 @@
+ ################
+ 
+ echo $ac_n "checking for long long""... $ac_c" 1>&6
+-echo "configure:8702: checking for long long" >&5
++echo "configure:8746: checking for long long" >&5
+ if eval "test \"`echo '$''{'samba_cv_have_longlong'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8707,12 +8751,12 @@
+   samba_cv_have_longlong=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8711 "configure"
++#line 8755 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); }
+ EOF
+-if { (eval echo configure:8716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_have_longlong=yes
+ else
+@@ -8739,20 +8783,20 @@
+ # AIX needs this.
+ 
+ echo $ac_n "checking for LL suffix on long long integers""... $ac_c" 1>&6
+-echo "configure:8743: checking for LL suffix on long long integers" >&5
++echo "configure:8787: checking for LL suffix on long long integers" >&5
+ if eval "test \"`echo '$''{'samba_cv_compiler_supports_ll'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+     cat > conftest.$ac_ext <<EOF
+-#line 8749 "configure"
++#line 8793 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ long long i = 0x8000000000LL
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:8800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_compiler_supports_ll=yes
+ else
+@@ -8774,7 +8818,7 @@
+ 
+   
+ echo $ac_n "checking for 64 bit off_t""... $ac_c" 1>&6
+-echo "configure:8778: checking for 64 bit off_t" >&5
++echo "configure:8822: checking for 64 bit off_t" >&5
+ if eval "test \"`echo '$''{'samba_cv_SIZEOF_OFF_T'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8783,13 +8827,13 @@
+   samba_cv_SIZEOF_OFF_T=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8787 "configure"
++#line 8831 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
+ main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
+ EOF
+-if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_SIZEOF_OFF_T=yes
+ else
+@@ -8812,7 +8856,7 @@
+ fi
+ 
+ echo $ac_n "checking for off64_t""... $ac_c" 1>&6
+-echo "configure:8816: checking for off64_t" >&5
++echo "configure:8860: checking for off64_t" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_OFF64_T'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8821,7 +8865,7 @@
+   samba_cv_HAVE_OFF64_T=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8825 "configure"
++#line 8869 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -8831,7 +8875,7 @@
+ #include <sys/stat.h>
+ main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
+ EOF
+-if { (eval echo configure:8835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_OFF64_T=yes
+ else
+@@ -8854,7 +8898,7 @@
+ fi
+ 
+ echo $ac_n "checking for 64 bit ino_t""... $ac_c" 1>&6
+-echo "configure:8858: checking for 64 bit ino_t" >&5
++echo "configure:8902: checking for 64 bit ino_t" >&5
+ if eval "test \"`echo '$''{'samba_cv_SIZEOF_INO_T'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8863,13 +8907,13 @@
+   samba_cv_SIZEOF_INO_T=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8867 "configure"
++#line 8911 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/stat.h>
+ main() { exit((sizeof(ino_t) == 8) ? 0 : 1); }
+ EOF
+-if { (eval echo configure:8873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_SIZEOF_INO_T=yes
+ else
+@@ -8892,7 +8936,7 @@
+ fi
+ 
+ echo $ac_n "checking for ino64_t""... $ac_c" 1>&6
+-echo "configure:8896: checking for ino64_t" >&5
++echo "configure:8940: checking for ino64_t" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_INO64_T'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8901,7 +8945,7 @@
+   samba_cv_HAVE_INO64_T=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8905 "configure"
++#line 8949 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -8911,7 +8955,7 @@
+ #include <sys/stat.h>
+ main() { struct stat64 st; ino64_t s; if (sizeof(ino_t) == sizeof(ino64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
+ EOF
+-if { (eval echo configure:8915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:8959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_INO64_T=yes
+ else
+@@ -8934,7 +8978,7 @@
+ fi
+ 
+ echo $ac_n "checking for dev64_t""... $ac_c" 1>&6
+-echo "configure:8938: checking for dev64_t" >&5
++echo "configure:8982: checking for dev64_t" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_DEV64_T'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -8943,7 +8987,7 @@
+   samba_cv_HAVE_DEV64_T=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 8947 "configure"
++#line 8991 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -8953,7 +8997,7 @@
+ #include <sys/stat.h>
+ main() { struct stat64 st; dev64_t s; if (sizeof(dev_t) == sizeof(dev64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); }
+ EOF
+-if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_DEV64_T=yes
+ else
+@@ -8976,13 +9020,13 @@
+ fi
+ 
+ echo $ac_n "checking for struct dirent64""... $ac_c" 1>&6
+-echo "configure:8980: checking for struct dirent64" >&5
++echo "configure:9024: checking for struct dirent64" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_DIRENT64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 8986 "configure"
++#line 9030 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -8994,7 +9038,7 @@
+ struct dirent64 de;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:8998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9042: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_STRUCT_DIRENT64=yes
+ else
+@@ -9015,7 +9059,7 @@
+ fi
+ 
+ echo $ac_n "checking for major macro""... $ac_c" 1>&6
+-echo "configure:9019: checking for major macro" >&5
++echo "configure:9063: checking for major macro" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MAJOR_FN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9024,7 +9068,7 @@
+   samba_cv_HAVE_DEVICE_MAJOR_FN=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9028 "configure"
++#line 9072 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -9033,7 +9077,7 @@
+ #include <sys/types.h>
+ main() { dev_t dev; int i = major(dev); return 0; }
+ EOF
+-if { (eval echo configure:9037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_DEVICE_MAJOR_FN=yes
+ else
+@@ -9056,7 +9100,7 @@
+ fi
+ 
+ echo $ac_n "checking for minor macro""... $ac_c" 1>&6
+-echo "configure:9060: checking for minor macro" >&5
++echo "configure:9104: checking for minor macro" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_DEVICE_MINOR_FN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9065,7 +9109,7 @@
+   samba_cv_HAVE_DEVICE_MINOR_FN=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9069 "configure"
++#line 9113 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -9074,7 +9118,7 @@
+ #include <sys/types.h>
+ main() { dev_t dev; int i = minor(dev); return 0; }
+ EOF
+-if { (eval echo configure:9078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_DEVICE_MINOR_FN=yes
+ else
+@@ -9097,7 +9141,7 @@
+ fi
+ 
+ echo $ac_n "checking for makedev macro""... $ac_c" 1>&6
+-echo "configure:9101: checking for makedev macro" >&5
++echo "configure:9145: checking for makedev macro" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_MAKEDEV_FN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9106,7 +9150,7 @@
+   samba_cv_HAVE_MAKEDEV_FN=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9110 "configure"
++#line 9154 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -9115,7 +9159,7 @@
+ #include <sys/types.h>
+ main() { dev_t dev = makedev(1,2); return 0; }
+ EOF
+-if { (eval echo configure:9119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_MAKEDEV_FN=yes
+ else
+@@ -9138,7 +9182,7 @@
+ fi
+ 
+ echo $ac_n "checking for unsigned char""... $ac_c" 1>&6
+-echo "configure:9142: checking for unsigned char" >&5
++echo "configure:9186: checking for unsigned char" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UNSIGNED_CHAR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9147,12 +9191,12 @@
+   samba_cv_HAVE_UNSIGNED_CHAR=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9151 "configure"
++#line 9195 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ main() { char c; c=250; exit((c > 0)?0:1); }
+ EOF
+-if { (eval echo configure:9156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_UNSIGNED_CHAR=yes
+ else
+@@ -9175,13 +9219,13 @@
+ fi
+ 
+ echo $ac_n "checking for sin_len in sock""... $ac_c" 1>&6
+-echo "configure:9179: checking for sin_len in sock" >&5
++echo "configure:9223: checking for sin_len in sock" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_SOCK_SIN_LEN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9185 "configure"
++#line 9229 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/socket.h>
+@@ -9190,7 +9234,7 @@
+ struct sockaddr_in sock; sock.sin_len = sizeof(sock);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9194: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_SOCK_SIN_LEN=yes
+ else
+@@ -9211,13 +9255,13 @@
+ fi
+ 
+ echo $ac_n "checking whether seekdir returns void""... $ac_c" 1>&6
+-echo "configure:9215: checking whether seekdir returns void" >&5
++echo "configure:9259: checking whether seekdir returns void" >&5
+ if eval "test \"`echo '$''{'samba_cv_SEEKDIR_RETURNS_VOID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9221 "configure"
++#line 9265 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <dirent.h>
+@@ -9226,7 +9270,7 @@
+ return 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9274: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_SEEKDIR_RETURNS_VOID=yes
+ else
+@@ -9247,20 +9291,20 @@
+ fi
+ 
+ echo $ac_n "checking for __FILE__ macro""... $ac_c" 1>&6
+-echo "configure:9251: checking for __FILE__ macro" >&5
++echo "configure:9295: checking for __FILE__ macro" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_FILE_MACRO'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9257 "configure"
++#line 9301 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("%s\n", __FILE__);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9308: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_FILE_MACRO=yes
+ else
+@@ -9281,20 +9325,20 @@
+ fi
+ 
+ echo $ac_n "checking for __FUNCTION__ macro""... $ac_c" 1>&6
+-echo "configure:9285: checking for __FUNCTION__ macro" >&5
++echo "configure:9329: checking for __FUNCTION__ macro" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_FUNCTION_MACRO'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9291 "configure"
++#line 9335 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int main() {
+ printf("%s\n", __FUNCTION__);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_FUNCTION_MACRO=yes
+ else
+@@ -9315,7 +9359,7 @@
+ fi
+ 
+ echo $ac_n "checking if gettimeofday takes tz argument""... $ac_c" 1>&6
+-echo "configure:9319: checking if gettimeofday takes tz argument" >&5
++echo "configure:9363: checking if gettimeofday takes tz argument" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_GETTIMEOFDAY_TZ'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9324,14 +9368,14 @@
+   samba_cv_HAVE_GETTIMEOFDAY_TZ=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9328 "configure"
++#line 9372 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/time.h>
+ #include <unistd.h>
+ main() { struct timeval tv; exit(gettimeofday(&tv, NULL));}
+ EOF
+-if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_GETTIMEOFDAY_TZ=yes
+ else
+@@ -9354,7 +9398,7 @@
+ fi
+ 
+ echo $ac_n "checking for C99 vsnprintf""... $ac_c" 1>&6
+-echo "configure:9358: checking for C99 vsnprintf" >&5
++echo "configure:9402: checking for C99 vsnprintf" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_C99_VSNPRINTF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9363,7 +9407,7 @@
+   samba_cv_HAVE_C99_VSNPRINTF=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9367 "configure"
++#line 9411 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -9385,7 +9429,7 @@
+ main() { foo("hello"); }
+ 
+ EOF
+-if { (eval echo configure:9389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_C99_VSNPRINTF=yes
+ else
+@@ -9408,7 +9452,7 @@
+ fi
+ 
+ echo $ac_n "checking for broken readdir""... $ac_c" 1>&6
+-echo "configure:9412: checking for broken readdir" >&5
++echo "configure:9456: checking for broken readdir" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_READDIR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9417,7 +9461,7 @@
+   samba_cv_HAVE_BROKEN_READDIR=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9421 "configure"
++#line 9465 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <dirent.h>
+@@ -9425,7 +9469,7 @@
+ if (di && di->d_name[-2] == '.' && di->d_name[-1] == 0 &&
+ di->d_name[0] == 0) exit(0); exit(1);} 
+ EOF
+-if { (eval echo configure:9429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:9473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_BROKEN_READDIR=yes
+ else
+@@ -9448,13 +9492,13 @@
+ fi
+ 
+ echo $ac_n "checking for utimbuf""... $ac_c" 1>&6
+-echo "configure:9452: checking for utimbuf" >&5
++echo "configure:9496: checking for utimbuf" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UTIMBUF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9458 "configure"
++#line 9502 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utime.h>
+@@ -9462,7 +9506,7 @@
+ struct utimbuf tbuf;  tbuf.actime = 0; tbuf.modtime = 1; exit(utime("foo.c",&tbuf));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UTIMBUF=yes
+ else
+@@ -9486,12 +9530,12 @@
+ for ac_func in pututline pututxline updwtmp updwtmpx getutmpx
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:9490: checking for $ac_func" >&5
++echo "configure:9534: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9495 "configure"
++#line 9539 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -9514,7 +9558,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:9562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -9540,13 +9584,13 @@
+ 
+ 
+ echo $ac_n "checking for ut_name in utmp""... $ac_c" 1>&6
+-echo "configure:9544: checking for ut_name in utmp" >&5
++echo "configure:9588: checking for ut_name in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_NAME'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9550 "configure"
++#line 9594 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9554,7 +9598,7 @@
+ struct utmp ut;  ut.ut_name[0] = 'a';
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_NAME=yes
+ else
+@@ -9575,13 +9619,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_user in utmp""... $ac_c" 1>&6
+-echo "configure:9579: checking for ut_user in utmp" >&5
++echo "configure:9623: checking for ut_user in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_USER'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9585 "configure"
++#line 9629 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9589,7 +9633,7 @@
+ struct utmp ut;  ut.ut_user[0] = 'a';
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_USER=yes
+ else
+@@ -9610,13 +9654,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_id in utmp""... $ac_c" 1>&6
+-echo "configure:9614: checking for ut_id in utmp" >&5
++echo "configure:9658: checking for ut_id in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9620 "configure"
++#line 9664 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9624,7 +9668,7 @@
+ struct utmp ut;  ut.ut_id[0] = 'a';
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9672: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_ID=yes
+ else
+@@ -9645,13 +9689,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_host in utmp""... $ac_c" 1>&6
+-echo "configure:9649: checking for ut_host in utmp" >&5
++echo "configure:9693: checking for ut_host in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_HOST'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9655 "configure"
++#line 9699 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9659,7 +9703,7 @@
+ struct utmp ut;  ut.ut_host[0] = 'a';
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9663: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_HOST=yes
+ else
+@@ -9680,13 +9724,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_time in utmp""... $ac_c" 1>&6
+-echo "configure:9684: checking for ut_time in utmp" >&5
++echo "configure:9728: checking for ut_time in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TIME'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9690 "configure"
++#line 9734 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9694,7 +9738,7 @@
+ struct utmp ut;  time_t t; ut.ut_time = t;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_TIME=yes
+ else
+@@ -9715,13 +9759,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_tv in utmp""... $ac_c" 1>&6
+-echo "configure:9719: checking for ut_tv in utmp" >&5
++echo "configure:9763: checking for ut_tv in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TV'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9725 "configure"
++#line 9769 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9729,7 +9773,7 @@
+ struct utmp ut;  struct timeval tv; ut.ut_tv = tv;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_TV=yes
+ else
+@@ -9750,13 +9794,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_type in utmp""... $ac_c" 1>&6
+-echo "configure:9754: checking for ut_type in utmp" >&5
++echo "configure:9798: checking for ut_type in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_TYPE'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9760 "configure"
++#line 9804 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9764,7 +9808,7 @@
+ struct utmp ut;  ut.ut_type = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9768: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_TYPE=yes
+ else
+@@ -9785,13 +9829,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_pid in utmp""... $ac_c" 1>&6
+-echo "configure:9789: checking for ut_pid in utmp" >&5
++echo "configure:9833: checking for ut_pid in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_PID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9795 "configure"
++#line 9839 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9799,7 +9843,7 @@
+ struct utmp ut;  ut.ut_pid = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_PID=yes
+ else
+@@ -9820,13 +9864,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_exit in utmp""... $ac_c" 1>&6
+-echo "configure:9824: checking for ut_exit in utmp" >&5
++echo "configure:9868: checking for ut_exit in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_EXIT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9830 "configure"
++#line 9874 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9834,7 +9878,7 @@
+ struct utmp ut;  ut.ut_exit.e_exit = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9882: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_EXIT=yes
+ else
+@@ -9855,13 +9899,13 @@
+ fi 
+ 
+ echo $ac_n "checking for ut_addr in utmp""... $ac_c" 1>&6
+-echo "configure:9859: checking for ut_addr in utmp" >&5
++echo "configure:9903: checking for ut_addr in utmp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UT_UT_ADDR'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9865 "configure"
++#line 9909 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9869,7 +9913,7 @@
+ struct utmp ut;  ut.ut_addr = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9873: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UT_UT_ADDR=yes
+ else
+@@ -9891,13 +9935,13 @@
+ 
+ if test x$ac_cv_func_pututline = xyes ; then
+   echo $ac_n "checking whether pututline returns pointer""... $ac_c" 1>&6
+-echo "configure:9895: checking whether pututline returns pointer" >&5
++echo "configure:9939: checking whether pututline returns pointer" >&5
+ if eval "test \"`echo '$''{'samba_cv_PUTUTLINE_RETURNS_UTMP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+   cat > conftest.$ac_ext <<EOF
+-#line 9901 "configure"
++#line 9945 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmp.h>
+@@ -9905,7 +9949,7 @@
+ struct utmp utarg; struct utmp *utreturn; utreturn = pututline(&utarg);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9909: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9953: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_PUTUTLINE_RETURNS_UTMP=yes
+ else
+@@ -9927,13 +9971,13 @@
+ fi
+ 
+ echo $ac_n "checking for ut_syslen in utmpx""... $ac_c" 1>&6
+-echo "configure:9931: checking for ut_syslen in utmpx" >&5
++echo "configure:9975: checking for ut_syslen in utmpx" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UX_UT_SYSLEN'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 9937 "configure"
++#line 9981 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <utmpx.h>
+@@ -9941,7 +9985,7 @@
+ struct utmpx ux;  ux.ut_syslen = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:9945: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:9989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UX_UT_SYSLEN=yes
+ else
+@@ -9962,7 +10006,7 @@
+ fi 
+ 
+ echo $ac_n "checking for Linux kernel oplocks""... $ac_c" 1>&6
+-echo "configure:9966: checking for Linux kernel oplocks" >&5
++echo "configure:10010: checking for Linux kernel oplocks" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_LINUX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -9971,7 +10015,7 @@
+   samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 9975 "configure"
++#line 10019 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -9985,7 +10029,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:9989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_KERNEL_OPLOCKS_LINUX=yes
+ else
+@@ -10008,7 +10052,7 @@
+ fi
+ 
+ echo $ac_n "checking for kernel change notify support""... $ac_c" 1>&6
+-echo "configure:10012: checking for kernel change notify support" >&5
++echo "configure:10056: checking for kernel change notify support" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_CHANGE_NOTIFY'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10017,7 +10061,7 @@
+   samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10021 "configure"
++#line 10065 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10031,7 +10075,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:10035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10079: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_KERNEL_CHANGE_NOTIFY=yes
+ else
+@@ -10054,7 +10098,7 @@
+ fi
+ 
+ echo $ac_n "checking for kernel share modes""... $ac_c" 1>&6
+-echo "configure:10058: checking for kernel share modes" >&5
++echo "configure:10102: checking for kernel share modes" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_SHARE_MODES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10063,7 +10107,7 @@
+   samba_cv_HAVE_KERNEL_SHARE_MODES=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10067 "configure"
++#line 10111 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/types.h>
+@@ -10079,7 +10123,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:10083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_KERNEL_SHARE_MODES=yes
+ else
+@@ -10105,13 +10149,13 @@
+ 
+ 
+ echo $ac_n "checking for IRIX kernel oplock type definitions""... $ac_c" 1>&6
+-echo "configure:10109: checking for IRIX kernel oplock type definitions" >&5
++echo "configure:10153: checking for IRIX kernel oplock type definitions" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_KERNEL_OPLOCKS_IRIX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10115 "configure"
++#line 10159 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <fcntl.h>
+@@ -10119,7 +10163,7 @@
+ oplock_stat_t t; t.os_state = OP_REVOKE; t.os_dev = 1; t.os_ino = 1;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_KERNEL_OPLOCKS_IRIX=yes
+ else
+@@ -10140,7 +10184,7 @@
+ fi
+ 
+ echo $ac_n "checking for irix specific capabilities""... $ac_c" 1>&6
+-echo "configure:10144: checking for irix specific capabilities" >&5
++echo "configure:10188: checking for irix specific capabilities" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10149,7 +10193,7 @@
+   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10153 "configure"
++#line 10197 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/capability.h>
+@@ -10164,7 +10208,7 @@
+ }
+ 
+ EOF
+-if { (eval echo configure:10168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10212: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_IRIX_SPECIFIC_CAPABILITIES=yes
+ else
+@@ -10192,13 +10236,13 @@
+ #
+ 
+ echo $ac_n "checking for int16 typedef included by rpc/rpc.h""... $ac_c" 1>&6
+-echo "configure:10196: checking for int16 typedef included by rpc/rpc.h" >&5
++echo "configure:10240: checking for int16 typedef included by rpc/rpc.h" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_INT16_FROM_RPC_RPC_H'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10202 "configure"
++#line 10246 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if defined(HAVE_RPC_RPC_H)
+@@ -10208,7 +10252,7 @@
+ int16 testvar;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10212: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_INT16_FROM_RPC_RPC_H=yes
+ else
+@@ -10229,13 +10273,13 @@
+ fi
+ 
+ echo $ac_n "checking for uint16 typedef included by rpc/rpc.h""... $ac_c" 1>&6
+-echo "configure:10233: checking for uint16 typedef included by rpc/rpc.h" >&5
++echo "configure:10277: checking for uint16 typedef included by rpc/rpc.h" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UINT16_FROM_RPC_RPC_H'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10239 "configure"
++#line 10283 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if defined(HAVE_RPC_RPC_H)
+@@ -10245,7 +10289,7 @@
+ uint16 testvar;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10249: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10293: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UINT16_FROM_RPC_RPC_H=yes
+ else
+@@ -10266,13 +10310,13 @@
+ fi
+ 
+ echo $ac_n "checking for int32 typedef included by rpc/rpc.h""... $ac_c" 1>&6
+-echo "configure:10270: checking for int32 typedef included by rpc/rpc.h" >&5
++echo "configure:10314: checking for int32 typedef included by rpc/rpc.h" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_INT32_FROM_RPC_RPC_H'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10276 "configure"
++#line 10320 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if defined(HAVE_RPC_RPC_H)
+@@ -10282,7 +10326,7 @@
+ int32 testvar;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10286: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10330: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_INT32_FROM_RPC_RPC_H=yes
+ else
+@@ -10303,13 +10347,13 @@
+ fi
+ 
+ echo $ac_n "checking for uint32 typedef included by rpc/rpc.h""... $ac_c" 1>&6
+-echo "configure:10307: checking for uint32 typedef included by rpc/rpc.h" >&5
++echo "configure:10351: checking for uint32 typedef included by rpc/rpc.h" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_UINT32_FROM_RPC_RPC_H'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10313 "configure"
++#line 10357 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #if defined(HAVE_RPC_RPC_H)
+@@ -10319,7 +10363,7 @@
+ uint32 testvar;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10323: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10367: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_UINT32_FROM_RPC_RPC_H=yes
+ else
+@@ -10341,13 +10385,13 @@
+ 
+ 
+ echo $ac_n "checking for conflicting AUTH_ERROR define in rpc/rpc.h""... $ac_c" 1>&6
+-echo "configure:10345: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
++echo "configure:10389: checking for conflicting AUTH_ERROR define in rpc/rpc.h" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 10351 "configure"
++#line 10395 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SECURITY_H
+@@ -10361,7 +10405,7 @@
+ int testvar;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_RPC_AUTH_ERROR_CONFLICT=no
+ else
+@@ -10382,16 +10426,16 @@
+ fi
+ 
+ echo $ac_n "checking for test routines""... $ac_c" 1>&6
+-echo "configure:10386: checking for test routines" >&5
++echo "configure:10430: checking for test routines" >&5
+ if test "$cross_compiling" = yes; then
+   echo "configure: warning: cannot run when cross-compiling" 1>&2
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10391 "configure"
++#line 10435 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/trivial.c"
+ EOF
+-if { (eval echo configure:10395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "$ac_t""yes" 1>&6
+ else
+@@ -10405,7 +10449,7 @@
+ 
+ 
+ echo $ac_n "checking for ftruncate extend""... $ac_c" 1>&6
+-echo "configure:10409: checking for ftruncate extend" >&5
++echo "configure:10453: checking for ftruncate extend" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_FTRUNCATE_EXTEND'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10414,11 +10458,11 @@
+   samba_cv_HAVE_FTRUNCATE_EXTEND=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10418 "configure"
++#line 10462 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/ftruncate.c"
+ EOF
+-if { (eval echo configure:10422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_FTRUNCATE_EXTEND=yes
+ else
+@@ -10441,7 +10485,7 @@
+ fi
+ 
+ echo $ac_n "checking for broken getgroups""... $ac_c" 1>&6
+-echo "configure:10445: checking for broken getgroups" >&5
++echo "configure:10489: checking for broken getgroups" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_GETGROUPS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10450,11 +10494,11 @@
+   samba_cv_HAVE_BROKEN_GETGROUPS=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10454 "configure"
++#line 10498 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/getgroups.c"
+ EOF
+-if { (eval echo configure:10458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_BROKEN_GETGROUPS=yes
+ else
+@@ -10477,7 +10521,7 @@
+ fi
+ 
+ echo $ac_n "checking whether getpass should be replaced""... $ac_c" 1>&6
+-echo "configure:10481: checking whether getpass should be replaced" >&5
++echo "configure:10525: checking whether getpass should be replaced" >&5
+ if eval "test \"`echo '$''{'samba_cv_REPLACE_GETPASS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10485,7 +10529,7 @@
+ SAVE_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS -I${srcdir-.}/ -I${srcdir-.}/include -I${srcdir-.}/ubiqx -I${srcdir-.}/smbwrapper"
+ cat > conftest.$ac_ext <<EOF
+-#line 10489 "configure"
++#line 10533 "configure"
+ #include "confdefs.h"
+ 
+ #define REPLACE_GETPASS 1
+@@ -10498,7 +10542,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:10502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:10546: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_REPLACE_GETPASS=yes
+ else
+@@ -10521,7 +10565,7 @@
+ fi
+ 
+ echo $ac_n "checking for broken inet_ntoa""... $ac_c" 1>&6
+-echo "configure:10525: checking for broken inet_ntoa" >&5
++echo "configure:10569: checking for broken inet_ntoa" >&5
+ if eval "test \"`echo '$''{'samba_cv_REPLACE_INET_NTOA'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10530,7 +10574,7 @@
+   samba_cv_REPLACE_INET_NTOA=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10534 "configure"
++#line 10578 "configure"
+ #include "confdefs.h"
+ 
+ #include <stdio.h>
+@@ -10544,7 +10588,7 @@
+     strcmp(inet_ntoa(ip),"120.86.52.18")) { exit(0); } 
+ exit(1);}
+ EOF
+-if { (eval echo configure:10548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_REPLACE_INET_NTOA=yes
+ else
+@@ -10567,7 +10611,7 @@
+ fi
+ 
+ echo $ac_n "checking for secure mkstemp""... $ac_c" 1>&6
+-echo "configure:10571: checking for secure mkstemp" >&5
++echo "configure:10615: checking for secure mkstemp" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_SECURE_MKSTEMP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10576,7 +10620,7 @@
+   samba_cv_HAVE_SECURE_MKSTEMP=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10580 "configure"
++#line 10624 "configure"
+ #include "confdefs.h"
+ #include <stdlib.h>
+ #include <sys/types.h>
+@@ -10593,7 +10637,7 @@
+   exit(0);
+ }
+ EOF
+-if { (eval echo configure:10597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_SECURE_MKSTEMP=yes
+ else
+@@ -10616,7 +10660,7 @@
+ fi
+ 
+ echo $ac_n "checking for sysconf(_SC_NGROUPS_MAX)""... $ac_c" 1>&6
+-echo "configure:10620: checking for sysconf(_SC_NGROUPS_MAX)" >&5
++echo "configure:10664: checking for sysconf(_SC_NGROUPS_MAX)" >&5
+ if eval "test \"`echo '$''{'samba_cv_SYSCONF_SC_NGROUPS_MAX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10625,12 +10669,12 @@
+   samba_cv_SYSCONF_SC_NGROUPS_MAX=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10629 "configure"
++#line 10673 "configure"
+ #include "confdefs.h"
+ #include <unistd.h>
+ main() { exit(sysconf(_SC_NGROUPS_MAX) == -1 ? 1 : 0); }
+ EOF
+-if { (eval echo configure:10634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_SYSCONF_SC_NGROUPS_MAX=yes
+ else
+@@ -10653,7 +10697,7 @@
+ fi
+ 
+ echo $ac_n "checking for root""... $ac_c" 1>&6
+-echo "configure:10657: checking for root" >&5
++echo "configure:10701: checking for root" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_ROOT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10662,11 +10706,11 @@
+   samba_cv_HAVE_ROOT=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10666 "configure"
++#line 10710 "configure"
+ #include "confdefs.h"
+ main() { exit(getuid() != 0); }
+ EOF
+-if { (eval echo configure:10670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_ROOT=yes
+ else
+@@ -10694,7 +10738,7 @@
+ # look for a method of finding the list of network interfaces
+ iface=no;
+ echo $ac_n "checking for iface AIX""... $ac_c" 1>&6
+-echo "configure:10698: checking for iface AIX" >&5
++echo "configure:10742: checking for iface AIX" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_AIX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10703,7 +10747,7 @@
+   samba_cv_HAVE_IFACE_AIX=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10707 "configure"
++#line 10751 "configure"
+ #include "confdefs.h"
+ 
+ #define HAVE_IFACE_AIX 1
+@@ -10711,7 +10755,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/interfaces.c"
+ EOF
+-if { (eval echo configure:10715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_IFACE_AIX=yes
+ else
+@@ -10735,7 +10779,7 @@
+ 
+ if test $iface = no; then
+ echo $ac_n "checking for iface ifconf""... $ac_c" 1>&6
+-echo "configure:10739: checking for iface ifconf" >&5
++echo "configure:10783: checking for iface ifconf" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFCONF'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10744,7 +10788,7 @@
+   samba_cv_HAVE_IFACE_IFCONF=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10748 "configure"
++#line 10792 "configure"
+ #include "confdefs.h"
+ 
+ #define HAVE_IFACE_IFCONF 1
+@@ -10752,7 +10796,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/interfaces.c"
+ EOF
+-if { (eval echo configure:10756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_IFACE_IFCONF=yes
+ else
+@@ -10777,7 +10821,7 @@
+ 
+ if test $iface = no; then
+ echo $ac_n "checking for iface ifreq""... $ac_c" 1>&6
+-echo "configure:10781: checking for iface ifreq" >&5
++echo "configure:10825: checking for iface ifreq" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_IFACE_IFREQ'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10786,7 +10830,7 @@
+   samba_cv_HAVE_IFACE_IFREQ=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10790 "configure"
++#line 10834 "configure"
+ #include "confdefs.h"
+ 
+ #define HAVE_IFACE_IFREQ 1
+@@ -10794,7 +10838,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/interfaces.c"
+ EOF
+-if { (eval echo configure:10798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_IFACE_IFREQ=yes
+ else
+@@ -10823,7 +10867,7 @@
+ seteuid=no;
+ if test $seteuid = no; then
+ echo $ac_n "checking for setresuid""... $ac_c" 1>&6
+-echo "configure:10827: checking for setresuid" >&5
++echo "configure:10871: checking for setresuid" >&5
+ if eval "test \"`echo '$''{'samba_cv_USE_SETRESUID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10832,7 +10876,7 @@
+   samba_cv_USE_SETRESUID=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10836 "configure"
++#line 10880 "configure"
+ #include "confdefs.h"
+ 
+ #define AUTOCONF_TEST 1
+@@ -10840,7 +10884,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/util_sec.c"
+ EOF
+-if { (eval echo configure:10844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_USE_SETRESUID=yes
+ else
+@@ -10866,7 +10910,7 @@
+ 
+ if test $seteuid = no; then
+ echo $ac_n "checking for setreuid""... $ac_c" 1>&6
+-echo "configure:10870: checking for setreuid" >&5
++echo "configure:10914: checking for setreuid" >&5
+ if eval "test \"`echo '$''{'samba_cv_USE_SETREUID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10875,7 +10919,7 @@
+   samba_cv_USE_SETREUID=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10879 "configure"
++#line 10923 "configure"
+ #include "confdefs.h"
+ 
+ #define AUTOCONF_TEST 1
+@@ -10883,7 +10927,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/util_sec.c"
+ EOF
+-if { (eval echo configure:10887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_USE_SETREUID=yes
+ else
+@@ -10908,7 +10952,7 @@
+ 
+ if test $seteuid = no; then
+ echo $ac_n "checking for seteuid""... $ac_c" 1>&6
+-echo "configure:10912: checking for seteuid" >&5
++echo "configure:10956: checking for seteuid" >&5
+ if eval "test \"`echo '$''{'samba_cv_USE_SETEUID'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10917,7 +10961,7 @@
+   samba_cv_USE_SETEUID=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10921 "configure"
++#line 10965 "configure"
+ #include "confdefs.h"
+ 
+ #define AUTOCONF_TEST 1
+@@ -10925,7 +10969,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/util_sec.c"
+ EOF
+-if { (eval echo configure:10929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_USE_SETEUID=yes
+ else
+@@ -10950,7 +10994,7 @@
+ 
+ if test $seteuid = no; then
+ echo $ac_n "checking for setuidx""... $ac_c" 1>&6
+-echo "configure:10954: checking for setuidx" >&5
++echo "configure:10998: checking for setuidx" >&5
+ if eval "test \"`echo '$''{'samba_cv_USE_SETUIDX'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -10959,7 +11003,7 @@
+   samba_cv_USE_SETUIDX=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 10963 "configure"
++#line 11007 "configure"
+ #include "confdefs.h"
+ 
+ #define AUTOCONF_TEST 1
+@@ -10967,7 +11011,7 @@
+ #include "confdefs.h"
+ #include "${srcdir-.}/lib/util_sec.c"
+ EOF
+-if { (eval echo configure:10971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_USE_SETUIDX=yes
+ else
+@@ -10992,7 +11036,7 @@
+ 
+ 
+ echo $ac_n "checking for working mmap""... $ac_c" 1>&6
+-echo "configure:10996: checking for working mmap" >&5
++echo "configure:11040: checking for working mmap" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_MMAP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11001,11 +11045,11 @@
+   samba_cv_HAVE_MMAP=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11005 "configure"
++#line 11049 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/shared_mmap.c"
+ EOF
+-if { (eval echo configure:11009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_MMAP=yes
+ else
+@@ -11028,7 +11072,7 @@
+ fi
+ 
+ echo $ac_n "checking for ftruncate needs root""... $ac_c" 1>&6
+-echo "configure:11032: checking for ftruncate needs root" >&5
++echo "configure:11076: checking for ftruncate needs root" >&5
+ if eval "test \"`echo '$''{'samba_cv_FTRUNCATE_NEEDS_ROOT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11037,11 +11081,11 @@
+   samba_cv_FTRUNCATE_NEEDS_ROOT=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11041 "configure"
++#line 11085 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/ftruncroot.c"
+ EOF
+-if { (eval echo configure:11045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_FTRUNCATE_NEEDS_ROOT=yes
+ else
+@@ -11064,7 +11108,7 @@
+ fi
+ 
+ echo $ac_n "checking for fcntl locking""... $ac_c" 1>&6
+-echo "configure:11068: checking for fcntl locking" >&5
++echo "configure:11112: checking for fcntl locking" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_FCNTL_LOCK'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11073,11 +11117,11 @@
+   samba_cv_HAVE_FCNTL_LOCK=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11077 "configure"
++#line 11121 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/fcntl_lock.c"
+ EOF
+-if { (eval echo configure:11081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_FCNTL_LOCK=yes
+ else
+@@ -11100,7 +11144,7 @@
+ fi
+ 
+ echo $ac_n "checking for broken (glibc2.1/x86) 64 bit fcntl locking""... $ac_c" 1>&6
+-echo "configure:11104: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
++echo "configure:11148: checking for broken (glibc2.1/x86) 64 bit fcntl locking" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_BROKEN_FCNTL64_LOCKS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11109,11 +11153,11 @@
+   samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11113 "configure"
++#line 11157 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/fcntl_lock64.c"
+ EOF
+-if { (eval echo configure:11117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_BROKEN_FCNTL64_LOCKS=yes
+ else
+@@ -11138,7 +11182,7 @@
+ 
+ 
+   echo $ac_n "checking for 64 bit fcntl locking""... $ac_c" 1>&6
+-echo "configure:11142: checking for 64 bit fcntl locking" >&5
++echo "configure:11186: checking for 64 bit fcntl locking" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_STRUCT_FLOCK64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11147,7 +11191,7 @@
+   samba_cv_HAVE_STRUCT_FLOCK64=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11151 "configure"
++#line 11195 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -11171,7 +11215,7 @@
+ #endif
+ }
+ EOF
+-if { (eval echo configure:11175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_STRUCT_FLOCK64=yes
+ else
+@@ -11196,13 +11240,13 @@
+ fi
+ 
+ echo $ac_n "checking for st_blocks in struct stat""... $ac_c" 1>&6
+-echo "configure:11200: checking for st_blocks in struct stat" >&5
++echo "configure:11244: checking for st_blocks in struct stat" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_STAT_ST_BLOCKS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 11206 "configure"
++#line 11250 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -11211,7 +11255,7 @@
+ struct stat st;  st.st_blocks = 0;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11215: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_STAT_ST_BLOCKS=yes
+ else
+@@ -11234,13 +11278,13 @@
+ case "$host_os" in
+ *linux*)
+ echo $ac_n "checking for broken RedHat 7.2 system header files""... $ac_c" 1>&6
+-echo "configure:11238: checking for broken RedHat 7.2 system header files" >&5
++echo "configure:11282: checking for broken RedHat 7.2 system header files" >&5
+ if eval "test \"`echo '$''{'samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 11244 "configure"
++#line 11288 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_VFS_H
+@@ -11254,7 +11298,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_BROKEN_REDHAT_7_SYSTEM_HEADERS=no
+ else
+@@ -11277,13 +11321,13 @@
+ esac
+ 
+ echo $ac_n "checking for broken nisplus include files""... $ac_c" 1>&6
+-echo "configure:11281: checking for broken nisplus include files" >&5
++echo "configure:11325: checking for broken nisplus include files" >&5
+ if eval "test \"`echo '$''{'samba_cv_BROKEN_NISPLUS_INCLUDE_FILES'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ cat > conftest.$ac_ext <<EOF
+-#line 11287 "configure"
++#line 11331 "configure"
+ #include "confdefs.h"
+ #include <sys/acl.h>
+ #if defined(HAVE_RPCSVC_NIS_H)
+@@ -11293,7 +11337,7 @@
+ int i;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:11341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_BROKEN_NISPLUS_INCLUDE_FILES=no
+ else
+@@ -11317,7 +11361,7 @@
+ #################################################
+ # check for smbwrapper support
+ echo $ac_n "checking whether to use smbwrapper""... $ac_c" 1>&6
+-echo "configure:11321: checking whether to use smbwrapper" >&5
++echo "configure:11365: checking whether to use smbwrapper" >&5
+ # Check whether --with-smbwrapper or --without-smbwrapper was given.
+ if test "${with_smbwrapper+set}" = set; then
+   withval="$with_smbwrapper"
+@@ -11361,7 +11405,7 @@
+ #################################################
+ # check for the AFS filesystem
+ echo $ac_n "checking whether to use AFS""... $ac_c" 1>&6
+-echo "configure:11365: checking whether to use AFS" >&5
++echo "configure:11409: checking whether to use AFS" >&5
+ # Check whether --with-afs or --without-afs was given.
+ if test "${with_afs+set}" = set; then
+   withval="$with_afs"
+@@ -11387,7 +11431,7 @@
+ #################################################
+ # check for the DFS auth system
+ echo $ac_n "checking whether to use DCE/DFS auth""... $ac_c" 1>&6
+-echo "configure:11391: checking whether to use DCE/DFS auth" >&5
++echo "configure:11435: checking whether to use DCE/DFS auth" >&5
+ # Check whether --with-dfs or --without-dfs was given.
+ if test "${with_dfs+set}" = set; then
+   withval="$with_dfs"
+@@ -11412,7 +11456,7 @@
+ #################################################
+ # check for Kerberos IV auth system
+ echo $ac_n "checking whether to use Kerberos IV""... $ac_c" 1>&6
+-echo "configure:11416: checking whether to use Kerberos IV" >&5
++echo "configure:11460: checking whether to use Kerberos IV" >&5
+ # Check whether --with-krb4 or --without-krb4 was given.
+ if test "${with_krb4+set}" = set; then
+   withval="$with_krb4"
+@@ -11424,7 +11468,7 @@
+ EOF
+ 
+     echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6
+-echo "configure:11428: checking for dn_expand in -lresolv" >&5
++echo "configure:11472: checking for dn_expand in -lresolv" >&5
+ ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11432,7 +11476,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lresolv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11436 "configure"
++#line 11480 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11443,7 +11487,7 @@
+ dn_expand()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11487,7 +11531,7 @@
+ #################################################
+ # check for Kerberos 5 auth system
+ echo $ac_n "checking whether to use Kerberos 5""... $ac_c" 1>&6
+-echo "configure:11491: checking whether to use Kerberos 5" >&5
++echo "configure:11535: checking whether to use Kerberos 5" >&5
+ # Check whether --with-krb5 or --without-krb5 was given.
+ if test "${with_krb5+set}" = set; then
+   withval="$with_krb5"
+@@ -11515,7 +11559,7 @@
+ #################################################
+ # check for automount support
+ echo $ac_n "checking whether to use AUTOMOUNT""... $ac_c" 1>&6
+-echo "configure:11519: checking whether to use AUTOMOUNT" >&5
++echo "configure:11563: checking whether to use AUTOMOUNT" >&5
+ # Check whether --with-automount or --without-automount was given.
+ if test "${with_automount+set}" = set; then
+   withval="$with_automount"
+@@ -11540,7 +11584,7 @@
+ #################################################
+ # check for smbmount support
+ echo $ac_n "checking whether to use SMBMOUNT""... $ac_c" 1>&6
+-echo "configure:11544: checking whether to use SMBMOUNT" >&5
++echo "configure:11588: checking whether to use SMBMOUNT" >&5
+ # Check whether --with-smbmount or --without-smbmount was given.
+ if test "${with_smbmount+set}" = set; then
+   withval="$with_smbmount"
+@@ -11577,7 +11621,7 @@
+ # check for a PAM password database
+ with_pam_for_crypt=no
+ echo $ac_n "checking whether to use PAM password database""... $ac_c" 1>&6
+-echo "configure:11581: checking whether to use PAM password database" >&5
++echo "configure:11625: checking whether to use PAM password database" >&5
+ # Check whether --with-pam or --without-pam was given.
+ if test "${with_pam+set}" = set; then
+   withval="$with_pam"
+@@ -11603,7 +11647,7 @@
+ 
+ # we can't build a pam module if we don't have pam.
+ echo $ac_n "checking for pam_get_data in -lpam""... $ac_c" 1>&6
+-echo "configure:11607: checking for pam_get_data in -lpam" >&5
++echo "configure:11651: checking for pam_get_data in -lpam" >&5
+ ac_lib_var=`echo pam'_'pam_get_data | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11611,7 +11655,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lpam  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11615 "configure"
++#line 11659 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11622,7 +11666,7 @@
+ pam_get_data()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11649,7 +11693,7 @@
+ #################################################
+ # check for pam_smbpass support
+ echo $ac_n "checking whether to use pam_smbpass""... $ac_c" 1>&6
+-echo "configure:11653: checking whether to use pam_smbpass" >&5
++echo "configure:11697: checking whether to use pam_smbpass" >&5
+ # Check whether --with-pam_smbpass or --without-pam_smbpass was given.
+ if test "${with_pam_smbpass+set}" = set; then
+   withval="$with_pam_smbpass"
+@@ -11691,12 +11735,12 @@
+ for ac_func in crypt
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:11695: checking for $ac_func" >&5
++echo "configure:11739: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11700 "configure"
++#line 11744 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+     which can conflict with char $ac_func(); below.  */
+@@ -11719,7 +11763,7 @@
+ 
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+ else
+@@ -11745,7 +11789,7 @@
+ 
+ if test x"$ac_cv_func_crypt" = x"no"; then
+     echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
+-echo "configure:11749: checking for crypt in -lcrypt" >&5
++echo "configure:11793: checking for crypt in -lcrypt" >&5
+ ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -11753,7 +11797,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lcrypt  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 11757 "configure"
++#line 11801 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -11764,7 +11808,7 @@
+ crypt()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:11768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:11812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -11799,7 +11843,7 @@
+ ##
+ if test $with_pam_for_crypt = no; then
+ echo $ac_n "checking for a crypt that needs truncated salt""... $ac_c" 1>&6
+-echo "configure:11803: checking for a crypt that needs truncated salt" >&5
++echo "configure:11847: checking for a crypt that needs truncated salt" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_TRUNCATED_SALT'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -11808,11 +11852,11 @@
+   samba_cv_HAVE_TRUNCATED_SALT=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 11812 "configure"
++#line 11856 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/crypttest.c"
+ EOF
+-if { (eval echo configure:11816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:11860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   samba_cv_HAVE_TRUNCATED_SALT=no
+ else
+@@ -11850,7 +11894,7 @@
+ #################################################
+ # check for a TDB password database
+ echo $ac_n "checking whether to use TDB SAM database""... $ac_c" 1>&6
+-echo "configure:11854: checking whether to use TDB SAM database" >&5
++echo "configure:11898: checking whether to use TDB SAM database" >&5
+ # Check whether --with-tdbsam or --without-tdbsam was given.
+ if test "${with_tdbsam+set}" = set; then
+   withval="$with_tdbsam"
+@@ -11876,7 +11920,7 @@
+ #################################################
+ # check for a LDAP password database
+ echo $ac_n "checking whether to use LDAP SAM database""... $ac_c" 1>&6
+-echo "configure:11880: checking whether to use LDAP SAM database" >&5
++echo "configure:11924: checking whether to use LDAP SAM database" >&5
+ # Check whether --with-ldapsam or --without-ldapsam was given.
+ if test "${with_ldapsam+set}" = set; then
+   withval="$with_ldapsam"
+@@ -11903,7 +11947,7 @@
+ #################################################
+ # check for a NISPLUS password database
+ echo $ac_n "checking whether to use NISPLUS SAM database""... $ac_c" 1>&6
+-echo "configure:11907: checking whether to use NISPLUS SAM database" >&5
++echo "configure:11951: checking whether to use NISPLUS SAM database" >&5
+ # Check whether --with-nisplussam or --without-nisplussam was given.
+ if test "${with_nisplussam+set}" = set; then
+   withval="$with_nisplussam"
+@@ -11931,7 +11975,7 @@
+ # smbpasswd SAM is only used if another format
+ # has not been defined
+ echo $ac_n "checking whether to use traditional smbpasswd file""... $ac_c" 1>&6
+-echo "configure:11935: checking whether to use traditional smbpasswd file" >&5
++echo "configure:11979: checking whether to use traditional smbpasswd file" >&5
+ if test $with_smbpasswd_sam = yes; then
+ 	echo "$ac_t""yes" 1>&6
+ 	cat >> confdefs.h <<\EOF
+@@ -11953,7 +11997,7 @@
+ #################################################
+ # check for a NISPLUS_HOME support 
+ echo $ac_n "checking whether to use NISPLUS_HOME""... $ac_c" 1>&6
+-echo "configure:11957: checking whether to use NISPLUS_HOME" >&5
++echo "configure:12001: checking whether to use NISPLUS_HOME" >&5
+ # Check whether --with-nisplus-home or --without-nisplus-home was given.
+ if test "${with_nisplus_home+set}" = set; then
+   withval="$with_nisplus_home"
+@@ -11978,7 +12022,7 @@
+ #################################################
+ # check for the secure socket layer
+ echo $ac_n "checking whether to use SSL""... $ac_c" 1>&6
+-echo "configure:11982: checking whether to use SSL" >&5
++echo "configure:12026: checking whether to use SSL" >&5
+ # Check whether --with-ssl or --without-ssl was given.
+ if test "${with_ssl+set}" = set; then
+   withval="$with_ssl"
+@@ -12052,7 +12096,7 @@
+ #################################################
+ # check for syslog logging
+ echo $ac_n "checking whether to use syslog logging""... $ac_c" 1>&6
+-echo "configure:12056: checking whether to use syslog logging" >&5
++echo "configure:12100: checking whether to use syslog logging" >&5
+ # Check whether --with-syslog or --without-syslog was given.
+ if test "${with_syslog+set}" = set; then
+   withval="$with_syslog"
+@@ -12077,7 +12121,7 @@
+ #################################################
+ # check for a shared memory profiling support
+ echo $ac_n "checking whether to use profiling""... $ac_c" 1>&6
+-echo "configure:12081: checking whether to use profiling" >&5
++echo "configure:12125: checking whether to use profiling" >&5
+ # Check whether --with-profiling-data or --without-profiling-data was given.
+ if test "${with_profiling_data+set}" = set; then
+   withval="$with_profiling_data"
+@@ -12105,7 +12149,7 @@
+ QUOTAOBJS=smbd/noquotas.o
+ 
+ echo $ac_n "checking whether to support disk-quotas""... $ac_c" 1>&6
+-echo "configure:12109: checking whether to support disk-quotas" >&5
++echo "configure:12153: checking whether to support disk-quotas" >&5
+ # Check whether --with-quotas or --without-quotas was given.
+ if test "${with_quotas+set}" = set; then
+   withval="$with_quotas"
+@@ -12117,13 +12161,13 @@
+       *linux*)
+         # Check for kernel 2.4.x quota braindamage...
+ 	echo $ac_n "checking for linux 2.4.x quota braindamage..""... $ac_c" 1>&6
+-echo "configure:12121: checking for linux 2.4.x quota braindamage.." >&5
++echo "configure:12165: checking for linux 2.4.x quota braindamage.." >&5
+ if eval "test \"`echo '$''{'samba_cv_linux_2_4_quota_braindamage'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+         cat > conftest.$ac_ext <<EOF
+-#line 12127 "configure"
++#line 12171 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ #include <sys/types.h>
+@@ -12135,7 +12179,7 @@
+ struct mem_dqblk D;
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12183: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_linux_2_4_quota_braindamage=yes
+ else
+@@ -12179,7 +12223,7 @@
+ # check for experimental utmp accounting
+ 
+ echo $ac_n "checking whether to support utmp accounting""... $ac_c" 1>&6
+-echo "configure:12183: checking whether to support utmp accounting" >&5
++echo "configure:12227: checking whether to support utmp accounting" >&5
+ # Check whether --with-utmp or --without-utmp was given.
+ if test "${with_utmp+set}" = set; then
+   withval="$with_utmp"
+@@ -12205,7 +12249,7 @@
+ # check for MS Dfs support
+ 
+ echo $ac_n "checking whether to support Microsoft Dfs""... $ac_c" 1>&6
+-echo "configure:12209: checking whether to support Microsoft Dfs" >&5
++echo "configure:12253: checking whether to support Microsoft Dfs" >&5
+ # Check whether --with-msdfs or --without-msdfs was given.
+ if test "${with_msdfs+set}" = set; then
+   withval="$with_msdfs"
+@@ -12231,7 +12275,7 @@
+ # check for Samba VFS support
+ 
+ echo $ac_n "checking whether to support the experimental Samba vfs""... $ac_c" 1>&6
+-echo "configure:12235: checking whether to support the experimental Samba vfs" >&5
++echo "configure:12279: checking whether to support the experimental Samba vfs" >&5
+ # Check whether --with-vfs or --without-vfs was given.
+ if test "${with_vfs+set}" = set; then
+   withval="$with_vfs"
+@@ -12258,9 +12302,9 @@
+ # should we build libsmbclient?
+ 
+ LIBSMBCLIENT_SHARED=
+-LIBSMBCLIENT=
++LIBSMBCLIENT_STATIC=
+ echo $ac_n "checking whether to build the libsmbclient shared library""... $ac_c" 1>&6
+-echo "configure:12264: checking whether to build the libsmbclient shared library" >&5
++echo "configure:12308: checking whether to build the libsmbclient shared library" >&5
+ # Check whether --with-libsmbclient or --without-libsmbclient was given.
+ if test "${with_libsmbclient+set}" = set; then
+   withval="$with_libsmbclient"
+@@ -12268,10 +12312,10 @@
+   yes)
+      if test $BLDSHARED = true; then
+         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
+-	LIBSMBCLIENT=libsmbclient
++        LIBSMBCLIENT_STATIC=bin/libsmbclient.a
+         echo "$ac_t""yes" 1>&6
+      else
+-        echo "$ac_t""no shared library support" 1>&6
++        echo "$ac_t""no static or shared libsmbclient support" 1>&6
+      fi
+      ;;
+   *)
+@@ -12287,14 +12331,14 @@
+ #################################################
+ # these tests are taken from the GNU fileutils package
+ echo "checking how to get filesystem space usage" 1>&6
+-echo "configure:12291: checking how to get filesystem space usage" >&5
++echo "configure:12335: checking how to get filesystem space usage" >&5
+ space=no
+ 
+ # Test for statvfs64.
+ if test $space = no; then
+   # SVR4
+   echo $ac_n "checking statvfs64 function (SVR4)""... $ac_c" 1>&6
+-echo "configure:12298: checking statvfs64 function (SVR4)" >&5
++echo "configure:12342: checking statvfs64 function (SVR4)" >&5
+ if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs64'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12302,7 +12346,7 @@
+   fu_cv_sys_stat_statvfs64=cross
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12306 "configure"
++#line 12350 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_UNISTD_H)
+@@ -12316,7 +12360,7 @@
+     exit (statvfs64 (".", &fsd));
+   }
+ EOF
+-if { (eval echo configure:12320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_statvfs64=yes
+ else
+@@ -12349,12 +12393,12 @@
+ if test $space = no; then
+   # SVR4
+   echo $ac_n "checking statvfs function (SVR4)""... $ac_c" 1>&6
+-echo "configure:12353: checking statvfs function (SVR4)" >&5
++echo "configure:12397: checking statvfs function (SVR4)" >&5
+ if eval "test \"`echo '$''{'fu_cv_sys_stat_statvfs'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12358 "configure"
++#line 12402 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/statvfs.h>
+@@ -12362,7 +12406,7 @@
+ struct statvfs fsd; statvfs (0, &fsd);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12366: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   fu_cv_sys_stat_statvfs=yes
+ else
+@@ -12387,7 +12431,7 @@
+ if test $space = no; then
+   # DEC Alpha running OSF/1
+   echo $ac_n "checking for 3-argument statfs function (DEC OSF/1)""... $ac_c" 1>&6
+-echo "configure:12391: checking for 3-argument statfs function (DEC OSF/1)" >&5
++echo "configure:12435: checking for 3-argument statfs function (DEC OSF/1)" >&5
+   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs3_osf1'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12395,7 +12439,7 @@
+   fu_cv_sys_stat_statfs3_osf1=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12399 "configure"
++#line 12443 "configure"
+ #include "confdefs.h"
+ 
+ #include <sys/param.h>
+@@ -12408,7 +12452,7 @@
+     exit (statfs (".", &fsd, sizeof (struct statfs)));
+   }
+ EOF
+-if { (eval echo configure:12412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_statfs3_osf1=yes
+ else
+@@ -12435,7 +12479,7 @@
+ if test $space = no; then
+ # AIX
+   echo $ac_n "checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)""... $ac_c" 1>&6
+-echo "configure:12439: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
++echo "configure:12483: checking for two-argument statfs with statfs.bsize member (AIX, 4.3BSD)" >&5
+   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_bsize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12443,7 +12487,7 @@
+   fu_cv_sys_stat_statfs2_bsize=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12447 "configure"
++#line 12491 "configure"
+ #include "confdefs.h"
+ 
+ #ifdef HAVE_SYS_PARAM_H
+@@ -12462,7 +12506,7 @@
+   exit (statfs (".", &fsd));
+   }
+ EOF
+-if { (eval echo configure:12466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_statfs2_bsize=yes
+ else
+@@ -12489,7 +12533,7 @@
+ if test $space = no; then
+ # SVR3
+   echo $ac_n "checking for four-argument statfs (AIX-3.2.5, SVR3)""... $ac_c" 1>&6
+-echo "configure:12493: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
++echo "configure:12537: checking for four-argument statfs (AIX-3.2.5, SVR3)" >&5
+   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs4'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12497,7 +12541,7 @@
+   fu_cv_sys_stat_statfs4=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12501 "configure"
++#line 12545 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/statfs.h>
+@@ -12507,7 +12551,7 @@
+   exit (statfs (".", &fsd, sizeof fsd, 0));
+   }
+ EOF
+-if { (eval echo configure:12511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_statfs4=yes
+ else
+@@ -12534,7 +12578,7 @@
+ if test $space = no; then
+ # 4.4BSD and NetBSD
+   echo $ac_n "checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)""... $ac_c" 1>&6
+-echo "configure:12538: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
++echo "configure:12582: checking for two-argument statfs with statfs.fsize member (4.4BSD and NetBSD)" >&5
+   if eval "test \"`echo '$''{'fu_cv_sys_stat_statfs2_fsize'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12542,7 +12586,7 @@
+   fu_cv_sys_stat_statfs2_fsize=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12546 "configure"
++#line 12590 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+@@ -12558,7 +12602,7 @@
+   exit (statfs (".", &fsd));
+   }
+ EOF
+-if { (eval echo configure:12562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_statfs2_fsize=yes
+ else
+@@ -12585,7 +12629,7 @@
+ if test $space = no; then
+   # Ultrix
+   echo $ac_n "checking for two-argument statfs with struct fs_data (Ultrix)""... $ac_c" 1>&6
+-echo "configure:12589: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
++echo "configure:12633: checking for two-argument statfs with struct fs_data (Ultrix)" >&5
+   if eval "test \"`echo '$''{'fu_cv_sys_stat_fs_data'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -12593,7 +12637,7 @@
+   fu_cv_sys_stat_fs_data=no
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 12597 "configure"
++#line 12641 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_PARAM_H
+@@ -12613,7 +12657,7 @@
+   exit (statfs (".", &fsd) != 1);
+   }
+ EOF
+-if { (eval echo configure:12617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:12661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   fu_cv_sys_stat_fs_data=yes
+ else
+@@ -12646,9 +12690,9 @@
+ # file support.
+ #
+ echo $ac_n "checking if large file support can be enabled""... $ac_c" 1>&6
+-echo "configure:12650: checking if large file support can be enabled" >&5
++echo "configure:12694: checking if large file support can be enabled" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 12652 "configure"
++#line 12696 "configure"
+ #include "confdefs.h"
+ 
+ #if defined(HAVE_LONGLONG) && (defined(HAVE_OFF64_T) || (defined(SIZEOF_OFF_T) && (SIZEOF_OFF_T == 8)))
+@@ -12661,7 +12705,7 @@
+ int i
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:12709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   samba_cv_HAVE_EXPLICIT_LARGEFILE_SUPPORT=yes
+ else
+@@ -12728,7 +12772,7 @@
+ # check for ACL support
+ 
+ echo $ac_n "checking whether to support ACLs""... $ac_c" 1>&6
+-echo "configure:12732: checking whether to support ACLs" >&5
++echo "configure:12776: checking whether to support ACLs" >&5
+ # Check whether --with-acl-support or --without-acl-support was given.
+ if test "${with_acl_support+set}" = set; then
+   withval="$with_acl_support"
+@@ -12781,7 +12825,7 @@
+ 			;;
+ 		*)
+ 		    echo $ac_n "checking for acl_get_file in -lacl""... $ac_c" 1>&6
+-echo "configure:12785: checking for acl_get_file in -lacl" >&5
++echo "configure:12829: checking for acl_get_file in -lacl" >&5
+ ac_lib_var=`echo acl'_'acl_get_file | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -12789,7 +12833,7 @@
+   ac_save_LIBS="$LIBS"
+ LIBS="-lacl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 12793 "configure"
++#line 12837 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+ /* We use char because int might match the return type of a gcc2
+@@ -12800,7 +12844,7 @@
+ acl_get_file()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -12828,13 +12872,13 @@
+ fi
+ 
+ 			echo $ac_n "checking for ACL support""... $ac_c" 1>&6
+-echo "configure:12832: checking for ACL support" >&5
++echo "configure:12876: checking for ACL support" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_POSIX_ACLS'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 			cat > conftest.$ac_ext <<EOF
+-#line 12838 "configure"
++#line 12882 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/acl.h>
+@@ -12842,7 +12886,7 @@
+  acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   samba_cv_HAVE_POSIX_ACLS=yes
+ else
+@@ -12862,13 +12906,13 @@
+ EOF
+ 
+ 				echo $ac_n "checking for acl_get_perm_np""... $ac_c" 1>&6
+-echo "configure:12866: checking for acl_get_perm_np" >&5
++echo "configure:12910: checking for acl_get_perm_np" >&5
+ if eval "test \"`echo '$''{'samba_cv_HAVE_ACL_GET_PERM_NP'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+ 				cat > conftest.$ac_ext <<EOF
+-#line 12872 "configure"
++#line 12916 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/acl.h>
+@@ -12876,7 +12920,7 @@
+  acl_permset_t permset_d; acl_perm_t perm; return acl_get_perm_np( permset_d, perm);
+ ; return 0; }
+ EOF
+-if { (eval echo configure:12880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:12924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   samba_cv_HAVE_ACL_GET_PERM_NP=yes
+ else
+@@ -12931,7 +12975,7 @@
+ # (WINBIND_STARGETS) and shared libraries (WINBIND_LTARGETS).
+ 
+ echo $ac_n "checking whether to build winbind""... $ac_c" 1>&6
+-echo "configure:12935: checking whether to build winbind" >&5
++echo "configure:12979: checking whether to build winbind" >&5
+ 
+ # Initially, the value of $host_os decides whether winbind is supported
+ 
+@@ -13010,11 +13054,11 @@
+   :
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 13014 "configure"
++#line 13058 "configure"
+ #include "confdefs.h"
+ #include "${srcdir-.}/tests/summary.c"
+ EOF
+-if { (eval echo configure:13018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:13062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+   echo "configure OK";
+ else
+@@ -13184,7 +13228,7 @@
+ s%@SHLIBEXT@%$SHLIBEXT%g
+ s%@BLDSHARED@%$BLDSHARED%g
+ s%@LIBSMBCLIENT_SHARED@%$LIBSMBCLIENT_SHARED%g
+-s%@LIBSMBCLIENT@%$LIBSMBCLIENT%g
++s%@LIBSMBCLIENT_STATIC@%$LIBSMBCLIENT_STATIC%g
+ s%@CC@%$CC%g
+ s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+--- samba-2.2.2.cvs20020120.orig/source/configure.in
++++ samba-2.2.2.cvs20020120/source/configure.in
+@@ -145,7 +145,7 @@
+ AC_SUBST(SHLIBEXT)
+ AC_SUBST(BLDSHARED)
+ AC_SUBST(LIBSMBCLIENT_SHARED)
+-AC_SUBST(LIBSMBCLIENT)
++AC_SUBST(LIBSMBCLIENT_STATIC)
+ 
+ # compile with optimization and without debugging by default
+ CFLAGS="-O ${CFLAGS}"
+@@ -340,6 +340,28 @@
+ #endif
+ }
+ ], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
++	if test x$LINUX_LFS_SUPPORT = xyes ; then
++          AC_TRY_RUN([
++#include <unistd.h>
++#include <sys/types.h>
++#include <fcntl.h>
++main() {
++   unsigned int *padding;
++   struct flock foo_lock = {F_WRLCK, SEEK_SET, 0, 1, 0};
++   int fd = open("/dev/null", O_RDWR);
++
++   /* Yes, we're depending on the internals of the Linux flock structure
++      here -- but this test is explicitly Linux-specific to begin with. */
++   padding = (unsigned int *)&foo_lock;
++   padding[1] = 0xffffffff;
++   foo_lock.l_start = 0;
++   if (fcntl(fd, F_SETLK, &foo_lock) < 0)
++      exit(1);
++
++   exit(0);
++}
++], [LINUX_LFS_SUPPORT=yes], [LINUX_LFS_SUPPORT=no], [LINUX_LFS_SUPPORT=cross])
++	fi
+         CPPFLAGS="$old_CPPFLAGS"
+         if test x$LINUX_LFS_SUPPORT = xyes ; then
+           CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
+@@ -2232,7 +2254,7 @@
+ # should we build libsmbclient?
+ 
+ LIBSMBCLIENT_SHARED=
+-LIBSMBCLIENT=
++LIBSMBCLIENT_STATIC=
+ AC_MSG_CHECKING(whether to build the libsmbclient shared library)
+ AC_ARG_WITH(libsmbclient,
+ [  --with-libsmbclient     Build the libsmbclient shared library (default=no)],
+@@ -2240,10 +2262,10 @@
+   yes)
+      if test $BLDSHARED = true; then
+         LIBSMBCLIENT_SHARED=bin/libsmbclient.$SHLIBEXT
+-	LIBSMBCLIENT=libsmbclient
++        LIBSMBCLIENT_STATIC=bin/libsmbclient.a
+         AC_MSG_RESULT(yes)
+      else
+-        AC_MSG_RESULT(no shared library support)
++        AC_MSG_RESULT(no static or shared libsmbclient support)
+      fi
+      ;;
+   *)
diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch
new file mode 100644
index 0000000000..d7880a2514
--- /dev/null
+++ b/packaging/Debian/debian/patches/loadparm.patch
@@ -0,0 +1,78 @@
+--- samba-2.2.2.cvs20020201/source/param/loadparm.c.orig	Fri Feb  1 17:03:50 2002
++++ samba-2.2.2.cvs20020201/source/param/loadparm.c	Fri Feb  1 18:45:41 2002
+@@ -1085,26 +1085,26 @@
+ 		case PRINT_AIX:
+ 		case PRINT_LPRNT:
+ 		case PRINT_LPROS2:
+-			string_set(&sDefault.szLpqcommand, "lpq -P%p");
+-			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
++			string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
++			string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
+ 			string_set(&sDefault.szPrintcommand,
+-				   "lpr -r -P%p %s");
++				   "lpr -r -P'%p' %s");
+ 			break;
+ 
+ 		case PRINT_LPRNG:
+ 		case PRINT_PLP:
+-			string_set(&sDefault.szLpqcommand, "lpq -P%p");
+-			string_set(&sDefault.szLprmcommand, "lprm -P%p %j");
++			string_set(&sDefault.szLpqcommand, "lpq -P'%p'");
++			string_set(&sDefault.szLprmcommand, "lprm -P'%p' %j");
+ 			string_set(&sDefault.szPrintcommand,
+-				   "lpr -r -P%p %s");
++				   "lpr -r -P'%p' %s");
+ 			string_set(&sDefault.szQueuepausecommand,
+-				   "lpc stop %p");
++				   "lpc stop '%p'");
+ 			string_set(&sDefault.szQueueresumecommand,
+-				   "lpc start %p");
++				   "lpc start '%p'");
+ 			string_set(&sDefault.szLppausecommand,
+-				   "lpc hold %p %j");
++				   "lpc hold '%p' %j");
+ 			string_set(&sDefault.szLpresumecommand,
+-				   "lpc release %p %j");
++				   "lpc release '%p' %j");
+ 			break;
+ 
+ 		case PRINT_CUPS:
+@@ -1120,19 +1120,19 @@
+ 			string_set(&Globals.szPrintcapname, "cups");
+ #else
+ 			string_set(&sDefault.szLpqcommand,
+-			           "/usr/bin/lpstat -o %p");
++			           "/usr/bin/lpstat -o '%p'");
+ 			string_set(&sDefault.szLprmcommand,
+-			           "/usr/bin/cancel %p-%j");
++			           "/usr/bin/cancel '%p-%j'");
+ 			string_set(&sDefault.szPrintcommand,
+-			           "/usr/bin/lp -d %p %s; rm %s");
++			           "/usr/bin/lp -d '%p' %s; rm %s");
+ 			string_set(&sDefault.szLppausecommand,
+-				   "lp -i %p-%j -H hold");
++				   "lp -i '%p-%j' -H hold");
+ 			string_set(&sDefault.szLpresumecommand,
+-				   "lp -i %p-%j -H resume");
++				   "lp -i '%p-%j' -H resume");
+ 			string_set(&sDefault.szQueuepausecommand,
+-			           "/usr/bin/disable %p");
++			           "/usr/bin/disable '%p'");
+ 			string_set(&sDefault.szQueueresumecommand,
+-			           "/usr/bin/enable %p");
++			           "/usr/bin/enable '%p'");
+ 			string_set(&Globals.szPrintcapname, "lpstat");
+ #endif /* HAVE_CUPS */
+ 			break;
+@@ -1437,7 +1437,10 @@
+ 	else
+ 		StrnCpy(ret, s, len);
+ 
+-	trim_string(ret, "\"", "\"");
++	if (trim_string(ret, "\"", "\"")) {
++		if (strchr(ret,'"') != NULL)
++			StrnCpy(ret, s, len);
++	}
+ 
+ 	standard_sub_basic(ret);
+ 	return (ret);
diff --git a/packaging/Debian/debian/patches/samba.patch b/packaging/Debian/debian/patches/samba.patch
new file mode 100644
index 0000000000..be251861cb
--- /dev/null
+++ b/packaging/Debian/debian/patches/samba.patch
@@ -0,0 +1,199 @@
+--- samba-2.2.2.cvs20020120.orig/source/client/smbmount.c
++++ samba-2.2.2.cvs20020120/source/client/smbmount.c
+@@ -719,7 +719,7 @@
+ 					*lp = 0;
+ 					pstrcpy(password,lp+1);
+ 					got_pass = True;
+-					memset(strchr(opteq+1,'%')+1,'X',strlen(password));
++					memset(strchr(opteq+1,'%')+1,'\0',strlen(password));
+ 				}
+ 				if ((lp=strchr(username,'/'))) {
+ 					*lp = 0;
+@@ -729,7 +729,7 @@
+ 				  !strcmp(opts, "password")) {
+ 				pstrcpy(password,opteq+1);
+ 				got_pass = True;
+-				memset(opteq+1,'X',strlen(password));
++				memset(opteq+1,'\0',strlen(password));
+ 			} else if(!strcmp(opts, "credentials")) {
+ 				pstrcpy(credentials,opteq+1);
+ 			} else if(!strcmp(opts, "netbiosname")) {
+@@ -822,7 +822,7 @@
+ 			*p = 0;
+ 			pstrcpy(password,p+1);
+ 			got_pass = True;
+-			memset(strchr(getenv("USER"),'%')+1,'X',strlen(password));
++			memset(strchr(getenv("USER"),'%')+1,'\0',strlen(password));
+ 		}
+ 		strupper(username);
+ 	}
+--- samba-2.2.2.cvs20020120.orig/source/script/installbin.sh
++++ samba-2.2.2.cvs20020120/source/script/installbin.sh
+@@ -11,7 +11,7 @@
+ shift
+ shift
+ 
+-for d in $BASEDIR $BINDIR $LIBDIR $VARDIR $BASEDIR/private; do
++for d in $BASEDIR $BINDIR $LIBDIR $VARDIR; do
+ if [ ! -d $d ]; then
+ mkdir $d
+ if [ ! -d $d ]; then
+@@ -33,9 +33,11 @@
+  chmod $INSTALLPERMS $BINDIR/$p2
+ 
+  # this is a special case, mount needs this in a specific location
+- if [ $p2 = smbmount ]; then
+-   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
+- fi
++# Commented out for the Debian Samba package. We take care of this
++#	important symlink in debian/rules. (peloy@debian.org)
++# if [ $p2 = smbmount ]; then
++#   ln -sf $BINDIR/$p2 /sbin/mount.smbfs
++# fi
+ done
+ 
+ 
+--- samba-2.2.2.cvs20020120.orig/source/script/installswat.sh
++++ samba-2.2.2.cvs20020120/source/script/installswat.sh
+@@ -48,8 +48,8 @@
+ for f in $SRCDIR../docs/htmldocs/*.html; do
+       FNAME=$SWATDIR/help/`basename $f`
+       echo $FNAME
+-      cp $f $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
+-      chmod 0644 $FNAME
++      ln -s ../../../../doc/samba-doc/htmldocs/`basename $f` $FNAME || echo Cannot install $FNAME. Does $USER have privileges?
++#      chmod 0644 $FNAME
+ done
+ 
+ # Install "server-side" includes
+@@ -63,7 +63,10 @@
+ 
+ # 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
+ 
+--- samba-2.2.2.cvs20020120.orig/source/web/diagnose.c
++++ samba-2.2.2.cvs20020120/source/web/diagnose.c
+@@ -54,6 +54,7 @@
+ 	static struct cli_state cli;
+ 	extern struct in_addr loopback_ip;
+ 
++	loopback_ip.s_addr = htonl((127 << 24) + 1);
+ 	if (!cli_initialise(&cli))
+ 		return False;
+ 
+--- samba-2.2.2.cvs20020120.orig/source/web/startstop.c
++++ samba-2.2.2.cvs20020120/source/web/startstop.c
+@@ -37,7 +37,7 @@
+ 		return;
+ 	}
+ 
+-	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", SBINDIR);
++	slprintf(binfile, sizeof(pstring) - 1, "%s/smbd", "/usr/sbin");
+ 
+ 	become_daemon();
+ 
+@@ -58,7 +58,7 @@
+ 		return;
+ 	}
+ 
+-	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", SBINDIR);
++	slprintf(binfile, sizeof(pstring) - 1, "%s/nmbd", "/usr/sbin");
+ 	
+ 	become_daemon();
+ 
+--- samba-2.2.2.cvs20020120.orig/source/web/swat.c
++++ samba-2.2.2.cvs20020120/source/web/swat.c
+@@ -49,6 +49,19 @@
+ #define ENABLE_USER_FLAG "enable_user_flag"
+ #define RHOST "remote_host"
+ 
++typedef struct html_conversion {
++	char src;
++	char *dest;
++} html_conversion;
++
++static const html_conversion entities[] = {
++	{ '"', "&quot;"	},
++	{ '&', "&amp;"	},
++	{ '<', "&lt;"	},
++	{ '>', "&gt;"	},
++	{ '\0', NULL },
++};
++
+ /* we need these because we link to locking*.o */
+  void become_root(void) {}
+  void unbecome_root(void) {}
+@@ -77,6 +90,51 @@
+ 	return newstring;
+ }
+ 
++static char *htmlentities(char *str)
++{
++	int i,j, destlen = 0;
++	int length = strlen(str);
++	/* Feel free to use a pstring if appropriate -- I haven't 
++	   checked if it's guaranteed to be long enough, and suspect it 
++	   isn't. -SRL */
++	char *dststr = NULL;
++	char *p;
++
++	for (i = 0; i < length; i++) {
++		for (j = 0; entities[j].src; j++) {
++			if (str[i] == entities[j].src) {
++				destlen += strlen(entities[j].dest);
++				break;
++			}
++		}
++		if (!entities[j].src) {
++			destlen++;
++		}
++	}
++	if (length == destlen) {
++		return(strdup(str));
++	}
++	p = dststr = malloc(destlen + 1);
++	if (!dststr) {
++		return(NULL);
++	}
++	dststr[destlen] = '\0';
++	for (i = 0; i < length; i++) {
++		for (j = 0; entities[j].src; j++) {
++			if (str[i] == entities[j].src) {
++				strncpy(p, entities[j].dest,
++				        strlen(entities[j].dest));
++				p += strlen(entities[j].dest);
++				break;
++			}
++		}
++		if (!entities[j].src) {
++			*p++ = str[i];
++		}
++	}
++	return(dststr);
++}
++
+ static char *stripspace(char *str)
+ {
+ static char newstring[1024];
+@@ -182,8 +240,12 @@
+ 
+ 	case P_STRING:
+ 	case P_USTRING:
+-		printf("<input type=text size=40 name=\"parm_%s\" value=\"%s\">",
+-		       make_parm_name(parm->label), *(char **)ptr);
++		str = htmlentities(*(char **)ptr);
++		printf("<input type=\"text\" size=\"40\" name=\"parm_%s\" value=\"%s\">",
++		       make_parm_name(parm->label), str);
++		if (str != NULL) {
++			free(str);
++		}
+ 		printf("<input type=button value=\"Set Default\" onClick=\"swatform.parm_%s.value=\'%s\'\">",
+ 			make_parm_name(parm->label),fix_backslash((char *)(parm->def.svalue)));
+ 		break;
diff --git a/packaging/Debian/debian/patches/smbadduser.patch b/packaging/Debian/debian/patches/smbadduser.patch
new file mode 100644
index 0000000000..9bfb457301
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbadduser.patch
@@ -0,0 +1,22 @@
+--- samba-2.2.2.cvs20020120.orig/source/script/smbadduser
++++ samba-2.2.2.cvs20020120/source/script/smbadduser
+@@ -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.d/smbpasswd
+-set user_map  = /usr/local/samba/lib/users.map
+-#set user_map  = /etc/samba.d/smbusers
++set smbpasswd = /etc/samba/smbpasswd
++set user_map  = /etc/samba/users.map
+ #
+ # Set to site specific passwd command
+ #
diff --git a/packaging/Debian/debian/patches/smbclient-pager.patch b/packaging/Debian/debian/patches/smbclient-pager.patch
new file mode 100644
index 0000000000..d600c1bd9c
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbclient-pager.patch
@@ -0,0 +1,11 @@
+--- samba-2.2.2.cvs20020120.orig/source/include/local.h
++++ samba-2.2.2.cvs20020120/source/include/local.h
+@@ -105,7 +105,7 @@
+ /* the default pager to use for the client "more" command. Users can
+    override this with the PAGER environment variable */
+ #ifndef PAGER
+-#define PAGER "more"
++#define PAGER "/usr/bin/pager"
+ #endif
+ 
+ /* the size of the uid cache used to reduce valid user checks */
diff --git a/packaging/Debian/debian/patches/smbclient-xfer-speed.patch b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch
new file mode 100644
index 0000000000..3ff8b60069
--- /dev/null
+++ b/packaging/Debian/debian/patches/smbclient-xfer-speed.patch
@@ -0,0 +1,17 @@
+--- samba-2.2.2.cvs20020120/source/client/client.c.orig	Wed Jan 23 23:32:44 2002
++++ samba-2.2.2.cvs20020120/source/client/client.c	Wed Jan 23 23:33:50 2002
+@@ -92,10 +92,10 @@
+ extern file_info def_finfo;
+ 
+ /* timing globals */
+-int get_total_size = 0;
+-int get_total_time_ms = 0;
+-int put_total_size = 0;
+-int put_total_time_ms = 0;
++SMB_BIG_UINT get_total_size = 0;
++unsigned int get_total_time_ms = 0;
++SMB_BIG_UINT put_total_size = 0;
++unsigned int put_total_time_ms = 0;
+ 
+ /* totals globals */
+ static double dir_total;
diff --git a/packaging/Debian/debian/rules b/packaging/Debian/debian/rules
new file mode 100755
index 0000000000..1083a10f46
--- /dev/null
+++ b/packaging/Debian/debian/rules
@@ -0,0 +1,274 @@
+#!/usr/bin/make -f
+# 
+# Important modifications (introduction of a saved config.cache to
+#	solve build problems) we introduced in Samba 2.2.1a-5. These
+#	modification were made by Steve Langasek <vorlon@netexpress.net>.
+#
+
+# Uncomment this to turn on verbose mode. 
+#export DH_VERBOSE=1
+
+# This is the debhelper compatability version to use.
+export DH_COMPAT=2
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+# Set the host and build architectures for use with config.cache loading,
+# cross-building, etc.
+DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+export DEB_HOST_GNU_TYPE
+export DEB_BUILD_GNU_TYPE
+
+BVARS = SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb
+
+DESTDIR=`pwd`/debian/samba
+SWATDIR=`pwd`/debian/swat
+SAMBABOOK=`pwd`/debian/swat
+
+IVARS = BASEDIR=$(DESTDIR)/usr \
+		BINDIR=$(DESTDIR)/usr/bin \
+		SBINDIR=$(DESTDIR)/usr/sbin \
+		MANDIR=$(DESTDIR)/usr/share/man \
+		LIBDIR=$(DESTDIR)/etc/samba \
+		VARDIR=$(DESTDIR)/var/state/samba \
+		INCLUDEDIR=$(DESTDIR)/usr/include \
+		SWATDIR=$(SWATDIR)/usr/share/samba/swat \
+		SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba \
+		CODEPAGEDIR=$(DESTDIR)/usr/share/samba/codepages
+
+patch: patch-stamp
+patch-stamp:
+	dh_testdir
+	if [ ! -f patch-stamp ]; then debian/scripts/patch-source; fi
+	touch patch-stamp
+
+unpatch:
+	dh_testdir
+	if [ -f patch-stamp ]; then debian/scripts/unpatch-source; fi
+	rm -f patch-stamp
+
+configure: patch-stamp configure-stamp
+configure-stamp:
+	dh_testdir
+
+	# Add here commands to configure the package.
+# > 
+# > Does the --with-fhs option work in configure? I tried it with
+# > alpha3, but everything was stored in /usr/local. Is that correct?
+# > ...
+#
+# Yes - the default prefix is still /usr/local; --with-fhs just
+# changes the default paths for the config, etc. files to match
+# the GNU/FHS specs.  To get a complete FHS directory spec, use:
+#
+#     ./configure --with-fhs --prefix=/usr --sysconfdir=/etc \
+#        --localstatedir=/var
+
+	if [ -f debian/config.cache ]; then \
+		cp -f debian/config.cache source/config.cache; \
+	fi
+
+#	[ -f source/Makefile ] || (cd source && ./configure --with-fhs --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp)
+	[ -f source/Makefile ] || (cd source && ./configure \
+		--host=$(DEB_HOST_GNU_TYPE) \
+		--build=$(DEB_BUILD_GNU_TYPE) \
+		--with-fhs \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-privatedir=/etc/samba \
+		--with-lockdir=/var/state/samba \
+		--localstatedir=/var \
+		--with-netatalk \
+		--with-smbmount \
+		--with-pam \
+		--with-syslog \
+		--with-sambabook \
+		--with-utmp \
+		--with-readline \
+		--with-pam_smbpass \
+		--with-libsmbclient)
+
+	touch configure-stamp
+
+build: patch-stamp configure-stamp build-stamp
+build-stamp:
+	dh_testdir
+
+	# Compile the Samba package first
+#	$(MAKE) -C source $(BVARS) all smbtorture rpctorture debug2html
+	$(MAKE) -C source all
+
+	touch build-stamp
+
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+
+	# Clean first the Samba package
+#	-$(MAKE) -C source realclean
+#	-$(MAKE) -C source clean
+	-$(MAKE) -C source distclean
+
+	# Delete stuff left after a build that is not deleted by 'make clean'
+	rm -f source/bin/wbinfo source/bin/winbindd source/bin/rpctorture \
+		source/bin/debug2html
+
+	dh_clean
+
+install: DH_OPTIONS=
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) -C source install $(IVARS)
+
+	# libsmbclient is installed in usr/bin/. Move to usr/lib/.
+	mv $(DESTDIR)/usr/bin/libsmbclient.so $(DESTDIR)/usr/lib/libsmbclient.so.0.1
+	mv $(DESTDIR)/usr/bin/libsmbclient.a $(DESTDIR)/usr/lib/
+
+	# This is to comply with policy (the symlink that ldconfig would 
+	#	produce must exist in the package).
+	/sbin/ldconfig -n $(DESTDIR)/usr/lib/
+
+	# libsmbclient include file is not installed by standard
+	#	'make install' - do it manually.
+	$(MAKE) -C source installclientlib $(IVARS)
+
+	# Install other stuff not installed by "make install"
+	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
+	install -m 0755 debian/sambaconfig $(DESTDIR)/usr/sbin/
+	install -m 0755 source/bin/pam_smbpass.so $(DESTDIR)/lib/security/
+
+	# This is only temporary, while we create new packages for winbind and friends
+	install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
+	install -m 0644 source/nsswitch/pam_winbind.so $(DESTDIR)/lib/security/
+
+	# Create the symlink that will allow us to do "mount -t smbfs ...".
+	#	Create also a symlink that will allow "mount -t smb ..." to
+	#	work too. The symlink is created in $(DESTDIR)/sbin/ but 
+	#	will be moved by dh_movefiles to the smbfs package later on.
+	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smbfs
+	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smb
+	ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smb.8
+	ln -s smbmount.8 $(DESTDIR)/usr/share/man/man8/mount.smbfs.8
+
+	# For CUPS to support printing to samba printers, it's necessary
+	#	to make the following symlink (according to
+	#	Erich Schubert <debian@vitavonni.de> in #109509):
+	ln -s /usr/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/sambaconfig.8 $(DESTDIR)/usr/share/man/man8/sambaconfig.8
+	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
+
+	# Delete unwanted stuff leftover from "make install"
+
+	# The smbwrapper package is not being generated anymore, so we must
+	#	delete the related man pages.
+	rm $(DESTDIR)/usr/share/man/man1/smbsh.1
+
+	# Install samba-common's conffiles - they'll get moved later to their
+	#	correct place by dh_movefiles.
+	cp debian/smb.conf $(DESTDIR)/etc/samba/
+	cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
+
+	dh_movefiles --sourcedir=debian/samba/
+
+	# Remove empty directories that will never be used.
+	rmdir $(DESTDIR)/sbin
+
+# Build architecture-independent files here.
+# Pass -i to all debhelper commands in this target to reduce clutter.
+binary-indep: DH_OPTIONS=-i
+binary-indep: build install
+	# Need this version of debhelper for DH_OPTIONS to work.
+	dh_testversion 1.1.17
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf
+	dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf
+	# dh_installexamples is not available in Debian Potato...
+	[ -x /usr/bin/dh_installexamples ] && dh_installexamples
+#	dh_installmenu
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installinit
+#	dh_installcron
+#	dh_installmanpages
+#	dh_installinfo
+#	dh_undocumented
+	dh_installchangelogs 
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+#	dh_perl
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+# Build architecture-dependent files here.
+# Pass -a to all debhelper commands in this target to reduce clutter.
+binary-arch: DH_OPTIONS=-a
+binary-arch: build install
+	# Need this version of debhelper for DH_OPTIONS to work.
+	dh_testversion 1.1.17
+	dh_testdir
+	dh_testroot
+#	dh_installdebconf
+	dh_installdocs -A docs/textdocs/DIAGNOSIS.txt debian/README.build docs/README* docs/Samba-HOWTO-Collection.pdf
+	# dh_installexamples is not available in Debian Potato...
+	[ -x /usr/bin/dh_installexamples ] && dh_installexamples
+#	dh_installmenu
+	# dh_installlogrotate is not available in Debian Potato...
+	if [ -x /usr/bin/dh_installlogrotate ]; then dh_installlogrotate; else mkdir debian/samba/etc/logrotate.d; cp debian/samba.logrotate debian/samba/etc/logrotate.d/samba; fi
+#	dh_installemacsen
+#	dh_installpam
+	dh_installinit
+	dh_installcron
+#	dh_installmanpages
+#	dh_installinfo
+	dh_undocumented
+	dh_installchangelogs 
+	dh_strip
+	dh_link
+	dh_compress
+	dh_fixperms
+
+	# You may want to make some executables suid here.
+	# The smbmnt and smbumount binaries should be setuid-root. This
+	#	has security implications because these programs haven't had
+	#	a thorough security audit. smbmount _does not_ have to have
+	#	the setuid bit set. In fact, it is a security hole.
+	chmod u+s debian/smbfs/usr/bin/smbmnt
+	chmod u+s debian/smbfs/usr/bin/smbumount
+
+	# Set some reasonable default perms for the samba logdir.
+	chmod 0750 $(DESTDIR)/var/log/samba/
+	chown root.adm $(DESTDIR)/var/log/samba/
+
+	dh_installdeb
+#	dh_makeshlibs
+#	dh_perl
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/packaging/Debian/debian/rules.old b/packaging/Debian/debian/rules.old
new file mode 100644
index 0000000000..ac322185a9
--- /dev/null
+++ b/packaging/Debian/debian/rules.old
@@ -0,0 +1,194 @@
+#!/usr/bin/make -f
+# Made with the iad of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Also some stuff taken from debmake scripts, by Cristopt Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+BVARS = BASEDIR=/usr \
+		LIBDIR=/etc/samba \
+		SMB_PASSWD_FILE=/etc/samba/smbpasswd \
+		SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb \
+		LOCKDIR=/var/samba \
+		SWATDIR=/usr/share/samba/swat
+
+DESTDIR=`pwd`/debian/tmp
+SWATDIR=`pwd`/debian/swat
+SAMBABOOK=`pwd`/debian/swat
+
+IVARS = BASEDIR=$(DESTDIR)/usr \
+		BINDIR=$(DESTDIR)/usr/bin \
+		SBINDIR=$(DESTDIR)/usr/sbin \
+		MANDIR=$(DESTDIR)/usr/share/man \
+		LIBDIR=$(DESTDIR)/etc/samba \
+		VARDIR=$(DESTDIR)/var/samba \
+		SWATDIR=$(SWATDIR)/usr/share/samba/swat \
+		SAMBABOOK=$(SAMBABOOK)/usr/share/samba/swat/using_samba
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Compile the Samba package first
+	[ -f source/Makefile ] || (cd source && ./configure --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-pam --with-syslog --with-sambabook --with-utmp)
+	$(MAKE) -C source $(BVARS) all smbtorture rpctorture debug2html
+
+	# Now compile the old smbfs package
+	$(MAKE) -C source/smbfs-2.0.x
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+
+	# Clean first the Samba package
+#	-$(MAKE) -C source realclean
+	-$(MAKE) -C source distclean
+#	-$(MAKE) -C source clean
+	rm -f source/bin/{rpctorture,smbtorture,debug2html}
+
+	# Now clean the old smbfs-2.0.x package
+	-$(MAKE) -C source/smbfs-2.0.x clean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) -C source install $(IVARS)
+
+	# Install other stuff not installed by "make install"
+	install -m 0755 source/script/mksmbpasswd.sh $(DESTDIR)/usr/sbin/mksmbpasswd
+	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/
+	install -m 0755 debian/sambaconfig $(DESTDIR)/usr/sbin/
+
+	# Create the symlink that will allow us to do "mount -t smbfs ...".
+	#	Create also a symlink that will allow "mount -t smb ..." to
+	#	work too. The symlink is created in $(DESTDIR)/sbin/ but 
+	#	will be moved by dh_movefiles to the smbfs package later on.
+	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.smbfs
+	ln -s /usr/bin/smbmount $(DESTDIR)/sbin/mount.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 /usr/share/doc/samba-doc/htmldocs/using_samba $(SAMBABOOK)/usr/share/samba/swat/using_samba
+
+	# Install man pages for files without man pages in the upstream dist.
+	install -m 0644 debian/sambaconfig.8 $(DESTDIR)/usr/share/man/man8/sambaconfig.8
+	install -m 0644 debian/addtosmbpass.8 $(DESTDIR)/usr/share/man/man8/addtosmbpass.8
+	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
+
+	# Delete unwanted stuff leftover from "make install"
+
+	# smbrun is not longer needed by smbd, so delete its man page
+	rm $(DESTDIR)/usr/share/man/man1/smbrun.1
+
+	# The smbwrapper package is not being generated anymore, so we must
+	#	delete the related man pages.
+	rm $(DESTDIR)/usr/share/man/man1/smbsh.1
+
+	# We need to rename the SMB mount utilities so they don't have the same
+	#	names as the files in the smbfs package.
+	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.2.x
+	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.2.x
+	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.2.x.8
+	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.2.x.8
+
+	# These files are not part of the main samba package, move to where they
+	#	belong...
+	#mv $(DESTDIR)/usr/bin/smbwrapper.so debian/smbwrapper/usr/share/samba/
+
+	# The smbmnt, smbmount-2.2.x and smbumount-2.2.x binaries must 
+	#	be setuid-root.
+	chmod u+s $(DESTDIR)/usr/bin/smbmnt $(DESTDIR)/usr/bin/smbmount-2.2.x $(DESTDIR)/usr/bin/smbumount-2.2.x
+
+	# Install samba-common's conffiles
+	cp debian/smb.conf $(DESTDIR)/etc/samba/
+	cp debian/samba.pamd $(DESTDIR)/etc/pam.d/samba
+
+	# OK, now it's time to install the smbfs-2.0.2 files
+	$(MAKE) -C source/smbfs-2.0.x install $(IVARS)
+
+	# Rename the old smbfs utilities to more convenient names
+	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.0.x
+	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.0.x
+	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.0.x.8
+	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.0.x.8
+
+	# Now install the smbmount and smbumount wrappers and its man pages
+	install debian/smbmount.sh $(DESTDIR)/usr/bin/smbmount
+	install debian/smbumount.sh $(DESTDIR)/usr/bin/smbumount
+	install -m 0644 debian/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount.8
+	install -m 0644 debian/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount.8
+
+	# Install some docs. that go in "unusual" places
+	cp README-smbmount debian/smbfs/usr/share/doc/smbfs/2.2.x/
+	cp source/smbfs-2.0.x/{FAQ,README,smbfs-2.0.2.lsm,Changes} debian/smbfs/usr/share/doc/smbfs/2.0.x/
+
+	dh_movefiles
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+#	dh_testversion
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -A docs/textdocs/DIAGNOSIS.txt
+	dh_installexamples -i
+#	dh_installmenu -i
+#	dh_installemacsen -i
+#	dh_installinit -i
+#	dh_installcron -i
+#	dh_installmanpages -i
+	dh_undocumented
+	dh_installchangelogs -i 
+	dh_compress -i
+#	dh_suidregister -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a -A docs/textdocs/DIAGNOSIS.txt -A debian/README.linux
+	dh_installexamples -a
+#	dh_installmenu -a
+#	dh_installemacsen -a
+	dh_installinit -a
+	dh_installcron -a
+#	dh_installmanpages -a
+	dh_undocumented
+	dh_installchangelogs -a 
+	dh_strip -a
+	dh_compress -a
+	dh_suidregister -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+#	dh_makeshlibs -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/packaging/Debian/debian/rules.smbwrapper b/packaging/Debian/debian/rules.smbwrapper
new file mode 100644
index 0000000000..e3c72ee47c
--- /dev/null
+++ b/packaging/Debian/debian/rules.smbwrapper
@@ -0,0 +1,172 @@
+#!/usr/bin/make -f
+# Made with the iad of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Also some stuff taken from debmake scripts, by Cristopt Lameter.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+BVARS = BASEDIR=/usr \
+		LIBDIR=/etc/samba \
+		SMB_PASSWD_FILE=/etc/samba/smbpasswd \
+		SMBLOGFILE=/var/log/smb NMBLOGFILE=/var/log/nmb \
+		LOCKDIR=/var/samba \
+		SWATDIR=/usr/share/samba/swat
+
+DESTDIR=`pwd`/debian/tmp
+SWATDIR=`pwd`/debian/swat
+
+IVARS = BASEDIR=$(DESTDIR)/usr \
+		BINDIR=$(DESTDIR)/usr/bin \
+		SBINDIR=$(DESTDIR)/usr/sbin \
+		MANDIR=$(DESTDIR)/usr/share/man \
+		LIBDIR=$(DESTDIR)/etc/samba \
+		VARDIR=$(DESTDIR)/var/samba \
+		SWATDIR=$(SWATDIR)/usr/share/samba/swat
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Compile the Samba package first
+	[ -f source/Makefile ] || (cd source && ./configure --prefix=/usr --exec-prefix=/usr --with-netatalk --with-smbmount --with-smbwrapper)
+	$(MAKE) -C source $(BVARS) all smbtorture rpctorture debug2html
+
+	# Now compile the old smbfs package
+	$(MAKE) -C source/smbfs-2.0.x
+
+	touch build-stamp
+
+clean:
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp install-stamp
+
+	# Clean first the Samba package
+#	-$(MAKE) -C source realclean
+	-$(MAKE) -C source distclean
+#	-$(MAKE) -C source clean
+	rm -f source/bin/{rpctorture,smbtorture,debug2html}
+
+	# Now clean the old smbfs-2.0.x package
+	-$(MAKE) -C source/smbfs-2.0.x clean
+
+	dh_clean
+
+install: install-stamp
+install-stamp: build-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	# Add here commands to install the package into debian/tmp.
+	$(MAKE) -C source install $(IVARS)
+
+	# Install other stuff not installed by "make install"
+	install -m 0755 source/script/mksmbpasswd.sh $(DESTDIR)/usr/sbin/mksmbpasswd
+	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/
+	install -m 0755 debian/sambaconfig $(DESTDIR)/usr/sbin/
+	install -m 0755 source/smbadduser $(DESTDIR)/usr/sbin/
+
+	# Install man pages for files without man pages in the upstream dist.
+	install -m 0644 debian/sambaconfig.8 $(DESTDIR)/usr/share/man/man8/sambaconfig.8
+	install -m 0644 debian/addtosmbpass.8 $(DESTDIR)/usr/share/man/man8/addtosmbpass.8
+	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
+
+	# Delete unwanted stuff leftover from "make install"
+
+	# smbrun is not longer needed by smbd, so delete its man page
+	rm $(DESTDIR)/usr/share/man/man1/smbrun.1
+
+	# We need to rename the SMB mount utilities so they don't have the same
+	#	names as the files in the smbfs package.
+	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.2.x
+	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.2.x
+	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.2.x.8
+	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.2.x.8
+
+	# These files are not part of the main samba package, move to where they
+	#	belong...
+	mv $(DESTDIR)/usr/bin/smbwrapper.so debian/smbwrapper/usr/share/samba/
+
+	# The smbmnt, smbmount-2.2.x and smbumount-2.2.x binaries must 
+	#	be setuid-root.
+	chmod u+s $(DESTDIR)/usr/bin/smbmnt $(DESTDIR)/usr/bin/smbmount-2.2.x $(DESTDIR)/usr/bin/smbumount-2.2.x
+
+	# Install samba-common's conffiles
+	cp debian/smb.conf $(DESTDIR)/etc/samba/
+
+
+	# OK, now it's time to install the smbfs-2.0.2 files
+	$(MAKE) -C source/smbfs-2.0.x install $(IVARS)
+
+	# Rename the old smbfs utilities to more convenient names
+	mv $(DESTDIR)/usr/bin/smbmount $(DESTDIR)/usr/bin/smbmount-2.0.x
+	mv $(DESTDIR)/usr/bin/smbumount $(DESTDIR)/usr/bin/smbumount-2.0.x
+	mv $(DESTDIR)/usr/share/man/man8/smbmount.8 $(DESTDIR)/usr/share/man/man8/smbmount-2.0.x.8
+	mv $(DESTDIR)/usr/share/man/man8/smbumount.8 $(DESTDIR)/usr/share/man/man8/smbumount-2.0.x.8
+
+	# Now install the smbmount and smbumount wrappers
+	install debian/smbmount.sh $(DESTDIR)/usr/bin/smbmount
+	install debian/smbumount.sh $(DESTDIR)/usr/bin/smbumount
+
+	# Install some docs. that go in "unusual" places
+	cp README-smbmount debian/smbfs/usr/share/doc/smbfs/2.2.x/
+	cp source/smbfs-2.0.x/{FAQ,README,smbfs-2.0.2.lsm,Changes} debian/smbfs/usr/share/doc/smbfs/2.0.x/
+
+	dh_movefiles
+	touch install-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+#	dh_testversion
+	dh_testdir -i
+	dh_testroot -i
+	dh_installdocs -i -A docs/textdocs/DIAGNOSIS.txt
+	dh_installexamples -i
+#	dh_installmenu -i
+#	dh_installemacsen -i
+#	dh_installinit -i
+#	dh_installcron -i
+#	dh_installmanpages -i
+	dh_undocumented
+	dh_installchangelogs -i 
+	dh_compress -i
+#	dh_suidregister -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+#	dh_testversion
+	dh_testdir -a
+	dh_testroot -a
+	dh_installdocs -a -A docs/textdocs/DIAGNOSIS.txt
+	dh_installexamples -a
+#	dh_installmenu -a
+#	dh_installemacsen -a
+	dh_installinit -a
+	dh_installcron -a
+#	dh_installmanpages -a
+	dh_undocumented
+	dh_installchangelogs -a 
+	dh_strip -a
+	dh_compress -a
+	dh_suidregister -a
+	dh_fixperms -a
+	dh_installdeb -a
+	dh_shlibdeps -a
+	dh_gencontrol -a
+#	dh_makeshlibs -a
+	dh_md5sums -a
+	dh_builddeb -a
+
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary
diff --git a/packaging/Debian/debian/samba-common.conffiles b/packaging/Debian/debian/samba-common.conffiles
new file mode 100644
index 0000000000..b5703025dd
--- /dev/null
+++ b/packaging/Debian/debian/samba-common.conffiles
@@ -0,0 +1,2 @@
+/etc/samba/smb.conf
+/etc/pam.d/samba
diff --git a/packaging/Debian/debian/samba-common.files b/packaging/Debian/debian/samba-common.files
new file mode 100644
index 0000000000..94f2e25f6a
--- /dev/null
+++ b/packaging/Debian/debian/samba-common.files
@@ -0,0 +1,7 @@
+etc/samba/
+usr/bin/nmblookup
+usr/bin/smbpasswd
+etc/pam.d/
+usr/share/man/man1/nmblookup.1
+usr/share/man/man8/smbpasswd.8
+usr/share/samba/codepages/
diff --git a/packaging/Debian/debian/samba-common.postrm b/packaging/Debian/debian/samba-common.postrm
new file mode 100644
index 0000000000..2cd832b33d
--- /dev/null
+++ b/packaging/Debian/debian/samba-common.postrm
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$1" = purge ]; then
+	# Remove any files left in /etc/samba/
+	rm -Rf /etc/samba/
+fi
diff --git a/packaging/Debian/debian/samba-doc.docs b/packaging/Debian/debian/samba-doc.docs
new file mode 100644
index 0000000000..68753e54f0
--- /dev/null
+++ b/packaging/Debian/debian/samba-doc.docs
@@ -0,0 +1,9 @@
+README
+docs/Samba-HOWTO-Collection.pdf
+docs/THANKS
+docs/announce
+docs/history
+docs/textdocs/
+docs/faq/
+docs/htmldocs/
+docs/Registry/
diff --git a/packaging/Debian/debian/samba-doc.examples b/packaging/Debian/debian/samba-doc.examples
new file mode 100644
index 0000000000..e692dd810f
--- /dev/null
+++ b/packaging/Debian/debian/samba-doc.examples
@@ -0,0 +1,3 @@
+examples/
+debian/wins2dns.awk
+source/script/smbadduser
diff --git a/packaging/Debian/debian/samba.conffiles b/packaging/Debian/debian/samba.conffiles
new file mode 100644
index 0000000000..908a791a62
--- /dev/null
+++ b/packaging/Debian/debian/samba.conffiles
@@ -0,0 +1,3 @@
+/etc/cron.daily/samba
+/etc/init.d/samba
+/etc/logrotate.d/samba
diff --git a/packaging/Debian/debian/samba.cron.daily b/packaging/Debian/debian/samba.cron.daily
new file mode 100644
index 0000000000..42fc98d8f6
--- /dev/null
+++ b/packaging/Debian/debian/samba.cron.daily
@@ -0,0 +1,16 @@
+#!/bin/sh
+#
+# cron script to save a backup copy of /etc/samba/smbpasswd in /var/backups.
+#
+# Written by Eloy A. Paris <peloy@debian.org> for the Debian project.
+#
+
+BAK=/var/backups
+
+umask 022
+if cd $BAK; then
+	# Make sure /etc/samba/smbpasswd exists
+	if [ -f /etc/samba/smbpasswd ]; then
+		cmp -s smbpasswd.bak /etc/samba/smbpasswd || cp -p /etc/samba/smbpasswd smbpasswd.bak
+	fi
+fi
diff --git a/packaging/Debian/debian/samba.dirs b/packaging/Debian/debian/samba.dirs
new file mode 100644
index 0000000000..237603750a
--- /dev/null
+++ b/packaging/Debian/debian/samba.dirs
@@ -0,0 +1,11 @@
+sbin
+usr/bin
+usr/sbin
+var/log/samba
+var/state/samba
+etc/samba
+etc/pam.d
+usr/share
+usr/share/samba
+lib/security
+usr/lib/cups/backend
diff --git a/packaging/Debian/debian/samba.docs b/packaging/Debian/debian/samba.docs
new file mode 100644
index 0000000000..187fdd3405
--- /dev/null
+++ b/packaging/Debian/debian/samba.docs
@@ -0,0 +1,3 @@
+README 
+Roadmap
+WHATSNEW.txt
diff --git a/packaging/Debian/debian/samba.init b/packaging/Debian/debian/samba.init
new file mode 100644
index 0000000000..8ac2e97148
--- /dev/null
+++ b/packaging/Debian/debian/samba.init
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# Start/stops the Samba daemons (nmbd and smbd).
+#
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+DEBIAN_CONFIG=/etc/samba/debian_config
+
+NMBDPID=/var/state/samba/nmbd.pid
+SMBDPID=/var/state/samba/smbd.pid
+
+# clear conflicting settings from the environment
+unset TMPDIR
+
+# Sanity check: see if Samba has been configured on this system.
+if [ ! -f $DEBIAN_CONFIG ]; then
+	echo "The file $DEBIAN_CONFIG does not exist! There is something wrong"
+	echo "with the installation of Samba on this system. Please re-install"
+	echo "Samba. I can't continue!!!"
+	exit 1
+fi
+
+# Read current Samba configuration
+. $DEBIAN_CONFIG
+
+#       the Samba daemons.
+
+# If Samba is running from inetd then there is nothing to do
+if [ "$run_mode" = "from_inetd" ]; then
+	# Commented out to close bug #26884 (startup message is rather long). I
+	#	have yet to think how to let the user know that if he/she is running
+	#	Samba from inetd, he can't just "/etc/init.d/samba stop" to stop
+	#	the Samba daemons.
+#	echo "Warning: Samba is not running as daemons. Daemons not restarted/stopped."
+#	echo "Daemons will start automatically by inetd (if you wanted to start Samba)."
+#	echo "If you want to stop Samba, get the PID's of all nmbd and smbd processes"
+#	echo "and send them a SIGTERM signal but keep in mind that inetd could restart them."
+	exit 0
+fi
+
+# See if the daemons are there
+test -x /usr/sbin/nmbd -a -x /usr/sbin/smbd || exit 0
+
+case "$1" in
+	start)
+		echo -n "Starting Samba daemons:"
+
+		echo -n " nmbd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D
+
+		echo -n " smbd"
+		start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D
+
+		echo "."
+		;;
+	stop)
+		echo -n "Stopping Samba daemons:"
+
+		echo -n " nmbd"
+		start-stop-daemon --stop --quiet --pidfile $NMBDPID
+
+		echo -n " smbd"
+		start-stop-daemon --stop --quiet --pidfile $SMBDPID
+
+		echo "."
+		;;
+	reload)
+		echo -n "Reloading /etc/samba/smb.conf (smbd only)"
+		start-stop-daemon --stop --signal HUP --pidfile $SMBDPID
+
+		echo "."
+		;;
+	restart|force-reload)
+		echo -n "Restarting Samba daemons:"
+
+		echo -n " nmbd"
+		start-stop-daemon --stop --quiet --pidfile $NMBDPID
+		sleep 2
+		start-stop-daemon --start --quiet --exec /usr/sbin/nmbd -- -D
+
+		echo -n " smbd"
+		start-stop-daemon --stop --quiet --pidfile $SMBDPID
+		sleep 2
+		start-stop-daemon --start --quiet --exec /usr/sbin/smbd -- -D
+
+		echo "."
+		;;
+	*)
+		echo "Usage: /etc/init.d/samba {start|stop|reload|restart|force-reload}"
+		exit 1
+		;;
+esac
+
+exit 0
diff --git a/packaging/Debian/debian/samba.logrotate b/packaging/Debian/debian/samba.logrotate
new file mode 100644
index 0000000000..d264ce3d71
--- /dev/null
+++ b/packaging/Debian/debian/samba.logrotate
@@ -0,0 +1,21 @@
+/var/log/samba/log.smbd {
+	weekly
+	missingok
+	rotate 7
+	postrotate
+		killall -q -HUP smbd || true
+	endscript
+	compress
+	notifempty
+}
+
+/var/log/samba/log.nmbd {
+	weekly
+	missingok
+	rotate 7
+	postrotate
+		killall -q -HUP nmbd || true
+	endscript
+	compress
+	notifempty
+}
diff --git a/packaging/Debian/debian/samba.pamd b/packaging/Debian/debian/samba.pamd
new file mode 100644
index 0000000000..1a5a14c708
--- /dev/null
+++ b/packaging/Debian/debian/samba.pamd
@@ -0,0 +1,5 @@
+auth 		required	pam_unix.so nullok
+account		required	pam_unix.so
+session		required	pam_unix.so
+password	required	pam_unix.so
+
diff --git a/packaging/Debian/debian/samba.postinst b/packaging/Debian/debian/samba.postinst
new file mode 100644
index 0000000000..5f42cf4b36
--- /dev/null
+++ b/packaging/Debian/debian/samba.postinst
@@ -0,0 +1,218 @@
+#!/bin/sh
+#
+# Post-installation script for the Samba package for Debian GNU/Linux
+#
+# Written by Eloy A. Paris <peloy@debian.org> for the Debian project.
+#
+# The prerm script (run before the postinst) disables Samba in /etc/inetd.conf
+#	and stops both nmbd and smbd. So, when this script is run we
+#	know that neither nmbd nor smbd can start.
+#
+
+case "$1" in
+	configure)
+		# continue below
+	;;
+
+	abort-upgrade|abort-remove|abort-deconfigure)
+		exit 0
+	;;
+
+	*)
+		echo "postinst called with unknown argument \`$1'" >&2
+		exit 0
+	;;
+esac
+
+# Take care of the /usr/doc/ to /usr/shar/doc/ migration.
+if [ -d /usr/doc -a ! -e /usr/doc/samba -a -d /usr/share/doc/samba ]; then
+	ln -sf ../share/doc/samba /usr/doc/samba
+fi
+
+# Starting with Samba 2.0.7-4 the location of the WINS database, the browse
+#	database and other important run-time files are stored in
+#	/var/state/samba/ rather than in /var/samba/. The following
+#	code takes care of moving the files in the old directory to
+#	the new directory.
+if [ -d /var/samba/ ]; then
+	mv /var/samba/* /var/state/samba/
+	rmdir /var/samba/
+fi
+
+# Define some constants...
+DEBIAN_CONFIG=/etc/samba/debian_config
+CONFIG_VERSION=1
+
+# Now some variables...
+samba_configured=no
+
+
+if [ -f $DEBIAN_CONFIG ]; then
+	. $DEBIAN_CONFIG
+    if [ "$config_version" -ge "$CONFIG_VERSION" ]; then
+		samba_configured=yes
+	fi
+fi
+
+# If Samba is configured we don't want to pester the user with
+#	configuration questions, just tell him that he can reconfigure
+#	Samba at any time by running /usr/sbin/sambaconfig.
+if [ "$samba_configured" = "no" ]; then
+	# Samba is not configured, go and ask the user the information needed
+	#	to configure it, and configure it!
+
+	# Create Debian specific configuration file
+	echo "config_version=$CONFIG_VERSION" > $DEBIAN_CONFIG
+
+	# We always run /etc/init.d/samba, even if we run Samba from inetd.
+	#	This script file takes care of handling the conflict of running
+	#	from inetd or as daemons.
+	update-rc.d samba defaults >/dev/null
+
+	# We want to add these entries to inetd.conf commented out. Otherwise
+	#	UDP traffic could make inetd to start nmbd or smbd right during
+	#	the configuration stage.
+	update-inetd --add "#<off># netbios-ssn	stream	tcp	nowait	root	/usr/sbin/tcpd	/usr/sbin/smbd"
+	update-inetd --add "#<off># netbios-ns	dgram	udp	wait	root 	/usr/sbin/tcpd	/usr/sbin/nmbd -a"
+
+	echo ""
+	echo Samba Configuration
+	echo -------------------
+	echo "The Samba server may be run either as a daemon at startup, or it may be"
+	echo "run from the inetd meta-daemon upon request. If run as a daemon, the"
+	echo "server will always be ready, so starting sessions will be faster. If run"
+	echo "from the inetd meta-daemon some memory will be saved and utilities such"
+	echo "as the tcpd TCP-wrapper may be used for extra security. If you don't"
+	echo "know what to do, running from inetd is a safe choice."
+	echo ""
+	echo "Run Samba as daemons or from inetd?"
+	echo -n "Press 'D' to run as daemons or 'I' to run from inetd: [I] "
+
+	read mode
+	test -n "$mode" || mode="I"
+
+	case "$mode" in
+		[Dd]*)
+			echo "Samba will run as daemons. Run sambaconfig to reconfigure"
+			update-inetd --disable netbios-ssn
+			update-inetd --disable netbios-ns
+			echo "run_mode=as_daemons" >> $DEBIAN_CONFIG
+		;;
+
+		*)
+			echo "Samba will run from inetd. Run sambaconfig to reconfigure"
+			update-inetd --enable netbios-ssn
+			update-inetd --enable netbios-ns
+			echo "run_mode=from_inetd" >> $DEBIAN_CONFIG
+		;;
+	esac
+
+	if [ ! -f /etc/samba/smbpasswd ]; then
+		echo ""
+		echo "If you are going to use encrypted passwords you need to have a"
+		echo "separate password file for this (the format is different from "
+		echo "/etc/passwd). Right now you don't have an /etc/samba/smbpasswd file."
+		echo "Do you want to generate this new file from your existing"
+		echo -n "/etc/passwd file? [y/N] "
+
+		read yn
+		test -n "$yn" || yn="N"
+
+		if [ $yn = y -o $yn = Y ]; then
+			cat /etc/passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
+			chmod 600 /etc/samba/smbpasswd 
+			echo ""
+			echo "/etc/samba/smbpasswd now has the same user names as /etc/passwd. However,"
+			echo "you need to run smbpasswd manually to set the password for each user."
+			echo ""
+			echo "smbpasswd_created=yes" >> $DEBIAN_CONFIG
+		else
+			echo "smbpasswd_created=no" >> $DEBIAN_CONFIG
+		fi
+	fi
+
+	echo ""
+
+	# Start Samba: nothing wrong will happen if Samba is running from inetd
+	#	and /etc/init.d/samba is run. However, to simplify things, we
+	#	do not run /etc/init.d/samba if we're running from inetd.
+
+	if [ $mode = d -o $mode = D ]; then
+		echo -n "Samba will run as daemons - start Samba now? [Y/n] "
+		read yn
+		test -n "$yn" || yn="Y"
+
+		case "$yn" in
+			[Nn]*)
+				echo "Not started; to start later, do: /etc/init.d/samba start"
+				echo -n "Press [ENTER] "
+				read line
+			;;
+
+			*)
+				/etc/init.d/samba start
+			;;
+		esac
+	else
+		echo "Since you are running Samba from inetd, the daemons will start"
+		echo "automatically by inetd when there is traffic on the NetBIOS"
+		echo "ports."
+		echo -n "Press [ENTER] "
+		read line
+	fi
+else	# if (samba_configured) ...
+	# We are here because Samba was already configured...
+
+	# At this point the NetBIOS daemons are disabled in /etc/inetd.conf.
+	#	This is a consequence of what we did in the prerm. If Samba was
+	#	configured to run from inetd we need to enable the entries in
+	#	/etc/inetd.conf.
+
+	# Read current Samba configuration
+	. $DEBIAN_CONFIG
+
+	if [ "$run_mode" = "from_inetd" ]; then
+		update-inetd --enable netbios-ssn
+		update-inetd --enable netbios-ns
+	fi
+
+	echo ""
+	echo "Samba was already installed and configured so I skipped the "
+	echo "configuration questions. You can run the script /usr/sbin/sambaconfig"
+	echo "at any time to reconfigure Samba. See sambaconfig(8) for more"
+	echo "details. I will not even ask you if you want to restart Samba,"
+	echo "I will just do it!"
+	echo "" 
+
+	/etc/init.d/samba start
+fi		# if (samba_configured) ...
+
+if test "$1" = configure && dpkg --compare-versions "$2" lt 2.0.0final-2 && [ -f /etc/samba/smbpasswd ]; then
+
+	cat << EOF
+
+*** IMPORTANT ***
+
+The format of the smbpasswd file (which is used only if you are using
+encrypted passwords) is different in Samba 2.0.0 and above. I will
+convert it to the new format.
+
+EOF
+
+	mv /etc/samba/smbpasswd /etc/samba/smbpasswd.old
+	cat /etc/samba/smbpasswd.old | /usr/bin/convert_smbpasswd \
+		> /etc/samba/smbpasswd 2> /dev/null
+fi
+
+# This check is a safety net: the /etc/samba/smbpasswd file must have
+#	permissions 600.
+if [ -f /etc/samba/smbpasswd ]; then
+	chmod 600 /etc/samba/smbpasswd
+fi
+
+# Do the same check for /var/backup/smbpasswd.bak, just in case.
+if [ -f /var/backups/smbpasswd.bak ]; then
+	chmod 600 /var/backups/smbpasswd.bak
+fi
+
+exit 0
diff --git a/packaging/Debian/debian/samba.postrm b/packaging/Debian/debian/samba.postrm
new file mode 100644
index 0000000000..73b2f0d0a1
--- /dev/null
+++ b/packaging/Debian/debian/samba.postrm
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ "$1" = purge ]; then
+	update-rc.d samba remove >/dev/null
+
+	# Remove WINS.DAT, BROWSE.DAT and lock information file
+	rm -Rf /var/samba/
+
+	# Remove any files in the old and obsolete /var/lock/samba directory
+	rm -Rf /var/lock/samba/
+
+	# Remove files left in /etc/samba/
+	rm -Rf /etc/samba/debian_config
+	rm -Rf /etc/samba/MACHINE.SID
+
+	# Remove log files
+	rm -f /var/log/[ns]mb*
+
+	# Remove NetBIOS entries from /etc/inetd.conf
+	update-inetd --remove netbios-ssn
+	update-inetd --remove netbios-ns
+else
+	# Not purging, do not remove NetBIOS entries from /etc/inetd.conf
+	update-inetd --disable netbios-ssn
+	update-inetd --disable netbios-ns
+fi
diff --git a/packaging/Debian/debian/samba.preinst b/packaging/Debian/debian/samba.preinst
new file mode 100644
index 0000000000..6ebefb8fb1
--- /dev/null
+++ b/packaging/Debian/debian/samba.preinst
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# The purpose of the preinst script for the samba package is to help
+#	the migration of the conffiles smb.conf and smbpasswd from their
+#	old location (/etc/) to their new location (/etc/samba/).
+#
+# Thanks to Ben Pfaff <pfaffben@pilot.msu.edu> for sharing on debian-devel
+#	his ideas about how to move conffiles to new locations.
+#
+
+# First see if a smb.conf file currently exists.
+test -f /etc/smb.conf || exit 0
+
+# Now see if a smb.conf file exists in the new location.
+test -e /etc/samba/smb.conf && exit 0
+
+#
+# Move smb.conf conffile from its old location (/etc/) to its new one
+#	(/etc/samba).
+#
+# If conffile exists in old location AND conffile does not exist on new
+#	location then...
+#
+if [ -f /etc/smb.conf -a ! -e /etc/samba/smb.conf ]; then
+	# The new location for the conffile should not exist yet, so we create the
+	#	dir.
+	mkdir -p /etc/samba
+
+	# Finally, move the conffile to its new location.
+	mv /etc/smb.conf /etc/samba/smb.conf
+fi
+
+#
+# Move smbpasswd conffile from its old location (/etc/) to its new one
+#	(/etc/samba).
+#
+# If conffile exists in old location AND conffile does not exist on new
+#	location then...
+#
+if [ -f /etc/smbpasswd -a ! -e /etc/samba/smbpasswd ]; then
+	# The new location for the conffile should not exist yet, so we create the
+	#	dir.
+	mkdir -p /etc/samba
+
+	# Finally, move the conffile to its new location.
+	mv /etc/smbpasswd /etc/samba/smbpasswd
+fi
diff --git a/packaging/Debian/debian/samba.prerm b/packaging/Debian/debian/samba.prerm
new file mode 100644
index 0000000000..acd6d087b5
--- /dev/null
+++ b/packaging/Debian/debian/samba.prerm
@@ -0,0 +1,74 @@
+#!/bin/sh
+#
+# Pre-removal script for the Samba package for Debian GNU/Linux.
+#
+# Written by Eloy A. Paris for the Debian project.
+#
+
+DEBIAN_CONFIG=/etc/samba/debian_config
+
+NMBDPID=/var/state/samba/nmbd.pid
+SMBDPID=/var/state/samba/smbd.pid
+
+# The most important thing the prerm script must do is to stop the Samba
+#	daemons (nmbd and smbd). Note that this can be tricky since Samba
+#	can be running from the inetd meta-daemon or as daemons (it's a 
+#	user choice).
+
+# Before we stop Samba we need to know how it is running (from inetd
+#	or as daemons). We could source in the debian_config file but it
+#	is safer to grep /etc/inetd.conf.
+if grep -q '^netbios-ns' /etc/inetd.conf; then
+	# Samba is running from inetd. We need to disable the Samba daemons
+	#	in /etc/inetd.conf before we stop the daemons. Otherwise traffic
+	#	in the NetBIOS ports will make inetd start them again.
+	#
+	# Note: user preferences regarding the mode he/she wants Samba to
+	#	be run (inetd or daemons) will be lost next. In the postinst
+	#	we depend on the information present in the debian_config
+	#	file to restore everything back to the way it was.
+	update-inetd --disable netbios-ssn
+	update-inetd --disable netbios-ns
+
+	# Now it is safe to stop the daemons...
+
+	# I have just recalled that old versions of nmbd and smbd did not store
+	#	their PID's in /var/samba/state/ (or whatever directory
+	#	was used for this purpose in configure), so I can't use
+	#	--pidfile in start-stop-daemon to stop nmbd or smbd. I 
+	#	will handle this by testing first whether the PID file exists.
+	if [ -f $NMBDPID ]; then
+		start-stop-daemon --stop --oknodo --user root --name nmbd --quiet --pidfile $NMBDPID
+	else
+		start-stop-daemon --stop --oknodo --user root --name nmbd --quiet
+	fi
+
+	# nmbd must be dead by now, now it's smbd's turn
+	if [ -f $SMBDPID ]; then
+		start-stop-daemon --stop --oknodo --user root --name smbd --quiet --pidfile $SMBDPID
+	else
+		start-stop-daemon --stop --oknodo --user root --name smbd --quiet
+	fi
+elif [ -x /etc/init.d/samba ]; then	# Old Samba packages didn't have a
+					#	/etc/init.d/samba so we better 
+					#	check first.
+	# Samba is running as daemons. No problem here, just stop Samba...
+	/etc/init.d/samba stop
+fi
+
+if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/samba ]; then
+	rm -f /usr/doc/samba
+fi
+
+# Make sure there are no nmbd or smbd daemons running (security check)
+# (as you see this code is commented out - so far I haven't had the need
+#	to do this sanity check - peloy, Aug. 23, 1998)
+#ps -ax | grep nmbd
+#if [ $? ... ]; then
+#	killall -9 nmbd
+#fi
+
+#ps -ax | grep smbd
+#if [ $? ... ]; then
+#	killall -9 smbd
+#fi
diff --git a/packaging/Debian/debian/sambaconfig b/packaging/Debian/debian/sambaconfig
new file mode 100644
index 0000000000..0d35a51967
--- /dev/null
+++ b/packaging/Debian/debian/sambaconfig
@@ -0,0 +1,130 @@
+#!/bin/sh
+#
+#	Written by Eloy A. Paris <peloy@debian.org> for Debian GNU/Linux.
+#
+
+PATH="/usr/sbin:/usr/bin:/sbin:/bin"
+DEBIAN_CONFIG=/etc/samba/debian_config
+
+NMBDPID=/var/state/samba/nmbd.pid
+SMBDPID=/var/state/samba/smbd.pid
+
+if [ ! -f $DEBIAN_CONFIG ]; then
+	echo "The file $DEBIAN_CONFIG does not exist! There is something wrong"
+	echo "with the installation of Samba on this system. Please re-install"
+	echo "Samba."
+	exit 1
+fi
+
+# Read current Samba configuration
+. $DEBIAN_CONFIG
+
+reload=1
+
+while [ $# -gt 0 ]
+do
+	case "$1" in
+		--run-from-inetd)
+			run_from_inetd=1
+			shift
+		;;
+
+		--run-as-daemons)
+			run_from_inetd=0
+			shift
+		;;
+		--no-reload)
+			reload=0
+			shift
+		;;
+
+		*)
+			echo "Usage: $0 [--run-from-inetd|--run-as-daemons] [no-reload]" >&2
+			exit 1
+		;;
+	esac
+done
+
+# Make sure there are no Samba daemons (nmbd or smbd) running
+#
+
+if [ "$run_mode" = "from_inetd" ]; then
+	# Samba is running from inetd - need to disable inetd before
+	#	killing the daemons.
+	update-inetd --disable netbios-ssn
+	update-inetd --disable netbios-ns
+	start-stop-daemon --stop --oknodo --user root --name nmbd --quiet --pidfile $NMBDPID
+	start-stop-daemon --stop --oknodo --user root --name smbd --quiet --pidfile $SMBDPID
+else
+	# Samba is running as daemons
+	/etc/init.d/samba stop
+fi
+
+if [ "x$run_from_inetd" = "x" ]
+then
+	echo "Run Samba as daemons or from inetd?"
+	echo -n "Press 'D' for to run as daemons or 'I' to run from inetd: [I] "
+
+	read mode
+	test -n "$mode" || mode="I"
+
+	case "$mode" in
+		[Dd]*)
+			run_from_inetd=0
+		;;
+
+		*)
+			run_from_inetd=1
+		;;
+	esac
+fi
+
+if [ "$run_from_inetd" = 1 ]; then
+	echo "Samba will run from inetd. Run sambaconfig to reconfigure."
+	echo ""
+	update-inetd --enable netbios-ssn
+	update-inetd --enable netbios-ns
+	run_mode="from_inetd"
+else
+	echo "Samba will run as daemons. Run sambaconfig to reconfigure."
+	echo ""
+	update-inetd --disable netbios-ssn
+	update-inetd --disable netbios-ns
+	run_mode="as_daemons"
+fi
+
+# Rebuild Debian configuration file (only thing that could have
+#	changed so far is the variable called "run_mode".
+
+# Start the Samba daemons (take care of whether the user used the --no-reload
+#	option and how Samba is running: from inetd or as daemons)
+echo "config_version=$config_version" > $DEBIAN_CONFIG
+echo "run_mode=$run_mode" >> $DEBIAN_CONFIG
+echo "smbpasswd_created=$smbpasswd_created" >> $DEBIAN_CONFIG
+
+if [ "$reload" = 0 ]; then
+	echo "Samba will not start (--no-reload parameter provided). Please note"
+	echo "that if you configured Samba to run from inetd, the Samba daemons"
+	echo "will start automatically when there is traffic in the NetBIOS ports"
+elif [ "$run_from_inetd" = 1 ]; then
+	echo "The --no-reload parameter was not provided so I assume you want"
+	echo "to have the Samba daemons started. Since you are running from inetd"
+	echo "the Samba daemosn will start automatically when there is traffic"
+	echo "in the NetBIOS ports."
+else
+	echo -n "The --no-reload parameter was not provided, start Samba now? [Y/n] "
+	read yn
+	test -n "$yn" || yn="Y"
+
+	case "$yn" in
+		[Nn]*)
+			echo "Not started; to start later, do: /etc/init.d/samba start"
+			echo -n "Press [ENTER] "
+			read line
+		;;
+
+		*)
+			/etc/init.d/samba start
+		;;
+	esac
+fi
diff --git a/packaging/Debian/debian/sambaconfig.8 b/packaging/Debian/debian/sambaconfig.8
new file mode 100644
index 0000000000..2a0aaa9aa3
--- /dev/null
+++ b/packaging/Debian/debian/sambaconfig.8
@@ -0,0 +1,40 @@
+.TH SAMBACONFIG 8 06-Apr-1998
+.SH NAME
+sambaconfig \- configure Samba for Debian systems
+.SH SYNOPSIS
+sambaconfig [--run-from-inetd|--run-as-daemons] [--no-reload]
+.SH DESCRIPTION
+.B sambaconfig
+is used to simplify the configuration of samba(8) for use on Debian
+systems.
+.PP
+You may run this program to (re)configure samba for your Debian system 
+at any time.
+.PP
+Normally
+.B sambaconfig
+will ask if you want to reload the Samba daemons after making changes to its
+configuration. The --no-reload option will avoid this question. Note
+that if Samba is running from inetd and --no-reload is not supplied no
+questions is asked because Samba will start automatically from inetd
+when there is traffic on the NetBIOS ports.
+.SH FILES
+.TP
+/etc/inetd.conf
+If the lines that start the NetBIOS daemons nmbd and smbd are
+commented out then Samba will start as daemons from /etc/init.d/start
+.TP
+/etc/init.d/samba
+Script that will start/stop/restart Samba when running as daemons
+.TP
+/etc/samba/smbpasswd
+Encrypted passwords file for the Samba daemons
+.TP
+/etc/samba/debian_config
+Debian specific configuration information, it holds the mode in which
+Samba is running (from inetd or as daemons).
+.SH SEE ALSO
+samba(7), nmbd(8), smbd(8)
+.SH AUTHOR
+Eloy A. Paris <peloy@debian.org> (man page based on sendmailconfig's man page
+by Robert Leslie <rob@mars.org>)
diff --git a/packaging/Debian/debian/scripts/patch-source b/packaging/Debian/debian/scripts/patch-source
new file mode 100755
index 0000000000..a95a002048
--- /dev/null
+++ b/packaging/Debian/debian/scripts/patch-source
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+for patch in debian/patches/*.patch; do
+	patch -p1 < $patch
+done
+
+exit 0
diff --git a/packaging/Debian/debian/scripts/unpatch-source b/packaging/Debian/debian/scripts/unpatch-source
new file mode 100755
index 0000000000..81d51f7dd4
--- /dev/null
+++ b/packaging/Debian/debian/scripts/unpatch-source
@@ -0,0 +1,7 @@
+#!/bin/sh -e
+
+for patch in debian/patches/*.patch; do
+	patch -p1 -R < $patch
+done
+
+exit 0
diff --git a/packaging/Debian/debian/smb.conf b/packaging/Debian/debian/smb.conf
new file mode 100644
index 0000000000..14cc20f49c
--- /dev/null
+++ b/packaging/Debian/debian/smb.conf
@@ -0,0 +1,147 @@
+;
+; /etc/samba/smb.conf
+;
+; Sample configuration file for the Samba suite for Debian GNU/Linux
+;
+; Please see the manual page for smb.conf for detailed description of
+;	every parameter.
+;
+
+[global]
+   printing = bsd
+   printcap name = /etc/printcap
+   load printers = yes
+   guest account = nobody
+   invalid users = root
+
+; "security = user" is always a good idea. This will require a Unix account
+;	in this server for every user accessing the server.
+   security = user
+
+; Change this for the workgroup your Samba server will part of
+   workgroup = WORKGROUP
+
+   server string = %h server (Samba %v)
+
+; 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.
+   syslog only = no
+
+; We want Samba to log a minimum amount of information to syslog. Everything
+;	should go to /var/log/{smb,nmb} instead. If you want to log through
+;	syslog you should set the following parameter to something higher.
+   syslog = 0;
+
+; This socket options really speed up Samba under Linux, according to my
+;	own tests.
+   socket options = IPTOS_LOWDELAY TCP_NODELAY SO_SNDBUF=4096 SO_RCVBUF=4096
+
+; Passwords are encrypted by default. This way the latest Windows 95 and NT
+;	clients can connect to the Samba server with no problems.
+   encrypt passwords = yes
+
+; It's always a good idea to use a WINS server. If you want this server
+;	to be the WINS server for your network change the following parameter
+;	to "yes". Otherwise leave it as "no" and specify your WINS server
+; 	below (note: only one Samba server can be the WINS server).
+;	Read BROWSING.txt for more details.
+   wins support = no
+
+; If this server is not the WINS server then specify who is it and uncomment
+;	next line.
+;   wins server = 172.16.0.10
+
+; Please read BROWSING.txt and set the next four parameters according
+;	to your network setup. There is no valid default so they are commented
+;	out.
+;   os level = 0
+;   domain master = no
+;   local master = no
+;   preferred master = 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
+
+; This will prevent nmbd to search for NetBIOS names through DNS.
+   dns proxy = no
+
+; 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 .
+
+; 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' &
+
+; The default maximum log file size is 5 MBytes. That's too big so this
+;	next parameter sets it to 1 MByte. Currently, Samba rotates log
+;	files (/var/log/{smb,nmb} in Debian) when these files reach 1000 KBytes.
+;	A better solution would be to have Samba rotate the log file upon
+;	reception of a signal, but for now on, we have to live with this.
+   max log size = 1000
+
+   obey pam restrictions = yes
+
+[homes]
+   comment = Home Directories
+   browseable = no
+
+; By default, the home directories are exported read only. Change next
+;	parameter to "no" if you want to be able to write to them.
+   read only = yes
+
+; File creation mask is set to 0700 for security reasons. If you want to
+;	create files with group=rw permissions, set next parameter to 0775.
+   create mask = 0700
+
+; Directory creation mask is set to 0700 for security reasons. If you want to
+;	create dirs. with group=rw permissions, set next parameter to 0775.
+   directory mask = 0700
+
+[printers]
+   comment = All Printers
+   browseable = no
+   path = /tmp
+   printable = yes
+   public = no
+   writable = no
+   create mode = 0700
+
+; A sample share for sharing your CD-ROM with others.
+;[cdrom]
+;   comment = Samba server's CD-ROM
+;   writable = no
+;   locking = no
+;   path = /cdrom
+;   public = yes
+;
+; The next two parameters show how to auto-mount a CD-ROM when the
+;	cdrom share is accesed. For this to work /etc/fstab must contain
+;	an entry like this:
+;
+;       /dev/scd0   /cdrom  iso9660 defaults,noauto,ro,user   0 0
+;
+; The CD-ROM gets unmounted automatically after the connection to the
+;
+; If you don't want to use auto-mounting/unmounting make sure the CD
+;	is mounted on /cdrom
+;
+;   preexec = /bin/mount /cdrom
+;   postexec = /bin/umount /cdrom
+
diff --git a/packaging/Debian/debian/smbclient.files b/packaging/Debian/debian/smbclient.files
new file mode 100644
index 0000000000..5a660fc8d4
--- /dev/null
+++ b/packaging/Debian/debian/smbclient.files
@@ -0,0 +1,9 @@
+usr/bin/smbclient
+usr/bin/smbtar
+usr/bin/rpcclient
+usr/bin/smbspool
+usr/share/man/man1/smbclient.1
+usr/share/man/man1/smbtar.1
+usr/share/man/man1/rpcclient.1
+usr/share/man/man8/smbspool.8
+usr/lib/cups/backend/smb
diff --git a/packaging/Debian/debian/smbfs.files b/packaging/Debian/debian/smbfs.files
new file mode 100644
index 0000000000..870db7d645
--- /dev/null
+++ b/packaging/Debian/debian/smbfs.files
@@ -0,0 +1,10 @@
+sbin/mount.smbfs
+sbin/mount.smb
+usr/bin/smbmount
+usr/bin/smbumount
+usr/bin/smbmnt
+usr/share/man/man8/smbmount.8
+usr/share/man/man8/smbumount.8
+usr/share/man/man8/smbmnt.8
+usr/share/man/man8/mount.smb.8
+usr/share/man/man8/mount.smbfs.8
diff --git a/packaging/Debian/debian/smbfs.suid b/packaging/Debian/debian/smbfs.suid
new file mode 100644
index 0000000000..9569087fff
--- /dev/null
+++ b/packaging/Debian/debian/smbfs.suid
@@ -0,0 +1,5 @@
+usr/bin/smbmnt
+usr/bin/smbmount-2.2.x
+usr/bin/smbumount-2.2.x
+usr/bin/smbmount-2.0.x
+usr/bin/smbumount-2.0.x
diff --git a/packaging/Debian/debian/smbwrapper.dirs b/packaging/Debian/debian/smbwrapper.dirs
new file mode 100644
index 0000000000..fd727bddf0
--- /dev/null
+++ b/packaging/Debian/debian/smbwrapper.dirs
@@ -0,0 +1,2 @@
+usr/bin
+usr/share/samba
diff --git a/packaging/Debian/debian/smbwrapper.docs b/packaging/Debian/debian/smbwrapper.docs
new file mode 100644
index 0000000000..2924e78734
--- /dev/null
+++ b/packaging/Debian/debian/smbwrapper.docs
@@ -0,0 +1,2 @@
+source/smbwrapper/README
+source/smbwrapper/PORTING
diff --git a/packaging/Debian/debian/smbwrapper.files b/packaging/Debian/debian/smbwrapper.files
new file mode 100644
index 0000000000..08edbead6e
--- /dev/null
+++ b/packaging/Debian/debian/smbwrapper.files
@@ -0,0 +1 @@
+usr/bin/smbsh
diff --git a/packaging/Debian/debian/swat.dirs b/packaging/Debian/debian/swat.dirs
new file mode 100644
index 0000000000..d5df7df4b8
--- /dev/null
+++ b/packaging/Debian/debian/swat.dirs
@@ -0,0 +1,2 @@
+usr/sbin
+usr/share/samba/swat
diff --git a/packaging/Debian/debian/swat.docs b/packaging/Debian/debian/swat.docs
new file mode 100644
index 0000000000..afbfcf0c61
--- /dev/null
+++ b/packaging/Debian/debian/swat.docs
@@ -0,0 +1 @@
+swat/README
diff --git a/packaging/Debian/debian/swat.files b/packaging/Debian/debian/swat.files
new file mode 100644
index 0000000000..6fed39111b
--- /dev/null
+++ b/packaging/Debian/debian/swat.files
@@ -0,0 +1,2 @@
+usr/sbin/swat
+usr/share/man/man8/swat.8
diff --git a/packaging/Debian/debian/swat.postinst b/packaging/Debian/debian/swat.postinst
new file mode 100644
index 0000000000..c5ab489044
--- /dev/null
+++ b/packaging/Debian/debian/swat.postinst
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
+case "$1" in
+	configure)
+		;;
+	abort-upgrade|abort-remove|abort-deconfigure)
+		exit 0
+		;;
+	*)
+		echo "$0: Unknown action \"$1\""
+		exit 0
+		;;
+esac
+
+# Set up swat, turned off by default.
+update-inetd --group OTHER --add \
+ '#<off># swat\t\tstream\ttcp\tnowait.400\troot\t/usr/sbin/tcpd\t/usr/sbin/swat'
+
+if [ -d /usr/doc -a ! -e /usr/doc/swat -a -d /usr/share/doc/swat ]; then
+	ln -sf ../share/doc/swat /usr/doc/swat
+fi
diff --git a/packaging/Debian/debian/swat.postrm b/packaging/Debian/debian/swat.postrm
new file mode 100644
index 0000000000..e203d2855f
--- /dev/null
+++ b/packaging/Debian/debian/swat.postrm
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+case "$1" in
+	purge)
+		update-inetd --remove '/usr/sbin/swat$'
+		exit 0
+		;;
+	remove)
+		;;
+	upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+		;;
+	*)
+		echo "$0: unknown action \"$1\""
+		exit 0
+		;;
+esac
+
+exit 0
+
diff --git a/packaging/Debian/debian/wins2dns.awk b/packaging/Debian/debian/wins2dns.awk
new file mode 100644
index 0000000000..176868a115
--- /dev/null
+++ b/packaging/Debian/debian/wins2dns.awk
@@ -0,0 +1,38 @@
+#!/usr/bin/awk -f
+#
+# Date: Wed, 26 Aug 1998 10:37:39 -0600 (MDT)
+# From: Jason Gunthorpe <jgg@deltatee.com>
+# To: samba@packages.debian.org
+# Subject: Nifty samba script
+#
+# Here is a really nifty script I just wrote for samba, it takes the wins
+# database in /var/samba/wins and writes out two dns files for it. In this
+# way network wide wins clients can get into the dns for use by unix
+# machines.
+# 
+# Perhaps this could be included in  /usr/doc/examples or somesuch.
+#
+
+BEGIN {
+  FS="#|\"";
+FORWARD="/tmp/wins.hosts"
+REVERSE="/tmp/wins.rev"
+DOMAIN="ven.ra.rockwell.com"
+}
+$3 == "00" {
+  split($4,a," " );
+  split(a[2],b,".");
+  while (sub(" ","-",$2));
+  $2=tolower($2);
+  if (b[1] == "255")
+    next;
+  if (length($2) >= 8)
+    print $2"\ta\t"a[2] > FORWARD
+  else
+    print $2"\t\ta\t"a[2] > FORWARD
+  print b[4]"."b[3]"\t\tptr\t"$2"."DOMAIN"." > REVERSE
+}
+END {
+  system("echo killall -HUP named");
+}
+
author	Gerald Carter <jerry@samba.org>	2002-02-02 15:44:37 +0000
committer	Gerald Carter <jerry@samba.org>	2002-02-02 15:44:37 +0000
commit	c8bc0fa4a7be25cb926750a56085e1e98ed9046b (patch)
tree	ec7bb9c0ce893fda80a6eb1f264c4717b3f667ac /packaging/Debian
parent	8cb4e23ffc77a9842e1304f3de20af5861982746 (diff)
download	samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.tar.gz samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.tar.bz2 samba-c8bc0fa4a7be25cb926750a56085e1e98ed9046b.zip