[Pkg-samba-maint] r2937 - in trunk/samba/debian: . patches

bubulle at alioth.debian.org bubulle at alioth.debian.org
Mon Jul 6 19:56:11 UTC 2009


tags 534595 pending
tags 299433 pending
tags 454112 pending
tags 524661 pending
tags 428618 pending
tags 526229 pending
tags 529350 pending
thanks

Author: bubulle
Date: 2009-07-06 19:56:10 +0000 (Mon, 06 Jul 2009)
New Revision: 2937

Added:
   trunk/samba/debian/patches/codepages-location.patch
   trunk/samba/debian/patches/shrink-dead-code.patch
   trunk/samba/debian/samba-common-bin.files
   trunk/samba/debian/samba-common-bin.postinst
   trunk/samba/debian/samba-doc.doc-base.samba-using
Removed:
   trunk/samba/debian/patches/autoconf.patch
   trunk/samba/debian/patches/fhs-assignpaths.patch
   trunk/samba/debian/patches/fhs-filespaths-debatable.patch
   trunk/samba/debian/patches/non-linux-ports.patch
   trunk/samba/debian/patches/proper-static-lib-linking.patch
   trunk/samba/debian/patches/shrink-dead-code.patch
   trunk/samba/debian/patches/smbpasswd-syslog.patch
   trunk/samba/debian/patches/swat-de.patch
   trunk/samba/debian/samba-doc.doc-base.samba-using
Modified:
   trunk/samba/debian/README.debian
   trunk/samba/debian/changelog
   trunk/samba/debian/control
   trunk/samba/debian/libpam-smbpass.docs
   trunk/samba/debian/libpam-smbpass.examples
   trunk/samba/debian/libwbclient0.symbols
   trunk/samba/debian/patches/VERSION.patch
   trunk/samba/debian/patches/documentation.patch
   trunk/samba/debian/patches/fhs-filespaths.patch
   trunk/samba/debian/patches/installswat.sh.patch
   trunk/samba/debian/patches/no-unnecessary-cups.patch
   trunk/samba/debian/patches/pam-examples.patch
   trunk/samba/debian/patches/series
   trunk/samba/debian/patches/smbclient-pager.patch
   trunk/samba/debian/patches/smbtar-bashism.patch
   trunk/samba/debian/patches/undefined-symbols.patch
   trunk/samba/debian/patches/usershare.patch
   trunk/samba/debian/rules
   trunk/samba/debian/samba-common.files
   trunk/samba/debian/samba-common.postinst
   trunk/samba/debian/samba-common.prerm
   trunk/samba/debian/samba-doc.examples
   trunk/samba/debian/samba.postinst
   trunk/samba/debian/smbwrapper.docs
Log:
Merge experimental branch and prepare the release of 3.4.0 in unstable


Modified: trunk/samba/debian/README.debian
===================================================================
--- trunk/samba/debian/README.debian	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/README.debian	2009-07-06 19:56:10 UTC (rev 2937)
@@ -22,7 +22,8 @@
 Currently, 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.
+samba-common:	Samba common configuration/data files used by both Samba 3 and Samba 4.
+samba-common-bin:	Samba common binaries 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.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/changelog	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,11 +1,53 @@
-samba (2:3.3.6-2) UNRELEASED; urgency=low
+samba (2:3.4.0-1) UNRELEASED; urgency=low
 
+  [ Christian Perrier ]
+  * New upstream release: first upload to unstable for 3.4
+  * Correct dependencies for samba-common-bin. Closes: #534595
+
   [ Debconf translations ]
   * Czech. Closes: #534793
   * Russian. Closes: #534796
 
- -- Christian Perrier <bubulle at debian.org>  Tue, 30 Jun 2009 22:58:39 +0200
+ -- Christian Perrier <bubulle at debian.org>  Fri, 26 Jun 2009 18:32:20 +0200
 
+samba (2:3.4.0~rc1-1) experimental; urgency=low
+
+  * New upstream version. That fixes the following bugs:
+    - Remove pidfile on clean shutdown. Closes: #299433, #454112
+  * Drop swat-de.patch that was applied upstream
+  * Bump debhelper compatibility level to 6 and declare a versioned
+    dependency on debhelper >= 6.0.0
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 20 Jun 2009 18:43:20 +0200
+
+samba (2:3.4.0~pre2-1) experimental; urgency=low
+
+  [ Jelmer Vernooij ]
+  * Split binaries out of samba-common into samba-common-bin.
+    Closes: #524661
+
+  [ Christian Perrier ]
+  * New upstream version. That fixes the following bugs:
+    - Do not limit the number of network interfaces. Closes: #428618
+    - Fix Connect4 in samr.idl. Closes: #526229
+  * "Using samba" is back.
+  * Drop non-linux-ports.patch that was integrated upstream
+  * Drop smbpasswd-syslog.patch that was integrated upstream
+  * Drop smbclient-link.patch that was integrated upstream
+
+  [ Debconf translations ]
+  * Italian. Closes: #529350
+
+ -- Christian Perrier <bubulle at debian.org>  Sat, 06 Jun 2009 11:45:35 +0200
+
+samba (2:3.4.0~pre1-1) experimental; urgency=low
+
+  * New upstream pre-release
+  * "Using samba" is dropped from upstream source. Therefore, drop
+    debian/samba-doc.doc-base.samba-using
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 20 May 2009 18:50:35 +0200
+
 samba (2:3.3.6-1) unstable; urgency=high
 
   * New upstream release. Security release.

Modified: trunk/samba/debian/control
===================================================================
--- trunk/samba/debian/control	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/control	2009-07-06 19:56:10 UTC (rev 2937)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Samba Maintainers <pkg-samba-maint at lists.alioth.debian.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Jelmer Vernooij <jelmer at debian.org>
-Build-Depends: debhelper (>=6.0.0), libpam0g-dev, libreadline5-dev,
+Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline5-dev,
 	libcups2-dev | libcupsys2-dev,
 	libacl1-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev,
@@ -12,14 +12,14 @@
 	libkeyutils-dev [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
 	ctdb (>= 1.0.73) [alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc]
 Build-Conflicts: libfam-dev
-Standards-Version: 3.8.2
+Standards-Version: 3.8.1
 Homepage: http://www.samba.org
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-samba/trunk/samba
 Vcs-Svn: svn://svn.debian.org/svn/pkg-samba/trunk/samba
 
 Package: samba
 Architecture: any
-Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
+Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 0.76-13.1), libpam-modules, lsb-base (>= 3.2-13), procps, update-inetd, adduser
 Recommends: logrotate
 Suggests: openbsd-inetd | inet-superserver, smbldap-tools, ldb-tools, ctdb
 Replaces: samba-common (<= 2.0.5a-2)
@@ -38,10 +38,10 @@
  This package is not required for connecting to existing SMB/CIFS servers
  (see smbclient) or for mounting remote filesystems (see smbfs).
 
-Package: samba-common
+Package: samba-common-bin
 Architecture: any
-Depends: libpam-modules, ucf, ${shlibs:Depends}, ${misc:Depends}
-Replaces: samba (<< 3.0.20b-1)
+Depends: libpam-modules, ${shlibs:Depends}, ${misc:Depends}, samba-common (>= 2:3.4.0~pre1-2)
+Replaces: samba (<< 3.0.20b-1), samba-common (<< 2:3.4.0~pre1-2)
 Description: common files used by both the Samba server and client
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,
  providing support for cross-platform file and printer sharing with
@@ -50,6 +50,19 @@
  This package contains files and programs needed by Samba when used as
  either a client or a server.
 
+Package: samba-common
+Architecture: all
+Depends: ucf, ${misc:Depends}
+Replaces: samba (<< 3.0.20b-1), samba4-common (<< 4.0.0~alpha7-1)
+Conflicts: samba4-common (<< 4.0.0~alpha7-1)
+Recommends: samba-common-bin
+Description: common files used by both the Samba server and client
+ Samba is an implementation of the SMB/CIFS protocol for Unix systems,
+ providing support for cross-platform file and printer sharing with
+ Microsoft Windows, OS X, and other Unix systems.
+ .
+ This package contains common files used by both Samba 3 and Samba 4.
+
 Package: samba-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -64,7 +77,7 @@
 
 Package: smbclient
 Architecture: any
-Depends: samba-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Replaces: samba (<< 2.999+3.0.alpha21-4), smbget
 Provides: samba-client
 Suggests: smbfs
@@ -124,7 +137,7 @@
 Section: otherosfs
 Priority: optional
 Architecture: any
-Depends: netbase (>= 2.02), samba-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: netbase (>= 2.02), samba-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
 Suggests: smbclient
 Replaces: smbfsx
 Description: Samba file system utilities
@@ -140,7 +153,7 @@
 Section: admin
 Priority: extra
 Architecture: any
-Depends: ${shlibs:Depends}, samba-common (= ${binary:Version}), ${misc:Depends},
+Depends: ${shlibs:Depends}, samba-common (= ${source:Version}), ${misc:Depends},
 	 libpam-runtime (>= 1.0.1-6)
 Suggests: samba
 Description: pluggable authentication module for Samba
@@ -165,7 +178,7 @@
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}
+Depends: libsmbclient (= ${binary:Version}), ${misc:Depends}, samba-common (>= 2:3.4.0~pre1-2)
 Description: development files for libsmbclient
  This package provides the development files (static library and headers)
  required for building applications against libsmbclient, a library that
@@ -176,7 +189,7 @@
 Section: net
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${binary:Version}), lsb-base (>= 3.0-6), adduser
+Depends: ${shlibs:Depends}, ${misc:Depends}, samba-common (= ${source:Version}), lsb-base (>= 3.0-6), adduser
 Replaces: samba (<= 2.2.3-2)
 Description: Samba nameservice integration server
  Samba is an implementation of the SMB/CIFS protocol for Unix systems,

Modified: trunk/samba/debian/libpam-smbpass.docs
===================================================================
--- trunk/samba/debian/libpam-smbpass.docs	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/libpam-smbpass.docs	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,2 +1,2 @@
-source/pam_smbpass/README 
-source/pam_smbpass/TODO
+source3/pam_smbpass/README 
+source3/pam_smbpass/TODO

Modified: trunk/samba/debian/libpam-smbpass.examples
===================================================================
--- trunk/samba/debian/libpam-smbpass.examples	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/libpam-smbpass.examples	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,5 +1,5 @@
-source/pam_smbpass/samples/README
-source/pam_smbpass/samples/kdc-pdc
-source/pam_smbpass/samples/password-mature
-source/pam_smbpass/samples/password-migration
-source/pam_smbpass/samples/password-sync
+source3/pam_smbpass/samples/README
+source3/pam_smbpass/samples/kdc-pdc
+source3/pam_smbpass/samples/password-mature
+source3/pam_smbpass/samples/password-migration
+source3/pam_smbpass/samples/password-sync

Modified: trunk/samba/debian/libwbclient0.symbols
===================================================================
--- trunk/samba/debian/libwbclient0.symbols	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/libwbclient0.symbols	2009-07-06 19:56:10 UTC (rev 2937)
@@ -59,3 +59,6 @@
  wbcRemoveGidMapping at Base 2:3.3.0
  wbcRemoveUidMapping at Base 2:3.3.0
  wbcStringToGuid at Base 2:3.3.0
+ wbcGetSidAliases at Base 2:3.4.0~pre2
+ wbcGetpwsid at Base 2:3.4.0~pre2
+ 

Modified: trunk/samba/debian/patches/VERSION.patch
===================================================================
--- trunk/samba/debian/patches/VERSION.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/VERSION.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -6,10 +6,10 @@
 
 Note: Should be kept
 
-Index: samba-3.3.0rc2/source/VERSION
+Index: samba-3.3.0rc2/source3/VERSION
 ===================================================================
---- samba-3.3.0rc2.orig/source/VERSION
-+++ samba-3.3.0rc2/source/VERSION
+--- samba-3.3.0rc2.orig/source3/VERSION
++++ samba-3.3.0rc2/source3/VERSION
 @@ -84,7 +84,7 @@
  #       SAMBA_VERSION_VENDOR_FUNCTION                  #
  #                                                      #

Deleted: trunk/samba/debian/patches/autoconf.patch
===================================================================
--- trunk/samba/debian/patches/autoconf.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/autoconf.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,569 +0,0 @@
-Goal: move changes to autogenerated files into their own patch now that we've
-      lost the script that was calling autogen.sh for us; this also helps
-      make debian/rules clean just a little bit cleaner.
-
-Fixes: no specific bug
-
-Status wrt upstream: Debian specific
-
-Note: This patch will normally have to be updated by hand after every
-      new upstream release and after updates of any other patches that
-      touch configure.in -- the first because configure scripts don't
-      hold patches well between updates, the second so that our changes
-      are recognized in the version of the script actually used in the
-      build process.
-
-      The process for refreshing this patch is:
-
- export QUILT_PATCHES=debian/patches
- quilt push autoconf.patch # to get everything applied up to this point
- quilt push -f autoconf.patch # to override the errors when applying
- (cd source && autoconf -I m4 -I lib/replace)
-   # the -I lib/replace is needed because upstream seems to have done
-   # something screwy with where their m4 include files are distributed in the
-   # source tree; so this option may not be necessary in the future
- quilt refresh
- find . -name '*.rej' | xargs rm
-
-Index: samba-deb/source/configure
-===================================================================
---- samba-deb.orig/source/configure
-+++ samba-deb/source/configure
-@@ -678,6 +678,7 @@
- LIBADDNS_SOVER
- UNINSTALL_LIBADDNS
- INSTALL_LIBADDNS
-+LIBADDNS_TARGET
- LIBADDNS_LIBS
- LIBADDNS_STATIC
- LIBADDNS_SHARED
-@@ -686,6 +687,7 @@
- LIBSMBSHAREMODES_SOVER
- UNINSTALL_LIBSMBSHAREMODES
- INSTALL_LIBSMBSHAREMODES
-+LIBSMBSHAREMODES_TARGET
- LIBSMBSHAREMODES_LIBS
- LIBSMBSHAREMODES_STATIC
- LIBSMBSHAREMODES_SHARED
-@@ -694,6 +696,7 @@
- LIBSMBCLIENT_SOVER
- UNINSTALL_LIBSMBCLIENT
- INSTALL_LIBSMBCLIENT
-+LIBSMBCLIENT_TARGET
- LIBSMBCLIENT_LIBS
- LIBSMBCLIENT_STATIC
- LIBSMBCLIENT_SHARED
-@@ -702,6 +705,7 @@
- LIBNETAPI_SOVER
- UNINSTALL_LIBNETAPI
- INSTALL_LIBNETAPI
-+LIBNETAPI_TARGET
- LIBNETAPI_LIBS
- LIBNETAPI_STATIC
- LIBNETAPI_SHARED
-@@ -710,6 +714,7 @@
- LIBTDB_SOVER
- UNINSTALL_LIBTDB
- INSTALL_LIBTDB
-+LIBTDB_TARGET
- LIBTDB_LIBS
- LIBTDB_STATIC
- LIBTDB_SHARED
-@@ -718,6 +723,7 @@
- LIBTALLOC_SOVER
- UNINSTALL_LIBTALLOC
- INSTALL_LIBTALLOC
-+LIBTALLOC_TARGET
- LIBTALLOC_LIBS
- LIBTALLOC_STATIC
- LIBTALLOC_SHARED
-@@ -801,6 +807,7 @@
- MODULE_EXPORTS
- SHLD
- SONAMEFLAG
-+LDDSOFLAGS
- LDSHFLAGS
- SAMBA_CPPFLAGS
- TDB_OBJS
-@@ -2412,9 +2419,9 @@
- pammodulesdir="${libdir}/security"
- configdir="${libdir}"
- swatdir="\${prefix}/swat"
--codepagedir="\${MODULESDIR}"
--statedir="\${LOCKDIR}"
--cachedir="\${prefix}/cache/samba"
-+codepagedir="\${prefix}/share/samba"
-+statedir="\${VARDIR}/lib/samba"
-+cachedir="\${VARDIR}/cache/samba"
- localedir="\${prefix}/share/locale"
- 
- 
-@@ -2430,10 +2437,10 @@
-     test "${libdir}" || libdir="\${prefix}/lib"
-     modulesdir="${libdir}/samba"
-     configdir="\${sysconfdir}/samba"
--    swatdir="\${DATADIR}/samba/swat"
-+    swatdir="\${prefix}/swat"
-     codepagedir="\${prefix}/share/samba"
-     statedir="\${VARDIR}/lib/samba"
--    cachedir="\${VARDIR}/lib/samba"
-+    cachedir="\${VARDIR}/cache/samba"
- 
- cat >>confdefs.h <<\_ACEOF
- #define FHS_COMPATIBLE 1
-@@ -11953,6 +11960,7 @@
- 
- 
- 
-+
- # compile with optimization and without debugging by default, but
- # allow people to set their own preference.
- # do this here since AC_CACHE_CHECK apparently sets the CFLAGS to "-g -O2"
-@@ -13719,6 +13727,27 @@
-       fi
-     ;;
- 
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define _LARGEFILE64_SOURCE 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define _FILE_OFFSET_BITS 64
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define _GNU_SOURCE 1
-+_ACEOF
-+
-+	;;
-+
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
-     *linux*)
-@@ -44065,7 +44094,7 @@
- #
- #
- case "$host_os" in
--    *linux*)
-+    linux*-gnu* | gnu* | k*bsd*-gnu)
-        # glibc <= 2.3.2 has a broken getgrouplist
-        if test "$cross_compiling" = yes; then
-   { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-@@ -49864,6 +49893,7 @@
- # these are the defaults, good for lots of systems
- HOST_OS="$host_os"
- LDSHFLAGS="-shared"
-+LDDSOFLAGS="-shared"
- MODULE_EXPORTS=""
- SONAMEFLAG="#"
- SHLD="\${CC} \${CFLAGS}"
-@@ -49880,16 +49910,21 @@
- 
-   # and these are for particular systems
-   case "$host_os" in
--		*linux*)
-+		linux*-gnu* | gnu* | k*bsd*-gnu)
-+			case "$host_os" in linux*)
-+
- cat >>confdefs.h <<\_ACEOF
- #define LINUX 1
- _ACEOF
--
-+ ;;
-+			esac
- 			BLDSHARED="true"
- 			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
--				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
--			else
-+				LDDSOFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
- 				LDSHFLAGS="-shared -Wl,-Bsymbolic"
-+			else
-+				LDDSOFLAGS="-shared -Wl,-Bsymbolic"
-+				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,-z,defs"
- 			fi
- 			DYNEXP="-Wl,--export-dynamic"
- 			PICFLAG="-fPIC"
-@@ -49906,6 +49941,7 @@
- 
- 			BLDSHARED="true"
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-h "
- 			if test "${GCC}" = "yes"; then
- 				PICFLAG="-fPIC"
-@@ -49918,6 +49954,7 @@
- 				## ${CFLAGS} added for building 64-bit shared
- 				## libs using Sun's Compiler
- 				LDSHFLAGS="-G \${CFLAGS}"
-+				LDDSOFLAGS="$LDSHFLAGS"
- 			fi
- 
- cat >>confdefs.h <<\_ACEOF
-@@ -49937,6 +49974,7 @@
- 
- 			BLDSHARED="true"
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-Wl,-h,"
- 			PICFLAG="-KPIC"   # Is this correct for SunOS
- 			cat >>confdefs.h <<\_ACEOF
-@@ -49951,7 +49989,6 @@
- 			;;
- 		*netbsd* | *freebsd* | *dragonfly* )
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			DYNEXP="-Wl,--export-dynamic"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC -DPIC"
-@@ -49967,7 +50004,6 @@
- 
- 			;;
- 		*openbsd*)  BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			DYNEXP="-Wl,-Bdynamic"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC"
-@@ -49997,6 +50033,7 @@
- 			esac
- 			BLDSHARED="true"
- 			LDSHFLAGS="-set_version sgi1.0 -shared"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-soname "
- 			SHLD="\${LD}"
- 			if test "${GCC}" = "yes"; then
-@@ -50019,6 +50056,7 @@
- 			# use expfull to export underscored symbols
- 			# add rtl to remove /lib/crt0.o warning
- 			LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
- 			PICFLAG="-O2"
- 			# as AIX code is always position independent...
-@@ -50053,6 +50091,7 @@
- 				BLDSHARED="true"
- 				SHLD="cc"
- 				LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
-+				LDDSOFLAGS="$LDSHFLAGS"
- 				SONAMEFLAG="-Wl,+h "
- 				PICFLAG="+z"
- 			if test "${GCC}" = "yes"; then
-@@ -50095,7 +50134,6 @@
- _ACEOF
- 
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC"
- 			cat >>confdefs.h <<\_ACEOF
-@@ -50124,7 +50162,6 @@
- _ACEOF
- 
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-KPIC"
- 			cat >>confdefs.h <<\_ACEOF
-@@ -50198,6 +50235,7 @@
- 
- 					fi
- 					LDSHFLAGS="-G"
-+					LDDSOFLAGS="$LDSHFLAGS"
-                              		DYNEXP="-Bexport"
- 				;;
- 				*mips-sni-sysv4*)
-@@ -50225,6 +50263,7 @@
- 
- 			fi
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			cat >>confdefs.h <<\_ACEOF
- #define STAT_ST_BLOCKSIZE 512
- _ACEOF
-@@ -50236,6 +50275,7 @@
- 
- 			BLDSHARED="false"
- 			LDSHFLAGS=""
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			;;
- 
- 		*darwin*)
-@@ -50245,6 +50285,7 @@
- 
- 			BLDSHARED="true"
- 			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			CFLAGS="$CFLAGS -fno-common"
- 			SHLD="\${CC}"
- 			SHLIBEXT="dylib"
-@@ -71932,7 +71973,8 @@
- LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
- LIBTALLOC_SHARED=
- LIBTALLOC_STATIC=
--LIBTALLOC_LIBS=
-+LIBTALLOC_LIBS=-ltalloc
-+LIBTALLOC_TARGET=
- INSTALL_LIBTALLOC=
- UNINSTALL_LIBTALLOC=
- 
-@@ -71947,6 +71989,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libtalloc shared library" >&5
- $as_echo_n "checking whether to build the libtalloc shared library... " >&6; }
- 
-@@ -71981,15 +72024,17 @@
- 	UNINSTALL_LIBTALLOC=uninstalllibtalloc
- 	if eval $BLDSHARED = true; then
- 		LIBTALLOC_SHARED=$LIBTALLOC_SHARED_TARGET
-+		LIBTALLOC_TARGET=$LIBTALLOC_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTALLOC" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBTALLOC_LIBS=-ltalloc
-+			LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
-+			LIBTALLOC_LIBS=$LIBTALLOC_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBTALLOC_TARGET=$LIBTALLOC_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -72016,7 +72061,8 @@
- LIBTDB_STATIC_TARGET=bin/libtdb.a
- LIBTDB_SHARED=
- LIBTDB_STATIC=
--LIBTDB_LIBS=
-+LIBTDB_LIBS=-ltdb
-+LIBTDB_TARGET=
- INSTALL_LIBTDB=
- UNINSTALL_LIBTDB=
- 
-@@ -72031,6 +72077,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libtdb shared library" >&5
- $as_echo_n "checking whether to build the libtdb shared library... " >&6; }
- 
-@@ -72065,15 +72112,17 @@
- 	UNINSTALL_LIBTDB=uninstalllibtdb
- 	if eval $BLDSHARED = true; then
- 		LIBTDB_SHARED=$LIBTDB_SHARED_TARGET
-+		LIBTDB_TARGET=$LIBTDB_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBTDB" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBTDB_LIBS=-ltdb
-+			LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
-+			LIBTDB_LIBS=$LIBTDB_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBTDB_TARGET=$LIBTDB_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -72100,7 +72149,8 @@
- LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
- LIBNETAPI_SHARED=
- LIBNETAPI_STATIC=
--LIBNETAPI_LIBS=
-+LIBNETAPI_LIBS=-lnetapi
-+LIBNETAPI_TARGET=
- INSTALL_LIBNETAPI=
- UNINSTALL_LIBNETAPI=
- 
-@@ -72115,6 +72165,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libnetapi shared library" >&5
- $as_echo_n "checking whether to build the libnetapi shared library... " >&6; }
- 
-@@ -72149,15 +72200,17 @@
- 	UNINSTALL_LIBNETAPI=uninstalllibnetapi
- 	if eval $BLDSHARED = true; then
- 		LIBNETAPI_SHARED=$LIBNETAPI_SHARED_TARGET
-+		LIBNETAPI_TARGET=$LIBNETAPI_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBNETAPI" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBNETAPI_LIBS=-lnetapi
-+			LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
-+			LIBNETAPI_LIBS=$LIBNETAPI_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBNETAPI_TARGET=$LIBNETAPI_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -72184,7 +72237,8 @@
- LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
- LIBSMBCLIENT_SHARED=
- LIBSMBCLIENT_STATIC=
--LIBSMBCLIENT_LIBS=
-+LIBSMBCLIENT_LIBS=-lsmbclient
-+LIBSMBCLIENT_TARGET=
- INSTALL_LIBSMBCLIENT=
- UNINSTALL_LIBSMBCLIENT=
- 
-@@ -72199,6 +72253,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libsmbclient shared library" >&5
- $as_echo_n "checking whether to build the libsmbclient shared library... " >&6; }
- 
-@@ -72233,15 +72288,17 @@
- 	UNINSTALL_LIBSMBCLIENT=uninstalllibsmbclient
- 	if eval $BLDSHARED = true; then
- 		LIBSMBCLIENT_SHARED=$LIBSMBCLIENT_SHARED_TARGET
-+		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBCLIENT" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBSMBCLIENT_LIBS=-lsmbclient
-+			LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
-+			LIBSMBCLIENT_LIBS=$LIBSMBCLIENT_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBSMBCLIENT_TARGET=$LIBSMBCLIENT_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -72268,7 +72325,8 @@
- LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
- LIBSMBSHAREMODES_SHARED=
- LIBSMBSHAREMODES_STATIC=
--LIBSMBSHAREMODES_LIBS=
-+LIBSMBSHAREMODES_LIBS=-lsmbsharemodes
-+LIBSMBSHAREMODES_TARGET=
- INSTALL_LIBSMBSHAREMODES=
- UNINSTALL_LIBSMBSHAREMODES=
- 
-@@ -72283,6 +72341,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libsmbsharemodes shared library" >&5
- $as_echo_n "checking whether to build the libsmbsharemodes shared library... " >&6; }
- 
-@@ -72317,15 +72376,17 @@
- 	UNINSTALL_LIBSMBSHAREMODES=uninstalllibsmbsharemodes
- 	if eval $BLDSHARED = true; then
- 		LIBSMBSHAREMODES_SHARED=$LIBSMBSHAREMODES_SHARED_TARGET
-+		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBSMBSHAREMODES" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBSMBSHAREMODES_LIBS=-lsmbsharemodes
-+			LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
-+			LIBSMBSHAREMODES_LIBS=$LIBSMBSHAREMODES_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBSMBSHAREMODES_TARGET=$LIBSMBSHAREMODES_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -72352,7 +72413,8 @@
- LIBADDNS_STATIC_TARGET=bin/libaddns.a
- LIBADDNS_SHARED=
- LIBADDNS_STATIC=
--LIBADDNS_LIBS=
-+LIBADDNS_LIBS=-laddns
-+LIBADDNS_TARGET=
- INSTALL_LIBADDNS=
- UNINSTALL_LIBADDNS=
- 
-@@ -72367,6 +72429,7 @@
- 
- 
- 
-+
- { $as_echo "$as_me:$LINENO: checking whether to build the libaddns shared library" >&5
- $as_echo_n "checking whether to build the libaddns shared library... " >&6; }
- 
-@@ -72403,15 +72466,17 @@
- 	UNINSTALL_LIBADDNS=uninstalllibaddns
- 	if eval $BLDSHARED = true; then
- 		LIBADDNS_SHARED=$LIBADDNS_SHARED_TARGET
-+		LIBADDNS_TARGET=$LIBADDNS_SHARED_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: yes" >&5
- $as_echo "yes" >&6; }
- 		if test x"$USESHARED" != x"true" -o x"$LINK_LIBADDNS" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBADDNS_LIBS=-laddns
-+			LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
-+			LIBADDNS_LIBS=$LIBADDNS_STATIC_TARGET
- 		fi
- 	else
- 		enable_static=yes
-+		LIBADDNS_TARGET=$LIBADDNS_STATIC_TARGET
- 		{ $as_echo "$as_me:$LINENO: result: no shared library support -- will supply static library" >&5
- $as_echo "no shared library support -- will supply static library" >&6; }
- 	fi
-@@ -75300,7 +75365,7 @@
- $as_echo "yes" >&6; };
- 
- 	case "$host_os" in
--	*linux*)
-+	linux*-gnu* | gnu* | k*bsd*-gnu)
- 		{ $as_echo "$as_me:$LINENO: checking for linux sendfile64 support" >&5
- $as_echo_n "checking for linux sendfile64 support... " >&6; }
- if test "${samba_cv_HAVE_SENDFILE64+set}" = set; then
-@@ -76562,11 +76627,11 @@
- WINBIND_NSS_PTHREAD=""
- 
- case "$host_os" in
--	*linux*)
-+	linux*-gnu* | gnu* | k*bsd*-gnu)
- 		NSSSONAMEVERSIONSUFFIX=".2"
- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- 		;;
--	*freebsd[5-9]*)
-+	freebsd5*|*freebsd[6-9]*)
- 		# FreeBSD winbind client is implemented as a wrapper around
- 		# the Linux version.
- 		NSSSONAMEVERSIONSUFFIX=".1"
-Index: samba-deb/source/include/config.h.in
-===================================================================
---- samba-deb.orig/source/include/config.h.in
-+++ samba-deb/source/include/config.h.in
-@@ -69,6 +69,9 @@
- /* Whether to use fully FHS-compatible paths */
- #undef FHS_COMPATIBLE
- 
-+/* Whether to use fully FHS-compatible paths */
-+#undef FHS_COMPATIBLE
-+
- /* Whether the host os is FreeBSD */
- #undef FREEBSD
- 

Copied: trunk/samba/debian/patches/codepages-location.patch (from rev 2936, branches/samba/experimental/debian/patches/codepages-location.patch)
===================================================================
--- trunk/samba/debian/patches/codepages-location.patch	                        (rev 0)
+++ trunk/samba/debian/patches/codepages-location.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -0,0 +1,21 @@
+Goal:  Move codepage files to the datadir (codepagedir is not configurable)
+
+Fixes: Build failure..:-)
+
+Status wrt upstream: Forwarded as Bugzilla #6444
+
+Note: 
+
+Index: samba-3.4.0pre1/source3/Makefile.in
+===================================================================
+--- samba-3.4.0pre1.orig/source3/Makefile.in
++++ samba-3.4.0pre1/source3/Makefile.in
+@@ -156,7 +156,7 @@
+ STATEDIR = @statedir@
+ 
+ # Where to look for (and install) codepage databases.
+-CODEPAGEDIR = @codepagedir@
++CODEPAGEDIR = @datadir@
+ 
+ # the directory where pid files go
+ PIDDIR = @piddir@

Modified: trunk/samba/debian/patches/documentation.patch
===================================================================
--- trunk/samba/debian/patches/documentation.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/documentation.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,10 +1,10 @@
 Goal: Remove documentation parts that do not apply to Debian
 
-Fixes: ?
+Fixes: many minor reported issues and remarks gathered here and there
 
 Status wrt upstream: Debian specific
 
-Note: Some part should maybe go in the FHS patch
+Note: 
 
 Index: samba-3.3.0/docs/manpages/swat.8
 ===================================================================

Deleted: trunk/samba/debian/patches/fhs-assignpaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-assignpaths.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/fhs-assignpaths.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,113 +0,0 @@
-Goal: Change install paths to better respect FHS. This needs fhs-newpaths.patch
-      to introduce new path variables and fhs-filespaths.patch to
-      associate files with these
-
-Fixes: #49011
-
-Status wrt upstream: The "lock dir" related parts will no longer be
-                     needed in 3.4 and 3.4 will allow to configure locations
-                     for "lock directory", "state directory" and 
-                     "cache directory" in smb.conf
-
-Index: samba-3.3.0rc2/source/param/loadparm.c
-===================================================================
---- samba-3.3.0rc2.orig/source/param/loadparm.c
-+++ samba-3.3.0rc2/source/param/loadparm.c
-@@ -120,6 +120,9 @@
- 	char *szAddPrinterCommand;
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
-+#ifdef FHS_COMPATIBLE
-+	char *szLockDirStub;
-+#endif
- 	char *szLockDir;
- 	char *szPidDir;
- 	char *szRootdir;
-@@ -3705,6 +3708,26 @@
- 		.enum_list	= NULL,
- 		.flags		= FLAG_ADVANCED,
- 	},
-+#ifdef FHS_COMPATIBLE
-+	{
-+		.label		= "lock directory",
-+		.type		= P_STRING,
-+		.p_class	= P_GLOBAL,
-+		.ptr		= &Globals.szLockDirStub,
-+		.special	= NULL,
-+		.enum_list	= NULL,
-+		.flags		= 0,
-+	},
-+	{
-+		.label		= "lock dir",
-+		.type		= P_STRING,
-+		.p_class	= P_GLOBAL,
-+		.ptr		= &Globals.szLockDirStub,
-+		.special	= NULL,
-+		.enum_list	= NULL,
-+		.flags		= 0,
-+	},
-+#else
- 	{
- 		.label		= "lock directory",
- 		.type		= P_STRING,
-@@ -3723,6 +3746,7 @@
- 		.enum_list	= NULL,
- 		.flags		= FLAG_HIDE,
- 	},
-+#endif
- 	{
- 		.label		= "pid directory",
- 		.type		= P_STRING,
-Index: samba-3.3.0rc2/source/m4/check_path.m4
-===================================================================
---- samba-3.3.0rc2.orig/source/m4/check_path.m4
-+++ samba-3.3.0rc2/source/m4/check_path.m4
-@@ -26,9 +26,9 @@
- pammodulesdir="${libdir}/security"
- configdir="${libdir}"
- swatdir="\${prefix}/swat"
--codepagedir="\${MODULESDIR}"
--statedir="\${LOCKDIR}"
--cachedir="\${LOCKDIR}"
-+codepagedir="\${prefix}/share/samba"
-+statedir="\${VARDIR}/lib/samba"
-+cachedir="\${VARDIR}/cache/samba"
- localedir="\${prefix}/share/locale"
- 
- AC_ARG_WITH(fhs,
-@@ -43,10 +43,10 @@
-     test "${libdir}" || libdir="\${prefix}/lib"
-     modulesdir="${libdir}/samba"
-     configdir="\${sysconfdir}/samba"
--    swatdir="\${DATADIR}/samba/swat"
--    codepagedir="\${MODULESDIR}"
-+    swatdir="\${prefix}/swat"
-+    codepagedir="\${prefix}/share/samba"
-     statedir="\${VARDIR}/lib/samba"
--    cachedir="\${VARDIR}/lib/samba"
-+    cachedir="\${VARDIR}/cache/samba"
-     AC_DEFINE(FHS_COMPATIBLE, 1, [Whether to use fully FHS-compatible paths])
-     ;;
-   esac])
-Index: samba-3.3.0rc2/source/configure
-===================================================================
---- samba-3.3.0rc2.orig/source/configure
-+++ samba-3.3.0rc2/source/configure
-@@ -2245,7 +2245,7 @@
- swatdir="\${prefix}/swat"
- codepagedir="\${MODULESDIR}"
- statedir="\${LOCKDIR}"
--cachedir="\${LOCKDIR}"
-+cachedir="\${prefix}/cache/samba"
- localedir="\${prefix}/share/locale"
- 
- 
-@@ -2262,7 +2262,7 @@
-     modulesdir="${libdir}/samba"
-     configdir="\${sysconfdir}/samba"
-     swatdir="\${DATADIR}/samba/swat"
--    codepagedir="\${MODULESDIR}"
-+    codepagedir="\${prefix}/share/samba"
-     statedir="\${VARDIR}/lib/samba"
-     cachedir="\${VARDIR}/lib/samba"
- 

Deleted: trunk/samba/debian/patches/fhs-filespaths-debatable.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths-debatable.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/fhs-filespaths-debatable.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,282 +0,0 @@
-Goal: Prepare the sources to better respect FHS
-      New configurable paths are introduced in fhs-newpaths.patch
-      This patch associates files with the new paths
-      This part is debated with upstream
-
-Fixes: #49011
-
-Status wrt upstream: Applied in 3.4
-
-Note: Use dedicated directories for:
-      - discardable cache data (/var/cache/samba): 
-          browse.dat, printers.tbd, <printer>.tdb
-      - non discardable state data:
-          all TDB files that may need to be backed up
-      - shared data (/usr/share/samba):
-          codepage stuff
-
-      This patch needs work to be cleaner wrt people who want to run
-      multiple instances of samba
-
-      The patch *must* be reviewed after every new upstream release.
-      FAILURE TO DO SO MAY RESULT IN DATA LOSS FOR OUR USERS!
-
-      export QUILT_PATCHES=debian/patches
-      quilt push fhs.patch
-      grep -r lock_path source/ | grep -vE \
-         '"((brlock|connections|gencache|locking|messages|notify|sessionid|unexpected|wins)\.tdb|namelist.debug|lang_)|char \*lock_path|WINBINDD_PRIV_SOCKET_SUBDIR'
-
-      - This will get you the list of any new, unexpected references to
-        lock_path.  The files mentioned above are the known good uses of
-        lock_path; everything else needs to be investigated.
-      - If the file name occurs elsewhere in the fhs.patch, update the
-        patch to fix these new references to the same place (either
-        cache_path or state_path)
-      - If the file is a tdb file, and the code that opens it uses
-        TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
-        above with the new filename, no other changes are needed.
-      - Otherwise, if this is the first use of the file, you must
-        determine where the file belongs -- i.e., whether it's
-        persistent data, a cache, or runtime-only data.  Consult
-        upstream if necessary.
-      - Repeat these steps for lp_lockdir(), which is less common but
-        still used in the code.
-
-      grep -r lp_lockdir source/ | grep -vE \
-         '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-
-Index: samba-deb/source/lib/util.c
-===================================================================
---- samba-deb.orig/source/lib/util.c
-+++ samba-deb/source/lib/util.c
-@@ -2644,6 +2644,15 @@
- 	return xx_path(name, get_dyn_STATEDIR());
- }
- 
-+
-+/*****************************************************************
-+a useful function for returning a path in the Samba cache directory
-+ *****************************************************************/
-+char *cache_path(const char *name)
-+{
-+	return xx_path(name, get_dyn_CACHEDIR());
-+}
-+
- /**
-  * @brief Returns the platform specific shared library extension.
-  *
-Index: samba-deb/source/libsmb/samlogon_cache.c
-===================================================================
---- samba-deb.orig/source/libsmb/samlogon_cache.c
-+++ samba-deb/source/libsmb/samlogon_cache.c
-@@ -34,7 +34,7 @@
- bool netsamlogon_cache_init(void)
- {
- 	if (!netsamlogon_tdb) {
--		netsamlogon_tdb = tdb_open_log(lock_path(NETSAMLOGON_TDB), 0,
-+		netsamlogon_tdb = tdb_open_log(cache_path(NETSAMLOGON_TDB), 0,
- 					       TDB_DEFAULT, O_RDWR | O_CREAT, 0600);
- 	}
- 
-Index: samba-deb/source/nmbd/nmbd_serverlistdb.c
-===================================================================
---- samba-deb.orig/source/nmbd/nmbd_serverlistdb.c
-+++ samba-deb/source/nmbd/nmbd_serverlistdb.c
-@@ -326,7 +326,7 @@
- 
- 	updatecount++;
- 
--	fname = talloc_strdup(ctx, lp_lockdir());
-+	fname = talloc_strdup(ctx, get_dyn_CACHEDIR());
- 	if (!fname) {
- 		return;
- 	}
-Index: samba-deb/source/passdb/login_cache.c
-===================================================================
---- samba-deb.orig/source/passdb/login_cache.c
-+++ samba-deb/source/passdb/login_cache.c
-@@ -35,7 +35,7 @@
- 	/* skip file open if it's already opened */
- 	if (cache) return True;
- 
--	if (asprintf(&cache_fname, "%s/%s", lp_lockdir(), LOGIN_CACHE_FILE) == -1) {
-+	if (asprintf(&cache_fname, "%s/%s", get_dyn_CACHEDIR(), LOGIN_CACHE_FILE) == -1) {
- 		DEBUG(0, ("Filename allocation failed.\n"));
- 		return False;
- 	}
-Index: samba-deb/source/printing/printing.c
-===================================================================
---- samba-deb.orig/source/printing/printing.c
-+++ samba-deb/source/printing/printing.c
-@@ -183,8 +183,8 @@
- 	int services = lp_numservices();
- 	int snum;
- 
--	unlink(lock_path("printing.tdb"));
--	mkdir(lock_path("printing"),0755);
-+	unlink(cache_path("printing.tdb"));
-+	mkdir(cache_path("printing"),0755);
- 
- 	/* handle a Samba upgrade */
- 
-Index: samba-deb/source/printing/printing_db.c
-===================================================================
---- samba-deb.orig/source/printing/printing_db.c
-+++ samba-deb/source/printing/printing_db.c
-@@ -91,7 +91,7 @@
- 	}
- 
- 	if (asprintf(&printdb_path, "%s%s.tdb",
--				lock_path("printing/"),
-+				cache_path("printing/"),
- 				printername) < 0) {
- 		DLIST_REMOVE(print_db_head, p);
- 		SAFE_FREE(p);
-Index: samba-deb/source/smbd/lanman.c
-===================================================================
---- samba-deb.orig/source/smbd/lanman.c
-+++ samba-deb/source/smbd/lanman.c
-@@ -1154,9 +1154,9 @@
- 	bool local_list_only;
- 	int i;
- 
--	lines = file_lines_load(lock_path(SERVER_LIST), NULL, 0);
-+	lines = file_lines_load(cache_path(SERVER_LIST), NULL, 0);
- 	if (!lines) {
--		DEBUG(4,("Can't open %s - %s\n",lock_path(SERVER_LIST),strerror(errno)));
-+		DEBUG(4,("Can't open %s - %s\n",cache_path(SERVER_LIST),strerror(errno)));
- 		return 0;
- 	}
- 
-Index: samba-deb/source/utils/smbcontrol.c
-===================================================================
---- samba-deb.orig/source/utils/smbcontrol.c
-+++ samba-deb/source/utils/smbcontrol.c
-@@ -867,10 +867,10 @@
- 	/* Remove the entry in the winbindd_cache tdb to tell a later
- 	   starting winbindd that we're online. */
- 
--	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
-+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
- 	if (!tdb) {
- 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
--			lock_path("winbindd_cache.tdb"));
-+			cache_path("winbindd_cache.tdb"));
- 		return False;
- 	}
- 
-@@ -897,13 +897,13 @@
- 	   starting winbindd that we're offline. We may actually create
- 	   it here... */
- 
--	tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+	tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE,
- 				TDB_DEFAULT /* TDB_CLEAR_IF_FIRST */, O_RDWR|O_CREAT, 0600);
- 
- 	if (!tdb) {
- 		fprintf(stderr, "Cannot open the tdb %s for writing.\n",
--			lock_path("winbindd_cache.tdb"));
-+			cache_path("winbindd_cache.tdb"));
- 		return False;
- 	}
- 
-Index: samba-deb/source/libgpo/gpo_fetch.c
-===================================================================
---- samba-deb.orig/source/libgpo/gpo_fetch.c
-+++ samba-deb/source/libgpo/gpo_fetch.c
-@@ -59,7 +59,7 @@
- 
- 	if ((path = talloc_asprintf(mem_ctx,
- 					"%s/%s",
--					lock_path(GPO_CACHE_DIR),
-+					cache_path(GPO_CACHE_DIR),
- 					file_sys_path)) == NULL) {
- 		return NT_STATUS_NO_MEMORY;
- 	}
-@@ -82,7 +82,7 @@
- static NTSTATUS gpo_prepare_local_store(TALLOC_CTX *mem_ctx,
- 					const char *unix_path)
- {
--	const char *top_dir = lock_path(GPO_CACHE_DIR);
-+	const char *top_dir = cache_path(GPO_CACHE_DIR);
- 	char *current_dir;
- 	char *tok;
- 
-Index: samba-deb/source/winbindd/winbindd_cache.c
-===================================================================
---- samba-deb.orig/source/winbindd/winbindd_cache.c
-+++ samba-deb/source/winbindd/winbindd_cache.c
-@@ -2537,7 +2537,7 @@
- 		return true;
- 
- 	/* when working offline we must not clear the cache on restart */
--	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
- 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
- 				O_RDWR|O_CREAT, 0600);
-@@ -2580,9 +2580,9 @@
- 		tdb_close(wcache->tdb);
- 		wcache->tdb = NULL;
- 
--		if (unlink(lock_path("winbindd_cache.tdb")) == -1) {
-+		if (unlink(cache_path("winbindd_cache.tdb")) == -1) {
- 			DEBUG(0,("initialize_winbindd_cache: unlink %s failed %s ",
--				lock_path("winbindd_cache.tdb"),
-+				cache_path("winbindd_cache.tdb"),
- 				strerror(errno) ));
- 			return false;
- 		}
-@@ -2864,7 +2864,7 @@
- 		return;
- 
- 	/* when working offline we must not clear the cache on restart */
--	wcache->tdb = tdb_open_log(lock_path("winbindd_cache.tdb"),
-+	wcache->tdb = tdb_open_log(cache_path("winbindd_cache.tdb"),
- 				WINBINDD_CACHE_TDB_DEFAULT_HASH_SIZE, 
- 				lp_winbind_offline_logon() ? TDB_DEFAULT : (TDB_DEFAULT | TDB_CLEAR_IF_FIRST), 
- 				O_RDWR|O_CREAT, 0600);
-@@ -3693,7 +3693,7 @@
- int winbindd_validate_cache(void)
- {
- 	int ret = -1;
--	const char *tdb_path = lock_path("winbindd_cache.tdb");
-+	const char *tdb_path = cache_path("winbindd_cache.tdb");
- 	TDB_CONTEXT *tdb = NULL;
- 
- 	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
-@@ -3735,7 +3735,7 @@
- int winbindd_validate_cache_nobackup(void)
- {
- 	int ret = -1;
--	const char *tdb_path = lock_path("winbindd_cache.tdb");
-+	const char *tdb_path = cache_path("winbindd_cache.tdb");
- 
- 	DEBUG(10, ("winbindd_validate_cache: replacing panic function\n"));
- 	smb_panic_fn = validate_panic;
-Index: samba-deb/source/printing/nt_printing.c
-===================================================================
---- samba-deb.orig/source/printing/nt_printing.c
-+++ samba-deb/source/printing/nt_printing.c
-@@ -2552,7 +2552,7 @@
- 
- 	if (geteuid() == 0) {
- 		if (asprintf(&printdb_path, "%s%s.tdb",
--				lock_path("printing/"),
-+				cache_path("printing/"),
- 				sharename) < 0) {
- 			return (uint32)-1;
- 		}
-Index: samba-deb/source/include/proto.h
-===================================================================
---- samba-deb.orig/source/include/proto.h
-+++ samba-deb/source/include/proto.h
-@@ -1315,6 +1315,7 @@
- char *modules_path(const char *name);
- char *data_path(const char *name);
- char *state_path(const char *name);
-+char *cache_path(const char *name);
- const char *shlib_ext(void);
- char *parent_dirname(const char *path);
- bool parent_dirname_talloc(TALLOC_CTX *mem_ctx, const char *dir,

Modified: trunk/samba/debian/patches/fhs-filespaths.patch
===================================================================
--- trunk/samba/debian/patches/fhs-filespaths.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/fhs-filespaths.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,59 +1,19 @@
 Goal: Prepare the sources to better respect FHS
-      New configurable paths are introduced in fhs-newpaths.patch
-      This patch associates files with the new paths
-      This part seems acceptable by upstream
 
 Fixes: #49011
 
-Status wrt upstream: This is a greatly reduced patch; most of the
-                     changes are already accepted upstream in 3.2, only
-                     three bits remain: two need further analysis because
-                     Debian use of lp_private_dir() differs from that on
-                     other distros, the other is a newly-introduced tdb
-                     that went in the wrong dir
+Status wrt upstream: Everything is applied as of 3.4.0
 
-Note: Use dedicated directories for:
-      - discardable cache data (/var/cache/samba): 
-          browse.dat, printers.tbd, <printer>.tdb
-      - non discardable state data:
-          all TDB files that may need to be backed up
-      - shared data (/usr/share/samba):
-          codepage stuff
+Note: The last remaining bit is the location of "private files
+      We historically have them in /var/lib/samba while upstream
+      has them in /etc/samba
+      We need to provide a migraiton path and go back to the "normal"
+      file layout
 
-      This patch needs work to be cleaner wrt people who want to run
-      multiple instances of samba
-
-      The patch *must* be reviewed after every new upstream release.
-      FAILURE TO DO SO MAY RESULT IN DATA LOSS FOR OUR USERS!
-
-      export QUILT_PATCHES=debian/patches
-      quilt push fhs.patch
-      grep -r lock_path source/ | grep -vE \
-         '"((brlock|connections|gencache|locking|messages|notify|sessionid|unexpected|wins|mutex)\.tdb|namelist.debug|lang_)|char \*lock_path|WINBINDD_PRIV_SOCKET_SUBDIR'
-
-      - This will get you the list of any new, unexpected references to
-        lock_path.  The files mentioned above are the known good uses of
-        lock_path; everything else needs to be investigated.
-      - If the file name occurs elsewhere in the fhs.patch, update the
-        patch to fix these new references to the same place (either
-        cache_path or state_path)
-      - If the file is a tdb file, and the code that opens it uses
-        TDB_CLEAR_IF_FIRST, lock_path is correct; just update the query
-        above with the new filename, no other changes are needed.
-      - Otherwise, if this is the first use of the file, you must
-        determine where the file belongs -- i.e., whether it's
-        persistent data, a cache, or runtime-only data.  Consult
-        upstream if necessary.
-      - Repeat these steps for lp_lockdir(), which is less common but
-        still used in the code.
-
-      grep -r lp_lockdir source/ | grep -vE \
-         '%s/smb_(tmp_)*krb5|source/(lib/util|param/loadparm|dynconfig|utils/testparm|smbd/oplock_irix)\.c|WINBINDD_PRIV_SOCKET_SUBDIR|(directory_exist|mkdir)\(lp_lockdir\(\),|koplock\.%d|%s/sync\.%d'
-
-Index: samba-3.3.0rc2/source/passdb/pdb_tdb.c
+Index: samba-3.3.0rc2/source3/passdb/pdb_tdb.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/passdb/pdb_tdb.c
-+++ samba-3.3.0rc2/source/passdb/pdb_tdb.c
+--- samba-3.3.0rc2.orig/source3/passdb/pdb_tdb.c
++++ samba-3.3.0rc2/source3/passdb/pdb_tdb.c
 @@ -1613,7 +1613,7 @@
  	/* save the path for later */
  
@@ -63,23 +23,10 @@
  			     PASSDB_FILE_NAME) < 0) {
  			return NT_STATUS_NO_MEMORY;
  		}
-Index: samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
+Index: samba-3.3.0rc2/source3/passdb/secrets.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/modules/vfs_xattr_tdb.c
-+++ samba-3.3.0rc2/source/modules/vfs_xattr_tdb.c
-@@ -576,7 +576,7 @@
- 	const char *dbname;
- 
- 	dbname = lp_parm_const_string(snum, "xattr_tdb", "file",
--				      lock_path("xattr.tdb"));
-+				      state_path("xattr.tdb"));
- 
- 	if (dbname == NULL) {
- 		errno = ENOSYS;
-Index: samba-3.3.0rc2/source/passdb/secrets.c
-===================================================================
---- samba-3.3.0rc2.orig/source/passdb/secrets.c
-+++ samba-3.3.0rc2/source/passdb/secrets.c
+--- samba-3.3.0rc2.orig/source3/passdb/secrets.c
++++ samba-3.3.0rc2/source3/passdb/secrets.c
 @@ -59,7 +59,7 @@
  		return True;
  

Modified: trunk/samba/debian/patches/installswat.sh.patch
===================================================================
--- trunk/samba/debian/patches/installswat.sh.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/installswat.sh.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.3.0rc2/source/script/installswat.sh
+Index: samba-3.3.0rc2/source3/script/installswat.sh
 ===================================================================
---- samba-3.3.0rc2.orig/source/script/installswat.sh
-+++ samba-3.3.0rc2/source/script/installswat.sh
+--- samba-3.3.0rc2.orig/source3/script/installswat.sh
++++ samba-3.3.0rc2/source3/script/installswat.sh
 @@ -198,7 +198,11 @@
  
  # Install/ remove Using Samba book (but only if it is there)

Modified: trunk/samba/debian/patches/no-unnecessary-cups.patch
===================================================================
--- trunk/samba/debian/patches/no-unnecessary-cups.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/no-unnecessary-cups.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -5,10 +5,10 @@
 
 Upstream status: submitted as bugzilla bug #5525
 
-Index: samba-3.3.0rc2/source/smbd/server.c
+Index: samba-3.3.0rc2/source3/smbd/server.c
 ===================================================================
---- samba-3.3.0rc2.orig/source/smbd/server.c
-+++ samba-3.3.0rc2/source/smbd/server.c
+--- samba-3.3.0rc2.orig/source3/smbd/server.c
++++ samba-3.3.0rc2/source3/smbd/server.c
 @@ -806,6 +806,10 @@
  	int pnum = lp_servicenumber(PRINTERS_NAME);
  	const char *pname;

Deleted: trunk/samba/debian/patches/non-linux-ports.patch
===================================================================
--- trunk/samba/debian/patches/non-linux-ports.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/non-linux-ports.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,73 +0,0 @@
-Goal: Support non Linux ports
-
-Fixes: 266693
-
-Status wrt upstream: Forwarded, will be in 3.0.26
-
-Note: Upstream would probably welcome patches allowing to build on new architectures. 
-      As this patch is the most often broken by new upstream releases, everybody would benefit from it.
-
-Index: samba-3.3.0rc2/source/configure.in
-===================================================================
---- samba-3.3.0rc2.orig/source/configure.in
-+++ samba-3.3.0rc2/source/configure.in
-@@ -553,6 +553,15 @@
-       fi
-     ;;
- 
-+# Systems with LFS support.
-+#
-+    gnu* | k*bsd*-gnu)
-+	CPPFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $CPPFLAGS"
-+	AC_DEFINE(_LARGEFILE64_SOURCE, 1, [Whether to enable large file support])
-+	AC_DEFINE(_FILE_OFFSET_BITS, 64, [File offset bits])
-+	AC_DEFINE(_GNU_SOURCE, 1, [Whether to use GNU libc extensions])
-+	;;
-+
- # Tests for linux LFS support. Need kernel 2.4 and glibc2.2 or greater support.
- #
-     *linux*)
-@@ -1222,7 +1231,7 @@
- #
- #
- case "$host_os" in
--    *linux*)
-+    linux*-gnu* | gnu* | k*bsd*-gnu)
-        # glibc <= 2.3.2 has a broken getgrouplist
-        AC_TRY_RUN([
- #include <unistd.h>
-@@ -1656,7 +1665,10 @@
- 
-   # and these are for particular systems
-   case "$host_os" in
--		*linux*)   AC_DEFINE(LINUX,1,[Whether the host os is linux])
-+		linux*-gnu* | gnu* | k*bsd*-gnu)
-+			case "$host_os" in linux*)
-+				AC_DEFINE(LINUX,1,[Whether the host os is linux]) ;;
-+			esac
- 			BLDSHARED="true"
- 			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
- 				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
-@@ -5375,7 +5387,7 @@
- 	AC_MSG_RESULT(yes);
- 
- 	case "$host_os" in
--	*linux*)
-+	linux*-gnu* | gnu* | k*bsd*-gnu)
- 		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
- 		AC_TRY_LINK([#include <sys/sendfile.h>],
- [\
-@@ -5701,11 +5713,11 @@
- WINBIND_NSS_PTHREAD=""
- 
- case "$host_os" in
--	*linux*)
-+	linux*-gnu* | gnu* | k*bsd*-gnu)
- 		NSSSONAMEVERSIONSUFFIX=".2"
- 		WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
- 		;;
--	*freebsd[[5-9]]*)
-+	freebsd5*|*freebsd[[6-9]]*)
- 		# FreeBSD winbind client is implemented as a wrapper around
- 		# the Linux version.
- 		NSSSONAMEVERSIONSUFFIX=".1"

Modified: trunk/samba/debian/patches/pam-examples.patch
===================================================================
--- trunk/samba/debian/patches/pam-examples.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/pam-examples.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -6,10 +6,10 @@
 
 Note: 
 
-Index: samba-3.3.0rc2/source/pam_smbpass/README
+Index: samba-3.3.0rc2/source3/pam_smbpass/README
 ===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/README
-+++ samba-3.3.0rc2/source/pam_smbpass/README
+--- samba-3.3.0rc2.orig/source3/pam_smbpass/README
++++ samba-3.3.0rc2/source3/pam_smbpass/README
 @@ -37,7 +37,7 @@
  	smbconf=<file>	-	specify an alternate path to the smb.conf
  				file.

Deleted: trunk/samba/debian/patches/proper-static-lib-linking.patch
===================================================================
--- trunk/samba/debian/patches/proper-static-lib-linking.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/proper-static-lib-linking.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,544 +0,0 @@
-Goal: Sane library interdependencies with static and dynamic linking
-
-Fixes:
-
-Status wrt upstream: basically gone into master and v3-4-test, with 
-                     a couple of subsequent patches as 
-                     f9eb77477b82740814e6143837d8a70f8090b9a5 in upstream git
-
-Note:
-
-=== modified file 'source/Makefile.in'
-Index: samba-deb/source/Makefile.in
-===================================================================
---- samba-deb.orig/source/Makefile.in
-+++ samba-deb/source/Makefile.in
-@@ -240,7 +240,7 @@
- TDB_OBJ = lib/util_tdb.o \
- 	  lib/dbwrap.o lib/dbwrap_tdb.o \
- 	  lib/dbwrap_ctdb.o \
--	  lib/dbwrap_rbt.o @LIBTDB_STATIC@
-+	  lib/dbwrap_rbt.o
- 
- SMBLDAP_OBJ = @SMBLDAP@ @SMBLDAPUTIL@
- 
-@@ -317,8 +317,7 @@
- SOCKET_WRAPPER_OBJ = @SOCKET_WRAPPER_OBJS@
- NSS_WRAPPER_OBJ = @NSS_WRAPPER_OBJS@
- 
--LIBSAMBAUTIL_OBJ = @LIBTALLOC_STATIC@ \
--		$(LIBREPLACE_OBJ) \
-+LIBSAMBAUTIL_OBJ = $(LIBREPLACE_OBJ) \
- 		$(SOCKET_WRAPPER_OBJ) \
- 		$(NSS_WRAPPER_OBJ)
- 
-@@ -368,7 +367,7 @@
- 
- LIBADDNS_OBJ0 = libaddns/dnsrecord.o libaddns/dnsutils.o  libaddns/dnssock.o \
- 	       libaddns/dnsgss.o libaddns/dnsmarshall.o
--LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) @LIBTALLOC_STATIC@
-+LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ)
- 
- GPEXT_OBJ = libgpo/gpext/gpext.o @GPEXT_STATIC@
- 
-@@ -1098,15 +1097,15 @@
- 		iniparser_build/strlib.o
- 
- TDBBACKUP_OBJ = @tdbdir@/tools/tdbbackup.o $(LIBREPLACE_OBJ) \
--	@LIBTDB_STATIC@ $(SOCKET_WRAPPER_OBJ)
-+	$(SOCKET_WRAPPER_OBJ)
- 
--TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBTOOL_OBJ = @tdbdir@/tools/tdbtool.o $(LIBREPLACE_OBJ) \
- 	$(SOCKET_WRAPPER_OBJ)
- 
--TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBDUMP_OBJ = @tdbdir@/tools/tdbdump.o $(LIBREPLACE_OBJ) \
- 	$(SOCKET_WRAPPER_OBJ)
- 
--TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o @LIBTDB_STATIC@ $(LIBREPLACE_OBJ) \
-+TDBTORTURE_OBJ = @tdbdir@/tools/tdbtorture.o $(LIBREPLACE_OBJ) \
- 	$(SOCKET_WRAPPER_OBJ)
- 
- 
-@@ -1329,7 +1328,7 @@
- 	  dir=bin $(MAKEDIR); fi
- 	@: >> $@ || : > $@ # what a fancy emoticon!
- 
--bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
-+bin/smbd at EXEEXT@: $(BINARY_PREREQS) $(SMBD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @BUILD_POPT@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBD_OBJ) $(LDFLAGS) $(LDAP_LIBS) \
- 		$(KRB5LIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) \
-@@ -1337,45 +1336,45 @@
- 		$(POPT_LIBS) @SMBD_LIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
- 
--bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS)
- 
--bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
- 	  $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
- 	  $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
- 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
- 
--bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
-+bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
- 		$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
- 		@INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS)
- 
--bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-@@ -1388,135 +1387,135 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
- 
--bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
- 		$(LIBTDB_LIBS) $(NSCD_LIBS)
- 
--bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
- 		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
- 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
- 		$(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS)  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
- 		$(LIBTDB_LIBS)
- 
--bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
- 
--bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS)  $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
- 		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(AVAHI_LIBS) \
- 		$(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(DNSSD_LIBS) \
-@@ -1524,70 +1523,70 @@
- 		@SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
- 
--bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
- 		$(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
- 
--bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@
-+bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS)
- 
--bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
-@@ -1752,7 +1751,7 @@
- 		  nsswitch/libwbclient/wbc_pam.o
- LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
- 		  $(WBCOMMON_OBJ) \
--		  @LIBTALLOC_STATIC@ $(LIBREPLACE_OBJ)
-+		  $(LIBREPLACE_OBJ)
- 
- LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
- LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
-@@ -2034,7 +2033,7 @@
- 
- LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
- 
--LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) @LIBTDB_STATIC@
-+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0)
- 
- LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
- LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
-@@ -2101,7 +2100,7 @@
- #-------------------------------------------------------------------
- 
- # This is probably wrong for anything other than the GNU linker.
--bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_SHARED@
-+bin/libbigballofmud. at SHLIBEXT@: $(BINARY_PREREQS) $(LIBBIGBALLOFMUD_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking shared library $@
- 	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBBIGBALLOFMUD_OBJ) \
- 		$(LIBS) $(LIBTALLOC_LIBS) \
-@@ -2182,13 +2181,13 @@
- 	@echo "Linking $@"
- 	@$(SHLD_MODULE) $(RPC_ECHO_OBJ)
- 
--bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/winbindd at EXEEXT@: $(BINARY_PREREQS) $(WINBINDD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
- 	@$(CC) $(FLAGS) -o $@ $(WINBINDD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- 		$(PASSDB_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
- 	@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
-@@ -2201,7 +2200,7 @@
- 		$(WINBIND_NSS_EXTRA_LIBS) $(WINBIND_NSS_PTHREAD) \
- 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
- 
-- at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+ at WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo "Linking $@"
- 	@$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
- 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
-@@ -2212,7 +2211,7 @@
- 	@$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
- 		@SONAMEFLAG@`basename $@`
- 
--bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking shared library $@"
- 	@$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
- 		$(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) @SONAMEFLAG@`basename $@`
-@@ -2478,55 +2477,55 @@
- ## None here right now
- #########################################################
- 
--bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
- 
- bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
--	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(DYNEXP) $(NTLM_AUTH_OBJ) \
- 		$(PARAM_OBJ) $(LIB_NONSMBD_OBJ) $(LIBS) \
- 		$(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@
-+bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_TARGET@ @LIBWBCLIENT_SHARED@ @LIBTDB_TARGET@
- 	@echo "Linking shared library $@"
- 	@$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
- 		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
--bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
-+bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
- 
--bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
-+bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
- 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- 		torture/t_strcmp.o -L ./bin -lbigballofmud
- 
--bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
-+bin/t_strstr at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strstr.o
- 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- 		torture/t_strstr.o -L ./bin -lbigballofmud
- 
--bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_SHARED@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
-+bin/t_strappend at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strappend.o
- 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \
- 		torture/t_strappend.o -L ./bin -lbigballofmud
- 
-@@ -2538,7 +2537,7 @@
- 	@echo Linking $@
- 	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
- 
--bin/rpc_open_tcp at EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
-+bin/rpc_open_tcp at EXEEXT@: $(BINARY_PREREQS) $(RPC_OPEN_TCP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
- 	@$(CC) $(FLAGS) -o $@ $(RPC_OPEN_TCP_OBJ) $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) @LIBTDB_SHARED@ $(WINBIND_LIBS) \
-Index: samba-deb/source/m4/aclocal.m4
-===================================================================
---- samba-deb.orig/source/m4/aclocal.m4
-+++ samba-deb/source/m4/aclocal.m4
-@@ -68,7 +68,8 @@
- LIBUC[_STATIC_TARGET]=bin/LIBNAME.a
- LIBUC[_SHARED]=
- LIBUC[_STATIC]=
--LIBUC[_LIBS]=
-+LIBUC[_LIBS]=LIBLIBS
-+LIBUC[_TARGET]=
- [INSTALL_]LIBUC=
- [UNINSTALL_]LIBUC=
- 
-@@ -79,6 +80,7 @@
- AC_SUBST(LIBUC[_SHARED])
- AC_SUBST(LIBUC[_STATIC])
- AC_SUBST(LIBUC[_LIBS])
-+AC_SUBST(LIBUC[_TARGET])
- AC_SUBST([INSTALL_]LIBUC)
- AC_SUBST([UNINSTALL_]LIBUC)
- AC_SUBST(LIBUC[_SOVER])
-@@ -137,14 +139,16 @@
- 	[UNINSTALL_]LIBUC=[uninstall]LIBNAME
- 	if eval $BLDSHARED = true; then
- 		LIBUC[_SHARED]=$LIBUC[_SHARED_TARGET]
-+		LIBUC[_TARGET]=$LIBUC[_SHARED_TARGET]
- 		AC_MSG_RESULT(yes)
- 		if test x"$USESHARED" != x"true" -o x"$[LINK_]LIBUC" = "xSTATIC" ; then
- 			enable_static=yes
--		else
--			LIBUC[_LIBS]=LIBLIBS
-+			LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
-+			LIBUC[_LIBS]=$LIBUC[_STATIC_TARGET]
- 		fi
- 	else
- 		enable_static=yes
-+		LIBUC[_TARGET]=$LIBUC[_STATIC_TARGET]
- 		AC_MSG_RESULT(no shared library support -- will supply static library)
- 	fi
- else

Modified: trunk/samba/debian/patches/series
===================================================================
--- trunk/samba/debian/patches/series	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/series	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,21 +1,14 @@
 documentation.patch
 fhs-filespaths.patch
-fhs-filespaths-debatable.patch
-fhs-assignpaths.patch
 installswat.sh.patch
-non-linux-ports.patch
 pam-examples.patch
 README_nosmbldap-tools.patch
 smbclient-pager.patch
 undefined-symbols.patch
 VERSION.patch
 adapt_machine_creation_script.patch
-proper-static-lib-linking.patch 
-autoconf.patch
-smbpasswd-syslog.patch
 usershare.patch
-swat-de.patch
 smbtar-bashism.patch
 no-unnecessary-cups.patch
-shrink-dead-code.patch
 fix-manpages-warnings.patch
+codepages-location.patch

Deleted: trunk/samba/debian/patches/shrink-dead-code.patch
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/shrink-dead-code.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,470 +0,0 @@
-Comment by Michael Adam <obnox at samba.org>:
-
-While this patch is clever in one respect, it has bad side effects:
-Functions that not used are removed from the binaries.
-For functions that are only used in shared objects, this is very bad,
-since these will refuse to work (load).
-
-Example: librpc/gen_ndr/ndr_xattr.c:ndr_pull_xattr_NTACL() is only
-used in the acl_tdb and acl_xattr vfs modules.
-So the symbol is not present in smbd, and thus these modules will
-not work. The _do_ not work in the 3.3. packages that are out there.
-
-I recommend not using this patch!
-
-Better reduction is done by fixing the linking dependencies... :-(
-
-Michael
-
-Index: samba-3.3.4/source/Makefile.in
-===================================================================
---- samba-3.3.4.orig/source/Makefile.in	2009-05-02 14:33:23.654935629 +0200
-+++ samba-3.3.4/source/Makefile.in	2009-05-02 14:34:41.393926942 +0200
-@@ -1336,182 +1336,243 @@
- 
- bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(NMBD_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS)
-+	@rm -f $@.a
- 
- bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
-+	@$(AR) -rc $@.a $(SWAT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
- 	  $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
- 	  $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
-+	@$(AR) -rc $@.a $(RPCCLIENT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(PASSDB_LIBS) \
- 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(CLIENT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+	@$(AR) -rc $@.a $(NET_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
- 		$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
- 		@INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS)
-+	@rm -f $@.a
- 
- bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+	@$(AR) -rc $@.a $(PROFILES_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+	@$(AR) -rc $@.a $(CUPS_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/mount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
-+	@$(AR) -rc $@.a $(CIFS_MOUNT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
-+	@rm -f $@.a
- 
- bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
-+	@$(AR) -rc $@.a $(CIFS_UMOUNT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
-+	@rm -f $@.a
- 
- bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(CIFS_UPCALL_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
- 		$(LIBTDB_LIBS) $(NSCD_LIBS)
-+	@rm -f $@.a
- 
- bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(TESTPARM_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(STATUS_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
--		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(SMBCONTROL_OBJ)
-+	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(SMBTREE_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
-+	@$(AR) -rc $@.a $(SMBPASSWD_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(PASSDB_LIBS) \
- 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(PDBEDIT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
- 		$(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(SMBGET_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS)  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(NMBLOOKUP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
- 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(SMBTORTURE_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
- 		$(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(TALLOCTORT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(REPLACETORT_OBJ)
-+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $@.a $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
-+	@rm -f $@.a
- 
- bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(SMBCONFTORT_OBJ)
-+	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $@.a $(LDFLAGS) \
- 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(MASKTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(MSGTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(SMBCACLS_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(SMBCQUOTAS_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(EVTLOGADM_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(SHARESEC_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(LOCKTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(NSSTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS)  $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(PDBTEST_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
- 		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
-@@ -1523,72 +1584,96 @@
- 
- bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
-+	@$(AR) -rc $@.a $(SMBICONV_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(TERMLDFLAGS) \
- 		$(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(LOG2PCAP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
-+	@rm -f $@.a
- 
- bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(LOCKTEST2_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
-+	@$(AR) -rc $@.a $(NDRDUMP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
- 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(DEBUG2HTML_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS)
-+	@rm -f $@.a
- 
- bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
-+	@$(AR) -rc $@.a $(SMBFILTER_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBEDIT_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBSEARCH_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBADD_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBMODIFY_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBDEL_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
-+	@$(AR) -rc $@.a $(LDBRENAME_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
- 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- 
- #####################################################################
-@@ -2187,10 +2272,12 @@
- 
- bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
--	@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(VLP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
- 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
- 	@echo "Linking $@"
-@@ -2477,9 +2564,11 @@
- 
- bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
-+	@$(AR) -rc $@.a $(WBINFO_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) $(LIBS) \
- 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(WINBIND_LIBS)
-+	@rm -f $@.a
- 
- bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
- 	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
-@@ -2497,23 +2586,31 @@
- 
- bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(TDBBACKUP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(TDBTOOL_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(TDBDUMP_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
- 	@echo Linking $@
--	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
-+	@$(AR) -rc $@.a $(TDBTORTURE_OBJ)
-+	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
-+	@rm -f $@.a
- 
- bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
- 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \

Copied: trunk/samba/debian/patches/shrink-dead-code.patch (from rev 2936, branches/samba/experimental/debian/patches/shrink-dead-code.patch)
===================================================================
--- trunk/samba/debian/patches/shrink-dead-code.patch	                        (rev 0)
+++ trunk/samba/debian/patches/shrink-dead-code.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -0,0 +1,470 @@
+Comment by Michael Adam <obnox at samba.org>:
+
+While this patch is clever in one respect, it has bad side effects:
+Functions that not used are removed from the binaries.
+For functions that are only used in shared objects, this is very bad,
+since these will refuse to work (load).
+
+Example: librpc/gen_ndr/ndr_xattr.c:ndr_pull_xattr_NTACL() is only
+used in the acl_tdb and acl_xattr vfs modules.
+So the symbol is not present in smbd, and thus these modules will
+not work. The _do_ not work in the 3.3. packages that are out there.
+
+I recommend not using this patch!
+
+Better reduction is done by fixing the linking dependencies... :-(
+
+Michael
+
+Index: samba-3.3.4/source3/Makefile.in
+===================================================================
+--- samba-3.3.4.orig/source3/Makefile.in	2009-05-02 14:33:23.654935629 +0200
++++ samba-3.3.4/source3/Makefile.in	2009-05-02 14:34:41.393926942 +0200
+@@ -1336,182 +1336,243 @@
+ 
+ bin/nmbd at EXEEXT@: $(BINARY_PREREQS) $(NMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(NMBD_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(NMBD_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(POPT_LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS)
++	@rm -f $@.a
+ 
+ bin/swat at EXEEXT@: $(BINARY_PREREQS) $(SWAT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SWAT_OBJ) $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
++	@$(AR) -rc $@.a $(SWAT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(PRINT_LIBS) \
+ 	  $(AUTH_LIBS) $(LIBS) $(PASSDB_LIBS) $(POPT_LIBS) $(KRB5LIBS) \
+ 	  $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/rpcclient at EXEEXT@: $(BINARY_PREREQS) $(RPCCLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(PASSDB_LIBS) $(RPCCLIENT_OBJ) \
++	@$(AR) -rc $@.a $(RPCCLIENT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(PASSDB_LIBS) \
+ 		$(DYNEXP) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ 		$(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbclient at EXEEXT@: $(BINARY_PREREQS) $(CLIENT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(CLIENT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(DNSSD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/net at EXEEXT@: $(BINARY_PREREQS) $(NET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@ @LIBNETAPI_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(NET_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
++	@$(AR) -rc $@.a $(NET_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ 		$(POPT_LIBS) $(KRB5LIBS) $(UUID_LIBS) $(LDAP_LIBS) \
+ 		$(PASSDB_LIBS) $(TERMLDFLAGS) $(TERMLIBS) $(NSCD_LIBS) \
+ 		@INIPARSERLIBS@ $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBNETAPI_LIBS)
++	@rm -f $@.a
+ 
+ bin/profiles at EXEEXT@: $(BINARY_PREREQS) $(PROFILES_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(PROFILES_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
++	@$(AR) -rc $@.a $(PROFILES_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbspool at EXEEXT@: $(BINARY_PREREQS) $(CUPS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(CUPS_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
++	@$(AR) -rc $@.a $(CUPS_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/mount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_MOUNT_OBJ) @BUILD_POPT@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(CIFS_MOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
++	@$(AR) -rc $@.a $(CIFS_MOUNT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
++	@rm -f $@.a
+ 
+ bin/umount.cifs at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UMOUNT_OBJ) @BUILD_POPT@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
++	@$(AR) -rc $@.a $(CIFS_UMOUNT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
++	@rm -f $@.a
+ 
+ bin/cifs.upcall at EXEEXT@: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(CIFS_UPCALL_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
+ 		$(LIBTDB_LIBS) $(NSCD_LIBS)
++	@rm -f $@.a
+ 
+ bin/testparm at EXEEXT@: $(BINARY_PREREQS) $(TESTPARM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(TESTPARM_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(TESTPARM_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbstatus at EXEEXT@: $(BINARY_PREREQS) $(STATUS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(STATUS_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(STATUS_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbcontrol at EXEEXT@: $(BINARY_PREREQS) $(SMBCONTROL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ \
+-		$(SMBCONTROL_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(SMBCONTROL_OBJ)
++	@$(CC) -DUSING_SMBCONTROL $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(LDAP_LIBS) @LIBUNWIND_PTRACE@ $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbtree at EXEEXT@: $(BINARY_PREREQS) $(SMBTREE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBTREE_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(SMBTREE_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbpasswd at EXEEXT@: $(BINARY_PREREQS) $(SMBPASSWD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBPASSWD_OBJ) $(LDFLAGS) $(PASSDB_LIBS) \
++	@$(AR) -rc $@.a $(SMBPASSWD_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(PASSDB_LIBS) \
+ 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/pdbedit at EXEEXT@: $(BINARY_PREREQS) $(PDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(PDBEDIT_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(PDBEDIT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(POPT_LIBS) $(PASSDB_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) \
+ 		$(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbget at EXEEXT@: $(BINARY_PREREQS) $(SMBGET_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBGET_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(SMBGET_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(POPT_LIBS)  $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/nmblookup at EXEEXT@: $(BINARY_PREREQS) $(NMBLOOKUP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(NMBLOOKUP_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(NMBLOOKUP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) $(LIBS) \
+ 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbtorture at EXEEXT@: $(BINARY_PREREQS) $(SMBTORTURE_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBTORTURE_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(SMBTORTURE_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) \
+ 		$(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/talloctort at EXEEXT@: $(BINARY_PREREQS) $(TALLOCTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(TALLOCTORT_OBJ) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(TALLOCTORT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) \
+ 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/replacetort at EXEEXT@: $(REPLACETORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(REPLACETORT_OBJ) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(REPLACETORT_OBJ)
++	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $@.a $(LDFLAGS) \
+ 		$(DYNEXP) $(LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbconftort at EXEEXT@: $(SMBCONFTORT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $(SMBCONFTORT_OBJ) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(SMBCONFTORT_OBJ)
++	@$(CC) $(FLAGS) @PIE_LDFLAGS@ -o $@ $@.a $(LDFLAGS) \
+ 		$(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/masktest at EXEEXT@: $(BINARY_PREREQS) $(MASKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(MASKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(MASKTEST_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/msgtest at EXEEXT@: $(BINARY_PREREQS) $(MSGTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(MSGTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(MSGTEST_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbcacls at EXEEXT@: $(BINARY_PREREQS) $(SMBCACLS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBCACLS_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(SMBCACLS_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbcquotas at EXEEXT@: $(BINARY_PREREQS) $(SMBCQUOTAS_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBCQUOTAS_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(SMBCQUOTAS_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/eventlogadm at EXEEXT@: $(BINARY_PREREQS) $(EVTLOGADM_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(EVTLOGADM_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(EVTLOGADM_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/sharesec at EXEEXT@: $(BINARY_PREREQS) $(SHARESEC_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SHARESEC_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(SHARESEC_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/locktest at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LOCKTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(LOCKTEST_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/nsstest at EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(NSSTEST_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS)  $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/pdbtest at EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(PDBTEST_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) \
+ 		$(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/vfstest at EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+@@ -1523,72 +1584,96 @@
+ 
+ bin/smbiconv at EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \
++	@$(AR) -rc $@.a $(SMBICONV_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(TERMLDFLAGS) \
+ 		$(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/log2pcap at EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(LOG2PCAP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(POPT_LIBS) $(LIBS) $(LIBTALLOC_LIBS)
++	@rm -f $@.a
+ 
+ bin/locktest2 at EXEEXT@: $(BINARY_PREREQS) $(LOCKTEST2_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LOCKTEST2_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(LOCKTEST2_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/ndrdump at EXEEXT@: $(BINARY_PREREQS) $(NDRDUMP_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(NDRDUMP_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) \
++	@$(AR) -rc $@.a $(NDRDUMP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) $(LIBS) \
+ 		$(POPT_LIBS) $(LDAP_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/debug2html at EXEEXT@: $(BINARY_PREREQS) $(DEBUG2HTML_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(DEBUG2HTML_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(DEBUG2HTML_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(LIBS) $(LIBTALLOC_LIBS)
++	@rm -f $@.a
+ 
+ bin/smbfilter at EXEEXT@: $(BINARY_PREREQS) $(SMBFILTER_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(SMBFILTER_OBJ) $(LDFLAGS) $(LIBS) \
++	@$(AR) -rc $@.a $(SMBFILTER_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(POPT_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbedit: $(BINARY_PREREQS) $(LDBEDIT_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBEDIT_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBEDIT_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbsearch: $(BINARY_PREREQS) $(LDBSEARCH_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBSEARCH_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBSEARCH_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbadd: $(BINARY_PREREQS) $(LDBADD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBADD_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBADD_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbmodify: $(BINARY_PREREQS) $(LDBMODIFY_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBMODIFY_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBMODIFY_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbdel: $(BINARY_PREREQS) $(LDBDEL_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBDEL_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBDEL_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ldbrename: $(BINARY_PREREQS) $(LDBRENAME_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDBRENAME_OBJ) $(DYNEXP) $(LDFLAGS) \
++	@$(AR) -rc $@.a $(LDBRENAME_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(DYNEXP) $(LDFLAGS) \
+ 		$(LIBS) $(POPT_LIBS) $(LDAP_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ 
+ #####################################################################
+@@ -2187,10 +2272,12 @@
+ 
+ bin/vlp at EXEEXT@: $(BINARY_PREREQS) $(VLP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo "Linking $@"
+-	@$(CC) $(FLAGS) -o $@ $(VLP_OBJ) $(LDFLAGS) $(DYNEXP) \
++	@$(AR) -rc $@.a $(VLP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $@.a $(LDFLAGS) $(DYNEXP) \
+ 		$(TERMLDFLAGS) $(TERMLIBS) $(LIBS) $(POPT_LIBS) \
+ 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ @WINBIND_NSS@: $(BINARY_PREREQS) $(WINBIND_NSS_OBJ)
+ 	@echo "Linking $@"
+@@ -2477,9 +2564,11 @@
+ 
+ bin/wbinfo at EXEEXT@: $(BINARY_PREREQS) $(WBINFO_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(WBINFO_OBJ) $(DYNEXP) $(LIBS) \
++	@$(AR) -rc $@.a $(WBINFO_OBJ)
++	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) $(LIBS) \
+ 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
+ 		$(WINBIND_LIBS)
++	@rm -f $@.a
+ 
+ bin/ntlm_auth at EXEEXT@: $(BINARY_PREREQS) $(NTLM_AUTH_OBJ) $(PARAM_OBJ) \
+ 	$(LIB_NONSMBD_OBJ) @BUILD_POPT@ @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_SHARED@
+@@ -2497,23 +2586,31 @@
+ 
+ bin/tdbbackup at EXEEXT@: $(BINARY_PREREQS) $(TDBBACKUP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBBACKUP_OBJ) $(DYNEXP) \
++	@$(AR) -rc $@.a $(TDBBACKUP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
+ 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/tdbtool at EXEEXT@: $(BINARY_PREREQS) $(TDBTOOL_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTOOL_OBJ) $(DYNEXP) \
++	@$(AR) -rc $@.a $(TDBTOOL_OBJ)
++	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
+ 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/tdbdump at EXEEXT@: $(BINARY_PREREQS) $(TDBDUMP_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBDUMP_OBJ) $(DYNEXP) \
++	@$(AR) -rc $@.a $(TDBDUMP_OBJ)
++	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
+ 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/tdbtorture at EXEEXT@: $(BINARY_PREREQS) $(TDBTORTURE_OBJ) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@
+ 	@echo Linking $@
+-	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $(TDBTORTURE_OBJ) $(DYNEXP) \
++	@$(AR) -rc $@.a $(TDBTORTURE_OBJ)
++	@$(CC) $(FLAGS) -o $@ $(LDFLAGS) $@.a $(DYNEXP) \
+ 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS)
++	@rm -f $@.a
+ 
+ bin/t_strcmp at EXEEXT@: $(BINARY_PREREQS) @LIBTALLOC_TARGET@ bin/libbigballofmud. at SHLIBEXT@ torture/t_strcmp.o
+ 	$(CC) $(FLAGS) -o $@ $(DYNEXP) $(LIBS) $(LIBTALLOC_LIBS) \

Modified: trunk/samba/debian/patches/smbclient-pager.patch
===================================================================
--- trunk/samba/debian/patches/smbclient-pager.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/smbclient-pager.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -8,10 +8,10 @@
 
 Note: 
 
-Index: samba-3.3.0rc2/source/include/local.h
+Index: samba-3.3.0rc2/source3/include/local.h
 ===================================================================
---- samba-3.3.0rc2.orig/source/include/local.h
-+++ samba-3.3.0rc2/source/include/local.h
+--- samba-3.3.0rc2.orig/source3/include/local.h
++++ samba-3.3.0rc2/source3/include/local.h
 @@ -109,7 +109,7 @@
  /* the default pager to use for the client "more" command. Users can
     override this with the PAGER environment variable */

Deleted: trunk/samba/debian/patches/smbpasswd-syslog.patch
===================================================================
--- trunk/samba/debian/patches/smbpasswd-syslog.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/smbpasswd-syslog.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,589 +0,0 @@
-Goal: Don't call openlog() or closelog() from pam_smbpass
-
-Fixes: bug #434372
-
-Upstream status: submitted as bugzilla bug #4831
-
-Index: samba-3.3.0rc2/source/pam_smbpass/support.c
-===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/support.c
-+++ samba-3.3.0rc2/source/pam_smbpass/support.c
-@@ -14,6 +14,7 @@
-  * this program; if not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
- #include "includes.h"
- #include "general.h"
- 
-@@ -62,17 +63,42 @@
- char *_pam_delete(register char *);
- 
- /* syslogging function for errors and other information */
--
--void _log_err( int err, const char *format, ... )
-+#ifdef HAVE_PAM_VSYSLOG
-+void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
- {
--    va_list args;
-+	va_list args;
-+  
-+	va_start(args, format);
-+	pam_vsyslog(pamh, err, format, args);
-+	va_end(args);
-+}
-+#else
-+void _log_err( pam_handle_t *pamh, int err, const char *format, ... )
-+{
-+	va_list args;
-+	const char tag[] = "(pam_smbpass) ";
-+	char *mod_format;
-+
-+	mod_format = SMB_MALLOC_ARRAY(char, sizeof(tag) + strlen(format));
-+	/* try really, really hard to log something, since this may have
-+	   been a message about a malloc() failure... */
-+	if (mod_format == NULL) {
-+		va_start(args, format);
-+		vsyslog(err | LOG_AUTH, format, args);
-+		va_end(args);
-+		return;
-+  	}
-+  
-+	strncpy(mod_format, tag, strlen(tag)+1);
-+	strncat(mod_format, format, strlen(format));
-+
-+	va_start(args, format);
-+	vsyslog(err | LOG_AUTH, mod_format, args);
-+	va_end(args);
- 
--    va_start( args, format );
--    openlog( "PAM_smbpass", LOG_CONS | LOG_PID, LOG_AUTH );
--    vsyslog( err, format, args );
--    va_end( args );
--    closelog();
-+	free(mod_format);
- }
-+#endif
- 
- /* this is a front-end for module-application conversations */
- 
-@@ -90,11 +116,11 @@
- 							,response, conv->appdata_ptr);
- 
- 		if (retval != PAM_SUCCESS && on(SMB_DEBUG, ctrl)) {
--			_log_err(LOG_DEBUG, "conversation failure [%s]"
-+			_log_err(pamh, LOG_DEBUG, "conversation failure [%s]"
- 					 ,pam_strerror(pamh, retval));
- 		}
- 	} else {
--		_log_err(LOG_ERR, "couldn't obtain coversation function [%s]"
-+		_log_err(pamh, LOG_ERR, "couldn't obtain coversation function [%s]"
- 				 ,pam_strerror(pamh, retval));
- 	}
- 
-@@ -121,7 +147,7 @@
- 
- /* set the control flags for the SMB module. */
- 
--int set_ctrl( int flags, int argc, const char **argv )
-+int set_ctrl( pam_handle_t *pamh, int flags, int argc, const char **argv )
- {
-     int i = 0;
-     const char *service_file = NULL;
-@@ -163,7 +189,7 @@
-     /* Read some options from the Samba config. Can be overridden by
-        the PAM config. */
-     if(lp_load(service_file,True,False,False,True) == False) {
--	_log_err( LOG_ERR, "Error loading service file %s", service_file );
-+	_log_err(pamh, LOG_ERR, "Error loading service file %s", service_file);
-     }
- 
-     secrets_init();
-@@ -186,7 +212,7 @@
-         }
- 
-         if (j >= SMB_CTRLS_) {
--            _log_err( LOG_ERR, "unrecognized option [%s]", *argv );
-+            _log_err(pamh, LOG_ERR, "unrecognized option [%s]", *argv);
-         } else {
-             ctrl &= smb_args[j].mask;	/* for turning things off */
-             ctrl |= smb_args[j].flag;	/* for turning things on  */
-@@ -225,7 +251,7 @@
-  * evidence of old token around for later stack analysis.
-  *
-  */
--char * smbpXstrDup( const char *x )
-+char * smbpXstrDup( pam_handle_t *pamh, const char *x )
- {
-     register char *newstr = NULL;
- 
-@@ -235,7 +261,7 @@
-         for (i = 0; x[i]; ++i); /* length of string */
-         if ((newstr = SMB_MALLOC_ARRAY(char, ++i)) == NULL) {
-             i = 0;
--            _log_err( LOG_CRIT, "out of memory in smbpXstrDup" );
-+            _log_err(pamh, LOG_CRIT, "out of memory in smbpXstrDup");
-         } else {
-             while (i-- > 0) {
-                 newstr[i] = x[i];
-@@ -277,7 +303,7 @@
-             /* log the number of authentication failures */
-             if (failure->count != 0) {
-                 pam_get_item( pamh, PAM_SERVICE, (const void **) &service );
--                _log_err( LOG_NOTICE
-+                _log_err(pamh, LOG_NOTICE
-                           , "%d authentication %s "
-                             "from %s for service %s as %s(%d)"
-                           , failure->count
-@@ -286,7 +312,7 @@
-                           , service == NULL ? "**unknown**" : service 
-                           , failure->user, failure->id );
-                 if (failure->count > SMB_MAX_RETRIES) {
--                    _log_err( LOG_ALERT
-+                    _log_err(pamh, LOG_ALERT
-                               , "service(%s) ignoring max retries; %d > %d"
-                               , service == NULL ? "**unknown**" : service
-                               , failure->count
-@@ -322,8 +348,7 @@
- 
-     if (!pdb_get_nt_passwd(sampass))
-     {
--        _log_err( LOG_DEBUG, "user %s has null SMB password"
--                  , name );
-+        _log_err(pamh, LOG_DEBUG, "user %s has null SMB password", name);
- 
-         if (off( SMB__NONULL, ctrl )
-             && (pdb_get_acct_ctrl(sampass) & ACB_PWNOTREQ))
-@@ -333,7 +358,7 @@
-             const char *service;
- 
-             pam_get_item( pamh, PAM_SERVICE, (const void **)&service );
--            _log_err( LOG_NOTICE, "failed auth request by %s for service %s as %s",
-+            _log_err(pamh, LOG_NOTICE, "failed auth request by %s for service %s as %s",
-                       uidtoname(getuid()), service ? service : "**unknown**", name);
-             return PAM_AUTH_ERR;
-         }
-@@ -341,7 +366,7 @@
- 
-     data_name = SMB_MALLOC_ARRAY(char, sizeof(FAIL_PREFIX) + strlen( name ));
-     if (data_name == NULL) {
--        _log_err( LOG_CRIT, "no memory for data-name" );
-+        _log_err(pamh, LOG_CRIT, "no memory for data-name" );
-         return PAM_AUTH_ERR;
-     }
-     strncpy( data_name, FAIL_PREFIX, sizeof(FAIL_PREFIX) );
-@@ -388,31 +413,31 @@
-                         retval = PAM_MAXTRIES;
-                     }
-                 } else {
--                    _log_err(LOG_NOTICE,
-+                    _log_err(pamh, LOG_NOTICE,
-                       "failed auth request by %s for service %s as %s",
-                       uidtoname(getuid()),
-                       service ? service : "**unknown**", name);
-                     newauth->count = 1;
-                 }
- 		if (!sid_to_uid(pdb_get_user_sid(sampass), &(newauth->id))) {
--                    _log_err(LOG_NOTICE,
-+                    _log_err(pamh, LOG_NOTICE,
-                       "failed auth request by %s for service %s as %s",
-                       uidtoname(getuid()),
-                       service ? service : "**unknown**", name);
- 		}		
--                newauth->user = smbpXstrDup( name );
--                newauth->agent = smbpXstrDup( uidtoname( getuid() ) );
-+                newauth->user = smbpXstrDup( pamh, name );
-+                newauth->agent = smbpXstrDup( pamh, uidtoname( getuid() ) );
-                 pam_set_data( pamh, data_name, newauth, _cleanup_failures );
- 
-             } else {
--                _log_err( LOG_CRIT, "no memory for failure recorder" );
--                _log_err(LOG_NOTICE,
-+                _log_err(pamh, LOG_CRIT, "no memory for failure recorder" );
-+                _log_err(pamh, LOG_NOTICE,
-                       "failed auth request by %s for service %s as %s(%d)",
-                       uidtoname(getuid()),
-                       service ? service : "**unknown**", name);
-             }
-         }
--        _log_err(LOG_NOTICE,
-+        _log_err(pamh, LOG_NOTICE,
-                   "failed auth request by %s for service %s as %s(%d)",
-                   uidtoname(getuid()),
-                   service ? service : "**unknown**", name);
-@@ -488,8 +513,8 @@
-         retval = pam_get_item( pamh, authtok_flag, (const void **) &item );
-         if (retval != PAM_SUCCESS) {
-             /* very strange. */
--            _log_err( LOG_ALERT
--                      , "pam_get_item returned error to smb_read_password" );
-+            _log_err(pamh, LOG_ALERT,
-+                     "pam_get_item returned error to smb_read_password");
-             return retval;
-         } else if (item != NULL) {	/* we have a password! */
-             *pass = item;
-@@ -541,7 +566,7 @@
- 
-         if (retval == PAM_SUCCESS) {	/* a good conversation */
- 
--            token = smbpXstrDup(resp[j++].resp);
-+            token = smbpXstrDup(pamh, resp[j++].resp);
-             if (token != NULL) {
-                 if (expect == 2) {
-                     /* verify that password entered correctly */
-@@ -553,7 +578,8 @@
-                     }
-                 }
-             } else {
--                _log_err(LOG_NOTICE, "could not recover authentication token");
-+                _log_err(pamh, LOG_NOTICE,
-+		         "could not recover authentication token");
-             }
-         }
- 
-@@ -566,7 +592,7 @@
- 
-     if (retval != PAM_SUCCESS) {
-         if (on( SMB_DEBUG, ctrl ))
--            _log_err( LOG_DEBUG, "unable to obtain a password" );
-+            _log_err(pamh, LOG_DEBUG, "unable to obtain a password");
-         return retval;
-     }
-     /* 'token' is the entered password */
-@@ -581,7 +607,7 @@
-             || (retval = pam_get_item( pamh, authtok_flag
-                             ,(const void **)&item )) != PAM_SUCCESS)
-         {
--            _log_err( LOG_CRIT, "error manipulating password" );
-+            _log_err(pamh, LOG_CRIT, "error manipulating password");
-             return retval;
-         }
-     } else {
-@@ -595,8 +621,8 @@
-             || (retval = pam_get_data( pamh, data_name, (const void **)&item ))
-                              != PAM_SUCCESS)
-         {
--            _log_err( LOG_CRIT, "error manipulating password data [%s]"
--                      , pam_strerror( pamh, retval ));
-+            _log_err(pamh, LOG_CRIT, "error manipulating password data [%s]",
-+                     pam_strerror( pamh, retval ));
-             _pam_delete( token );
-             item = NULL;
-             return retval;
-@@ -620,8 +646,8 @@
-     if (pass_new == NULL || (pass_old && !strcmp( pass_old, pass_new )))
-     {
- 	if (on(SMB_DEBUG, ctrl)) {
--	    _log_err( LOG_DEBUG,
--	              "passwd: bad authentication token (null or unchanged)" );
-+	    _log_err(pamh, LOG_DEBUG,
-+	             "passwd: bad authentication token (null or unchanged)");
- 	}
- 	make_remark( pamh, ctrl, PAM_ERROR_MSG, pass_new == NULL ?
- 				"No password supplied" : "Password unchanged" );
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
-===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_auth.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_auth.c
-@@ -81,10 +81,9 @@
- 
- 	/* Samba initialization. */
- 	load_case_tables();
--	setup_logging("pam_smbpass",False);
-         lp_set_in_client(True);
- 
--	ctrl = set_ctrl(flags, argc, argv);
-+	ctrl = set_ctrl(pamh, flags, argc, argv);
- 
- 	/* Get a few bytes so we can pass our return value to
- 		pam_sm_setcred(). */
-@@ -99,29 +98,29 @@
- 	retval = pam_get_user( pamh, &name, "Username: " );
- 	if ( retval != PAM_SUCCESS ) {
- 		if (on( SMB_DEBUG, ctrl )) {
--			_log_err(LOG_DEBUG, "auth: could not identify user");
-+			_log_err(pamh, LOG_DEBUG, "auth: could not identify user");
- 		}
- 		AUTH_RETURN;
- 	}
- 	if (on( SMB_DEBUG, ctrl )) {
--		_log_err( LOG_DEBUG, "username [%s] obtained", name );
-+		_log_err(pamh, LOG_DEBUG, "username [%s] obtained", name );
- 	}
- 
- 	if (geteuid() != 0) {
--		_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- 		retval = PAM_AUTHINFO_UNAVAIL;
- 		AUTH_RETURN;
- 	}
- 
- 	if (!initialize_password_db(True, NULL)) {
--		_log_err( LOG_ALERT, "Cannot access samba password database" );
-+		_log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
- 		retval = PAM_AUTHINFO_UNAVAIL;
- 		AUTH_RETURN;
- 	}
- 
- 	sampass = samu_new( NULL );
-     	if (!sampass) {
--		_log_err( LOG_ALERT, "Cannot talloc a samu struct" );
-+		_log_err(pamh, LOG_ALERT, "Cannot talloc a samu struct" );
- 		retval = nt_status_to_pam(NT_STATUS_NO_MEMORY);
- 		AUTH_RETURN;
- 	}
-@@ -135,7 +134,7 @@
- 	}
- 
- 	if (!found) {
--		_log_err(LOG_ALERT, "Failed to find entry for user %s.", name);
-+		_log_err(pamh, LOG_ALERT, "Failed to find entry for user %s.", name);
- 		retval = PAM_USER_UNKNOWN;
- 		TALLOC_FREE(sampass);
- 		sampass = NULL;
-@@ -154,7 +153,7 @@
- 
- 	retval = _smb_read_password(pamh, ctrl, NULL, "Password: ", NULL, _SMB_AUTHTOK, &p);
- 	if (retval != PAM_SUCCESS ) {
--		_log_err(LOG_CRIT, "auth: no password provided for [%s]", name);
-+		_log_err(pamh,LOG_CRIT, "auth: no password provided for [%s]", name);
- 		TALLOC_FREE(sampass);
- 		AUTH_RETURN;
- 	}
-@@ -202,7 +201,7 @@
- 	retval = pam_get_item( pamh, PAM_AUTHTOK, (const void **) &pass );
- 
- 	if (retval != PAM_SUCCESS) {
--		_log_err( LOG_ALERT
-+		_log_err(pamh, LOG_ALERT
- 			, "pam_get_item returned error to pam_sm_authenticate" );
- 		return PAM_AUTHTOK_RECOVER_ERR;
- 	} else if (pass == NULL) {
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
-===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_acct.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_acct.c
-@@ -58,26 +58,25 @@
- 
- 	/* Samba initialization. */
- 	load_case_tables();
--	setup_logging( "pam_smbpass", False );
-         lp_set_in_client(True);
- 
--	ctrl = set_ctrl( flags, argc, argv );
-+	ctrl = set_ctrl(pamh, flags, argc, argv );
- 
- 	/* get the username */
- 
- 	retval = pam_get_user( pamh, &name, "Username: " );
- 	if (retval != PAM_SUCCESS) {
- 		if (on( SMB_DEBUG, ctrl )) {
--			_log_err( LOG_DEBUG, "acct: could not identify user" );
-+			_log_err(pamh, LOG_DEBUG, "acct: could not identify user" );
- 		}
- 		return retval;
- 	}
- 	if (on( SMB_DEBUG, ctrl )) {
--		_log_err( LOG_DEBUG, "acct: username [%s] obtained", name );
-+		_log_err(pamh, LOG_DEBUG, "acct: username [%s] obtained", name );
- 	}
- 
- 	if (geteuid() != 0) {
--		_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+		_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- 		return PAM_AUTHINFO_UNAVAIL;
- 	}
- 
-@@ -85,7 +84,7 @@
- 		from a SIGPIPE it's not expecting */
- 	oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
- 	if (!initialize_password_db(True, NULL)) {
--		_log_err( LOG_ALERT, "Cannot access samba password database" );
-+	  _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
- 		CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
- 		return PAM_AUTHINFO_UNAVAIL;
- 	}
-@@ -99,7 +98,7 @@
- 	}
- 
- 	if (!pdb_getsampwnam(sampass, name )) {
--		_log_err( LOG_DEBUG, "acct: could not identify user" );
-+		_log_err(pamh, LOG_DEBUG, "acct: could not identify user");
-         	CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-         	return PAM_USER_UNKNOWN;
- 	}
-@@ -112,8 +111,8 @@
- 
- 	if (pdb_get_acct_ctrl(sampass) & ACB_DISABLED) {
- 		if (on( SMB_DEBUG, ctrl )) {
--			_log_err( LOG_DEBUG
--				, "acct: account %s is administratively disabled", name );
-+			_log_err(pamh, LOG_DEBUG,
-+				 "acct: account %s is administratively disabled", name);
- 		}
- 		make_remark( pamh, ctrl, PAM_ERROR_MSG
- 			, "Your account has been disabled; "
-Index: samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
-===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/pam_smb_passwd.c
-+++ samba-3.3.0rc2/source/pam_smbpass/pam_smb_passwd.c
-@@ -106,10 +106,9 @@
- 
-     /* Samba initialization. */
-     load_case_tables();
--    setup_logging( "pam_smbpass", False );
-     lp_set_in_client(True);
- 
--    ctrl = set_ctrl(flags, argc, argv);
-+    ctrl = set_ctrl(pamh, flags, argc, argv);
- 
-     /*
-      * First get the name of a user.  No need to do anything if we can't
-@@ -119,16 +118,16 @@
-     retval = pam_get_user( pamh, &user, "Username: " );
-     if (retval != PAM_SUCCESS) {
-         if (on( SMB_DEBUG, ctrl )) {
--            _log_err( LOG_DEBUG, "password: could not identify user" );
-+            _log_err(pamh, LOG_DEBUG, "password: could not identify user");
-         }
-         return retval;
-     }
-     if (on( SMB_DEBUG, ctrl )) {
--        _log_err( LOG_DEBUG, "username [%s] obtained", user );
-+        _log_err(pamh, LOG_DEBUG, "username [%s] obtained", user);
-     }
- 
-     if (geteuid() != 0) {
--	_log_err( LOG_DEBUG, "Cannot access samba password database, not running as root.");
-+	_log_err(pamh, LOG_DEBUG, "Cannot access samba password database, not running as root.");
- 	return PAM_AUTHINFO_UNAVAIL;
-     }
- 
-@@ -137,7 +136,7 @@
-     oldsig_handler = CatchSignal(SIGPIPE, SIGNAL_CAST SIG_IGN);
- 
-     if (!initialize_password_db(False, NULL)) {
--        _log_err( LOG_ALERT, "Cannot access samba password database" );
-+      _log_err(pamh, LOG_ALERT, "Cannot access samba password database" );
-         CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-         return PAM_AUTHINFO_UNAVAIL;
-     }
-@@ -149,12 +148,12 @@
-     }
- 
-     if (!pdb_getsampwnam(sampass,user)) {
--        _log_err( LOG_ALERT, "Failed to find entry for user %s.", user );
-+        _log_err(pamh, LOG_ALERT, "Failed to find entry for user %s.", user);
-         CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-         return PAM_USER_UNKNOWN;
-     }
-     if (on( SMB_DEBUG, ctrl )) {
--        _log_err( LOG_DEBUG, "Located account for %s", user );
-+        _log_err(pamh, LOG_DEBUG, "Located account for %s", user);
-     }
- 
-     if (flags & PAM_PRELIM_CHECK) {
-@@ -180,7 +179,7 @@
- #define greeting "Changing password for "
-             Announce = SMB_MALLOC_ARRAY(char, sizeof(greeting)+strlen(user));
-             if (Announce == NULL) {
--                _log_err(LOG_CRIT, "password: out of memory");
-+                _log_err(pamh, LOG_CRIT, "password: out of memory");
-                 TALLOC_FREE(sampass);
-                 CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-                 return PAM_BUF_ERR;
-@@ -195,8 +194,8 @@
-             SAFE_FREE( Announce );
- 
-             if (retval != PAM_SUCCESS) {
--                _log_err( LOG_NOTICE
--                          , "password - (old) token not obtained" );
-+                _log_err(pamh, LOG_NOTICE,
-+                         "password - (old) token not obtained");
-                 TALLOC_FREE(sampass);
-                 CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-                 return retval;
-@@ -241,7 +240,7 @@
-         }
- 
-         if (retval != PAM_SUCCESS) {
--            _log_err( LOG_NOTICE, "password: user not authenticated" );
-+            _log_err(pamh, LOG_NOTICE, "password: user not authenticated");
-             TALLOC_FREE(sampass);
-             CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-             return retval;
-@@ -266,8 +265,8 @@
- 
-         if (retval != PAM_SUCCESS) {
-             if (on( SMB_DEBUG, ctrl )) {
--                _log_err( LOG_ALERT
--                          , "password: new password not obtained" );
-+                _log_err(pamh, LOG_ALERT,
-+                         "password: new password not obtained");
-             }
-             pass_old = NULL;                               /* tidy up */
-             TALLOC_FREE(sampass);
-@@ -288,7 +287,7 @@
-         retval = _pam_smb_approve_pass(pamh, ctrl, pass_old, pass_new);
- 
-         if (retval != PAM_SUCCESS) {
--            _log_err(LOG_NOTICE, "new password not acceptable");
-+            _log_err(pamh, LOG_NOTICE, "new password not acceptable");
-             pass_new = pass_old = NULL;               /* tidy up */
-             TALLOC_FREE(sampass);
-             CatchSignal(SIGPIPE, SIGNAL_CAST oldsig_handler);
-@@ -308,16 +307,17 @@
- 	    
-             /* password updated */
- 		if (!sid_to_uid(pdb_get_user_sid(sampass), &uid)) {
--			_log_err( LOG_NOTICE, "Unable to get uid for user %s",
-+			_log_err(pamh, LOG_NOTICE,
-+			         "Unable to get uid for user %s",
- 				pdb_get_username(sampass));
--			_log_err( LOG_NOTICE, "password for (%s) changed by (%s/%d)",
-+			_log_err(pamh, LOG_NOTICE, "password for (%s) changed by (%s/%d)",
- 				user, uidtoname(getuid()), getuid());
- 		} else {
--			_log_err( LOG_NOTICE, "password for (%s/%d) changed by (%s/%d)",
-+			_log_err(pamh, LOG_NOTICE, "password for (%s/%d) changed by (%s/%d)",
- 				user, uid, uidtoname(getuid()), getuid());
- 		}
- 	} else {
--		_log_err( LOG_ERR, "password change failed for user %s", user);
-+		_log_err(pamh, LOG_ERR, "password change failed for user %s", user);
- 	}
- 
-         pass_old = pass_new = NULL;
-@@ -328,7 +328,7 @@
- 
-     } else {            /* something has broken with the library */
- 
--        _log_err( LOG_ALERT, "password received unknown request" );
-+        _log_err(pamh, LOG_ALERT, "password received unknown request");
-         retval = PAM_ABORT;
- 
-     }
-Index: samba-3.3.0rc2/source/pam_smbpass/support.h
-===================================================================
---- samba-3.3.0rc2.orig/source/pam_smbpass/support.h
-+++ samba-3.3.0rc2/source/pam_smbpass/support.h
-@@ -1,8 +1,8 @@
- /* syslogging function for errors and other information */
--extern void _log_err(int, const char *, ...);
-+extern void _log_err(pam_handle_t *, int, const char *, ...);
- 
- /* set the control flags for the UNIX module. */
--extern int set_ctrl(int, int, const char **);
-+extern int set_ctrl(pam_handle_t *, int, int, const char **);
- 
- /* generic function for freeing pam data segments */
- extern void _cleanup(pam_handle_t *, void *, int);
-@@ -12,7 +12,7 @@
-  * evidence of old token around for later stack analysis.
-  */
- 
--extern char *smbpXstrDup(const char *);
-+extern char *smbpXstrDup(pam_handle_t *,const char *);
- 
- /* ************************************************************** *
-  * Useful non-trivial functions                                   *

Modified: trunk/samba/debian/patches/smbtar-bashism.patch
===================================================================
--- trunk/samba/debian/patches/smbtar-bashism.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/smbtar-bashism.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -8,10 +8,10 @@
 
 Note:
 
-Index: samba-3.3.0rc2/source/script/smbtar
+Index: samba-3.3.0rc2/source3/script/smbtar
 ===================================================================
---- samba-3.3.0rc2.orig/source/script/smbtar
-+++ samba-3.3.0rc2/source/script/smbtar
+--- samba-3.3.0rc2.orig/source3/script/smbtar
++++ samba-3.3.0rc2/source3/script/smbtar
 @@ -151,7 +151,7 @@
  if [ -z "$verbose" ]; then
        echo "server    is $server"

Deleted: trunk/samba/debian/patches/swat-de.patch
===================================================================
--- trunk/samba/debian/patches/swat-de.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/swat-de.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,834 +0,0 @@
-Goal: Localize SWAT in German entirely
-
-Fixes: bug #487681
-
-Upstream status: Forwarded in upstream #4755 that also contains
-                 a full translation round
-
-Index: samba-3.3.0rc2/source/po/de.msg
-===================================================================
---- samba-3.3.0rc2.orig/source/po/de.msg
-+++ samba-3.3.0rc2/source/po/de.msg
-@@ -1,5 +1,6 @@
- # German messages for international release of SWAT.
- # Copyright (C) 2001 Andreas Moroder
-+# Copyright (C) 2007 Helge Kreutzmann, <debian at helgefjell.de>
- #
- #   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
-@@ -16,577 +17,600 @@
- #
- msgid ""
- msgstr ""
--"Project-Id-Version: i18n_swat\n"
--"POT-Creation-Date: 2003-10-06 05:30+0900\n"
--"PO-Revision-Date: 2000-02-08 14:45+0100\n"
--"Last-Translator: Andreas Moroder\n"
--"Language-Team: (Samba Team) <samba-technical at samba.org>\n"
-+"Project-Id-Version: swat\n"
-+"Report-Msgid-Bugs-To: \n"
-+"POT-Creation-Date: 2007-06-04 18:15+0200\n"
-+"PO-Revision-Date: 2007-06-10 11:52+0200\n"
-+"Last-Translator: Helge Kreutzmann <debian at helgefjell.de>\n"
-+"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
- "MIME-Version: 1.0\n"
- "Content-Type: text/plain; charset=utf-8\n"
- "Content-Transfer-Encoding: 8bit\n"
- 
--#: ../web/swat.c:117
-+#: ../web/swat.c:139
- #, c-format
- msgid "ERROR: Can't open %s"
--msgstr "ERROR: Kann %s nicht öffnen"
-+msgstr "FEHLER: Kann %s nicht öffnen"
- 
--#: ../web/swat.c:200
-+#: ../web/swat.c:223
- msgid "Help"
- msgstr "Hilfe"
- 
--#: ../web/swat.c:206 ../web/swat.c:220 ../web/swat.c:235 ../web/swat.c:243 ../web/swat.c:252 ../web/swat.c:261 ../web/swat.c:267 ../web/swat.c:273 ../web/swat.c:286
-+#: ../web/swat.c:229 ../web/swat.c:254 ../web/swat.c:275 ../web/swat.c:285
-+#: ../web/swat.c:294 ../web/swat.c:303 ../web/swat.c:309 ../web/swat.c:315
-+#: ../web/swat.c:328
- msgid "Set Default"
--msgstr "Standardwert"
-+msgstr "Standardwert setzen"
- 
--#: ../web/swat.c:408
-+#: ../web/swat.c:450
- #, c-format
- msgid "failed to open %s for writing"
--msgstr "konnte %s nicht schreiben"
-+msgstr "konnte %s nicht zum Schreiben öffnen"
- 
--#: ../web/swat.c:431
-+#: ../web/swat.c:473
- #, c-format
- msgid "Can't reload %s"
--msgstr ""
-+msgstr "Kann %s nicht erneut laden"
- 
--#: ../web/swat.c:501
-+#: ../web/swat.c:543
- #, c-format
- msgid "Logged in as <b>%s</b>"
- msgstr "Verbunden als <b>%s</b>"
- 
--#: ../web/swat.c:505
-+#: ../web/swat.c:547
- msgid "Home"
- msgstr "Home"
- 
--#: ../web/swat.c:507
-+#: ../web/swat.c:549
- msgid "Globals"
- msgstr "Globals"
- 
--#: ../web/swat.c:508
-+#: ../web/swat.c:550
- msgid "Shares"
- msgstr "Freigaben"
- 
--#: ../web/swat.c:509
-+#: ../web/swat.c:551
- msgid "Printers"
- msgstr "Drucker"
- 
--#: ../web/swat.c:510
-+#: ../web/swat.c:552
- msgid "Wizard"
- msgstr "Assistent"
- 
--#: ../web/swat.c:513
-+#: ../web/swat.c:556
- msgid "Status"
- msgstr "Status"
- 
--#: ../web/swat.c:514
-+#: ../web/swat.c:557
- msgid "View Config"
- msgstr "Zeige Konfiguration"
- 
--#: ../web/swat.c:516
-+#: ../web/swat.c:559
- msgid "Password Management"
- msgstr "Passwortverwaltung"
- 
--#: ../web/swat.c:526
-+#: ../web/swat.c:569
- msgid "Current View Is"
--msgstr "Aktuelle Konfiguration"
-+msgstr "Aktuelle Ansicht lautet"
- 
--#: ../web/swat.c:527 ../web/swat.c:530
-+#: ../web/swat.c:570 ../web/swat.c:573
- msgid "Basic"
- msgstr "Einfache Ansicht"
- 
--#: ../web/swat.c:528 ../web/swat.c:531
-+#: ../web/swat.c:571 ../web/swat.c:574
- msgid "Advanced"
- msgstr "Erweiterte Ansicht"
- 
--#: ../web/swat.c:529
-+#: ../web/swat.c:572
- msgid "Change View To"
--msgstr "Ansicht anpassen"
-+msgstr "Ansicht ändern in"
- 
--#: ../web/swat.c:554
-+#: ../web/swat.c:601
- msgid "Current Config"
- msgstr "Aktuelle Konfiguration"
- 
--#: ../web/swat.c:558
-+#: ../web/swat.c:605
- msgid "Normal View"
- msgstr "Normale Ansicht"
- 
--#: ../web/swat.c:560
-+#: ../web/swat.c:607
- msgid "Full View"
- msgstr "Komplette Ansicht"
- 
- #. Here we first set and commit all the parameters that were selected
- #. in the previous screen.
--#: ../web/swat.c:579
-+#: ../web/swat.c:626
- msgid "Wizard Parameter Edit Page"
--msgstr ""
-+msgstr "Bearbeitungsseite der Assistenten-Parameter"
- 
--#: ../web/swat.c:608
-+#: ../web/swat.c:655
- msgid "Note: smb.conf file has been read and rewritten"
- msgstr "Hinweis: smb.conf wurde gelesen und überschrieben"
- 
- #. Here we go ...
--#: ../web/swat.c:716
-+#: ../web/swat.c:763
- msgid "Samba Configuration Wizard"
--msgstr "Samba Konfigurations-Assistent"
-+msgstr "Samba-Konfigurationsassistent"
- 
--#: ../web/swat.c:720
--msgid "The \"Rewrite smb.conf file\" button will clear the smb.conf file of all default values and of comments."
--msgstr "Der Button \"Passe smb.conf an\" wird alle Kommentare und Standardwerte aus der smb.conf löschen."
-+#: ../web/swat.c:767
-+msgid ""
-+"The \"Rewrite smb.conf file\" button will clear the smb.conf file of all "
-+"default values and of comments."
-+msgstr ""
-+"Der Knopf »Schreibe smb.conf neu« wird alle Kommentare und Standardwerte "
-+"aus der smb.conf löschen."
- 
--#: ../web/swat.c:721
-+#: ../web/swat.c:768
- msgid "The same will happen if you press the commit button."
--msgstr "Das gleiche passiert bei \"übernehmen\"."
-+msgstr "Das gleiche passiert beim Knopf »übernehmen«."
- 
--#: ../web/swat.c:724
-+#: ../web/swat.c:771
- msgid "Rewrite smb.conf file"
- msgstr "Schreibe smb.conf neu"
- 
--#: ../web/swat.c:725
-+#: ../web/swat.c:772
- msgid "Commit"
--msgstr "übernehmen"
-+msgstr "Übernehmen"
- 
--#: ../web/swat.c:726
-+#: ../web/swat.c:773
- msgid "Edit Parameter Values"
--msgstr "Bearbeite Parameter"
-+msgstr "Bearbeite Parameterwerte"
- 
--#: ../web/swat.c:732
-+#: ../web/swat.c:779
- msgid "Server Type"
- msgstr "Server-Typ"
- 
--#: ../web/swat.c:733
-+#: ../web/swat.c:780
- msgid "Stand Alone"
- msgstr "Einzelserver"
- 
--#: ../web/swat.c:734
-+#: ../web/swat.c:781
- msgid "Domain Member"
--msgstr "Domänen-Mitglied"
-+msgstr "Domänenmitglied"
- 
--#: ../web/swat.c:735
-+#: ../web/swat.c:782
- msgid "Domain Controller"
--msgstr "Domänen-Controller"
-+msgstr "Domänencontroller"
- 
--#: ../web/swat.c:738
-+#: ../web/swat.c:785
- msgid "Unusual Type in smb.conf - Please Select New Mode"
- msgstr ""
-+"Ungewöhnlicher Typ in der smb.conf - Bitte wählen Sie einen neuen Modus"
- 
--#: ../web/swat.c:740
-+#: ../web/swat.c:787
- msgid "Configure WINS As"
--msgstr "Konfiguriere WINS"
-+msgstr "Konfiguriere WINS als"
- 
--#: ../web/swat.c:741
-+#: ../web/swat.c:788
- msgid "Not Used"
--msgstr "nicht benutzt"
-+msgstr "Nicht benutzt"
- 
--#: ../web/swat.c:742
-+#: ../web/swat.c:789
- msgid "Server for client use"
--msgstr "WINS-Server"
-+msgstr "Server für Client-Verwendung"
- 
--#: ../web/swat.c:743
-+#: ../web/swat.c:790
- msgid "Client of another WINS server"
--msgstr "WINS-Client an anderem Server"
-+msgstr "Client eines anderen WINS-Servers"
- 
--#: ../web/swat.c:745
-+#: ../web/swat.c:792
- msgid "Remote WINS Server"
--msgstr "Zuständiger WINS-Server:"
-+msgstr "Entfernter WINS-Server:"
- 
--#: ../web/swat.c:756
-+#: ../web/swat.c:803
- msgid "Error: WINS Server Mode and WINS Support both set in smb.conf"
--msgstr "Fehler: WINS-Server und WINS-Client zugleich in smb.conf gesetzt"
-+msgstr ""
-+"Fehler: Sowohl WINS-Server-Modus als auch WINS-Unterstützung in smb.conf "
-+"aktiviert"
- 
--#: ../web/swat.c:757
-+#: ../web/swat.c:804
- msgid "Please Select desired WINS mode above."
--msgstr "Bitte wählen Sie den WINS-Modus."
-+msgstr "Bitte wählen Sie den gewünschten WINS-Modus oben aus."
- 
--#: ../web/swat.c:759
-+#: ../web/swat.c:806
- msgid "Expose Home Directories"
- msgstr "Home-Verzeichnisse freigeben"
- 
--#: ../web/swat.c:774
--msgid "The above configuration options will set multiple parameters and will generally assist with rapid Samba deployment."
--msgstr "Diese Konfigurationsoptionen bearbeiten mehrere Parameter und dienen als Hilfe zur schnellen Samba-Einrichtung."
-+#: ../web/swat.c:821
-+msgid ""
-+"The above configuration options will set multiple parameters and will "
-+"generally assist with rapid Samba deployment."
-+msgstr ""
-+"Die obigen Konfigurationsoptionen bearbeiten mehrere Parameter und dienen als "
-+"Hilfe zur schnellen Samba-Einrichtung."
- 
--#: ../web/swat.c:787
-+#: ../web/swat.c:834
- msgid "Global Parameters"
- msgstr "Globale Parameter"
- 
--#: ../web/swat.c:815 ../web/swat.c:916 ../web/swat.c:1265
-+#: ../web/swat.c:862 ../web/swat.c:966 ../web/swat.c:1318
- msgid "Commit Changes"
- msgstr "Änderungen speichern"
- 
--#: ../web/swat.c:819 ../web/swat.c:919 ../web/swat.c:1267
-+#: ../web/swat.c:866 ../web/swat.c:969 ../web/swat.c:1320
- msgid "Reset Values"
- msgstr "Werte zurücksetzen"
- 
--#: ../web/swat.c:844
-+#: ../web/swat.c:891
- msgid "Share Parameters"
- msgstr "Parameter der Freigabe"
- 
--#: ../web/swat.c:887
-+#: ../web/swat.c:934
- msgid "Choose Share"
- msgstr "Wähle Freigabe"
- 
--#: ../web/swat.c:901
-+#: ../web/swat.c:951
- msgid "Delete Share"
- msgstr "Lösche Freigabe"
- 
--#: ../web/swat.c:908
-+#: ../web/swat.c:958
- msgid "Create Share"
- msgstr "Erstelle Freigabe"
- 
--#: ../web/swat.c:944
-+#: ../web/swat.c:994
- msgid "password change in demo mode rejected"
--msgstr "Änderung des Passworts im Demo modus nicht aktiv"
-+msgstr "Änderung des Passworts im Demo-Modus nicht möglich"
- 
--#: ../web/swat.c:957
-+#: ../web/swat.c:1007
- msgid "Can't setup password database vectors."
--msgstr ""
-+msgstr "Kann Passwort-Datenbankvektoren nicht einrichten"
- 
--#: ../web/swat.c:983
-+#: ../web/swat.c:1033
- msgid " Must specify \"User Name\" "
--msgstr " \"Benutzername\" muss angegeben werden "
-+msgstr " »Benutzername« muss angegeben werden "
- 
--#: ../web/swat.c:999
-+#: ../web/swat.c:1049
- msgid " Must specify \"Old Password\" "
--msgstr " \"Altes Passwort\" muss angegeben werden "
-+msgstr " »Altes Passwort« muss angegeben werden "
- 
--#: ../web/swat.c:1005
-+#: ../web/swat.c:1055
- msgid " Must specify \"Remote Machine\" "
--msgstr " \"Remote-Server\" muss angegeben werden "
-+msgstr " »Entfernter Server« muss angegeben werden "
- 
--#: ../web/swat.c:1012
-+#: ../web/swat.c:1062
- msgid " Must specify \"New, and Re-typed Passwords\" "
--msgstr " \"Neues/wiederholtes Passwort\" müssen angegeben werden "
-+msgstr " »Neues/wiederholtes Passwort« muss angegeben werden "
- 
--#: ../web/swat.c:1018
-+#: ../web/swat.c:1068
- msgid " Re-typed password didn't match new password "
- msgstr " Das wiederholte Passwort stimmt nicht mit dem neuen Passwort überein"
- 
--#: ../web/swat.c:1048
-+#: ../web/swat.c:1101
- #, c-format
- msgid " The passwd for '%s' has been changed."
- msgstr " Das Passwort für '%s' wurde geändert."
- 
--#: ../web/swat.c:1051
-+#: ../web/swat.c:1104
- #, c-format
- msgid " The passwd for '%s' has NOT been changed."
- msgstr " Das Passwort für '%s' wurde NICHT geändert."
- 
--#: ../web/swat.c:1076
-+#: ../web/swat.c:1129
- msgid "Server Password Management"
--msgstr "Verwaltung des Server Passwortes"
-+msgstr "Verwaltung des Server-Passwortes"
- 
- #.
- #. * Create all the dialog boxes for data collection
- #.
--#: ../web/swat.c:1085 ../web/swat.c:1132
-+#: ../web/swat.c:1138 ../web/swat.c:1185
- msgid "User Name"
- msgstr "Benutzername"
- 
--#: ../web/swat.c:1088 ../web/swat.c:1134
-+#: ../web/swat.c:1141 ../web/swat.c:1187
- msgid "Old Password"
- msgstr "Altes Passwort"
- 
--#: ../web/swat.c:1091 ../web/swat.c:1136
-+#: ../web/swat.c:1144 ../web/swat.c:1189
- msgid "New Password"
- msgstr "Neues Passwort"
- 
--#: ../web/swat.c:1093 ../web/swat.c:1138
-+#: ../web/swat.c:1146 ../web/swat.c:1191
- msgid "Re-type New Password"
- msgstr "Wiederhole neues Passwort"
- 
--#: ../web/swat.c:1101 ../web/swat.c:1149
-+#: ../web/swat.c:1154 ../web/swat.c:1202
- msgid "Change Password"
- msgstr "Ändere Passwort"
- 
--#: ../web/swat.c:1104
-+#: ../web/swat.c:1157
- msgid "Add New User"
--msgstr "Füge Benutzer hinzu"
-+msgstr "Füge neuen Benutzer hinzu"
- 
--#: ../web/swat.c:1106
-+#: ../web/swat.c:1159
- msgid "Delete User"
- msgstr "Lösche Benutzer"
- 
--#: ../web/swat.c:1108
-+#: ../web/swat.c:1161
- msgid "Disable User"
- msgstr "Deaktiviere Benutzer"
- 
--#: ../web/swat.c:1110
-+#: ../web/swat.c:1163
- msgid "Enable User"
- msgstr "Aktiviere Benutzer"
- 
--#: ../web/swat.c:1123
-+#: ../web/swat.c:1176
- msgid "Client/Server Password Management"
--msgstr "Client/Server Passwort Verwaltung"
-+msgstr "Client/Server Passwort-Verwaltung"
- 
--#: ../web/swat.c:1140
-+#: ../web/swat.c:1193
- msgid "Remote Machine"
--msgstr "Remote-Server"
-+msgstr "Entfernte Maschine"
- 
--#: ../web/swat.c:1179
-+#: ../web/swat.c:1232
- msgid "Printer Parameters"
--msgstr "Drucker Parameter"
-+msgstr "Drucker-Parameter"
- 
--#: ../web/swat.c:1181
-+#: ../web/swat.c:1234
- msgid "Important Note:"
- msgstr "Wichtiger Hinweis:"
- 
--#: ../web/swat.c:1182
-+#: ../web/swat.c:1235
-+#, c-format
- msgid "Printer names marked with [*] in the Choose Printer drop-down box "
--msgstr "Mit [*] gekennzeichnete Drucker in der Druckerauswahlliste"
-+msgstr "Mit [*] gekennzeichnete Drucker in der »Wähle Drucker«-Auswahlliste "
- 
--#: ../web/swat.c:1183
-+#: ../web/swat.c:1236
-+#, c-format
- msgid "are autoloaded printers from "
--msgstr "wurden automatisch geladen von :"
-+msgstr "sind automatisch geladene Drucker aus "
- 
--#: ../web/swat.c:1184
-+#: ../web/swat.c:1237
- msgid "Printcap Name"
--msgstr "Printcap Name"
-+msgstr "Printcap-Name"
- 
--#: ../web/swat.c:1185
-+#: ../web/swat.c:1238
- msgid "Attempting to delete these printers from SWAT will have no effect."
--msgstr "Der Versuch diese Drucker von SWAT aus zu löschen wird keine Auswirkung haben."
-+msgstr ""
-+"Der Versuch, diese Drucker von SWAT aus zu löschen, wird keine Auswirkung "
-+"haben."
- 
--#: ../web/swat.c:1231
-+#: ../web/swat.c:1284
- msgid "Choose Printer"
- msgstr "Wähle Drucker"
- 
--#: ../web/swat.c:1250
-+#: ../web/swat.c:1303
- msgid "Delete Printer"
- msgstr "Lösche Drucker"
- 
--#: ../web/swat.c:1257
-+#: ../web/swat.c:1310
- msgid "Create Printer"
--msgstr "Ersteller Drucker"
-+msgstr "Erstelle Drucker"
- 
--#: ../web/statuspage.c:123
--msgid "RDONLY     "
--msgstr ""
-+#: ../web/statuspage.c:139
-+msgid "RDWR       "
-+msgstr "LESE/SCHREIBE "
- 
--#: ../web/statuspage.c:124
-+#: ../web/statuspage.c:141
- msgid "WRONLY     "
--msgstr ""
-+msgstr "NUR SCHREIBE  "
- 
--#: ../web/statuspage.c:125
--msgid "RDWR       "
--msgstr ""
-+#: ../web/statuspage.c:143
-+msgid "RDONLY     "
-+msgstr "NUR LESE      "
- 
--#: ../web/statuspage.c:309
-+#: ../web/statuspage.c:330
- msgid "Server Status"
- msgstr "Server-Status"
- 
--#: ../web/statuspage.c:314
-+#: ../web/statuspage.c:335
- msgid "Auto Refresh"
- msgstr "Automatische Aktualisierung"
- 
--#: ../web/statuspage.c:315 ../web/statuspage.c:320
-+#: ../web/statuspage.c:336 ../web/statuspage.c:341
- msgid "Refresh Interval: "
- msgstr "Aktualisierungsintervall: "
- 
--#: ../web/statuspage.c:319
-+#: ../web/statuspage.c:340
- msgid "Stop Refreshing"
- msgstr "Stoppe Aktualisierung"
- 
--#: ../web/statuspage.c:334
-+#: ../web/statuspage.c:355
- msgid "version:"
- msgstr "Version:"
- 
--#: ../web/statuspage.c:337
-+#: ../web/statuspage.c:358
- msgid "smbd:"
--msgstr ""
-+msgstr "smbd:"
- 
--#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
- msgid "running"
- msgstr "aktiv"
- 
--#: ../web/statuspage.c:337 ../web/statuspage.c:350 ../web/statuspage.c:364
-+#: ../web/statuspage.c:358 ../web/statuspage.c:371 ../web/statuspage.c:385
- msgid "not running"
- msgstr "inaktiv"
- 
--#: ../web/statuspage.c:341
-+#: ../web/statuspage.c:362
- msgid "Stop smbd"
- msgstr "Stoppe smbd"
- 
--#: ../web/statuspage.c:343
-+#: ../web/statuspage.c:364
- msgid "Start smbd"
- msgstr "Starte smbd"
- 
--#: ../web/statuspage.c:345
-+#: ../web/statuspage.c:366
- msgid "Restart smbd"
--msgstr "Neustart smbd"
-+msgstr "Starte smbd neu"
- 
--#: ../web/statuspage.c:350
-+#: ../web/statuspage.c:371
- msgid "nmbd:"
--msgstr ""
-+msgstr "nmbd:"
- 
--#: ../web/statuspage.c:354
-+#: ../web/statuspage.c:375
- msgid "Stop nmbd"
- msgstr "Stoppe nmbd"
- 
--#: ../web/statuspage.c:356
-+#: ../web/statuspage.c:377
- msgid "Start nmbd"
- msgstr "Starte nmbd"
- 
--#: ../web/statuspage.c:358
-+#: ../web/statuspage.c:379
- msgid "Restart nmbd"
--msgstr "Neustart nmbd"
-+msgstr "Starte nmbd neu"
- 
--#: ../web/statuspage.c:364
-+#: ../web/statuspage.c:385
- msgid "winbindd:"
--msgstr ""
-+msgstr "winbindd:"
- 
--#: ../web/statuspage.c:368
-+#: ../web/statuspage.c:389
- msgid "Stop winbindd"
- msgstr "Stoppe winbindd"
- 
--#: ../web/statuspage.c:370
-+#: ../web/statuspage.c:391
- msgid "Start winbindd"
- msgstr "Starte winbindd"
- 
--#: ../web/statuspage.c:372
-+#: ../web/statuspage.c:393
- msgid "Restart winbindd"
--msgstr "Neustart winbindd"
-+msgstr "Starte winbindd neu"
- 
- #. stop, restart all
--#: ../web/statuspage.c:381
-+#: ../web/statuspage.c:402
- msgid "Stop All"
- msgstr "Alle Stoppen"
- 
--#: ../web/statuspage.c:382
-+#: ../web/statuspage.c:403
- msgid "Restart All"
- msgstr "Alle neu starten"
- 
- #. start all
--#: ../web/statuspage.c:386
-+#: ../web/statuspage.c:407
- msgid "Start All"
--msgstr "Alle Starten"
-+msgstr "Alle starten"
- 
--#: ../web/statuspage.c:393
-+#: ../web/statuspage.c:414
- msgid "Active Connections"
- msgstr "Aktive Verbindungen"
- 
--#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
- msgid "PID"
--msgstr ""
-+msgstr "PID"
- 
--#: ../web/statuspage.c:395 ../web/statuspage.c:408
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429
- msgid "Client"
--msgstr ""
-+msgstr "Client"
- 
--#: ../web/statuspage.c:395
-+#: ../web/statuspage.c:416
- msgid "IP address"
- msgstr "IP-Adresse"
- 
--#: ../web/statuspage.c:395 ../web/statuspage.c:408 ../web/statuspage.c:416
-+#: ../web/statuspage.c:416 ../web/statuspage.c:429 ../web/statuspage.c:437
- msgid "Date"
- msgstr "Datum"
- 
--#: ../web/statuspage.c:397
-+#: ../web/statuspage.c:418
- msgid "Kill"
--msgstr "Killen"
-+msgstr "Töten"
- 
--#: ../web/statuspage.c:405
-+#: ../web/statuspage.c:426
- msgid "Active Shares"
- msgstr "Aktive Freigaben"
- 
--#: ../web/statuspage.c:408
-+#: ../web/statuspage.c:429
- msgid "Share"
- msgstr "Freigabe"
- 
--#: ../web/statuspage.c:408
-+#: ../web/statuspage.c:429
- msgid "User"
- msgstr "Benutzer"
- 
--#: ../web/statuspage.c:408
-+#: ../web/statuspage.c:429
- msgid "Group"
- msgstr "Gruppe"
- 
--#: ../web/statuspage.c:414
-+#: ../web/statuspage.c:435
- msgid "Open Files"
- msgstr "Offene Dateien"
- 
--#: ../web/statuspage.c:416
-+#: ../web/statuspage.c:437
- msgid "Sharing"
--msgstr ""
-+msgstr "Freigeben"
- 
--#: ../web/statuspage.c:416
-+#: ../web/statuspage.c:437
- msgid "R/W"
--msgstr ""
-+msgstr "Lese/Schreibe"
- 
--#: ../web/statuspage.c:416
-+#: ../web/statuspage.c:437
- msgid "Oplock"
--msgstr ""
-+msgstr "Opportunistische Sperre (Lock)"
- 
--#: ../web/statuspage.c:416
-+#: ../web/statuspage.c:437
- msgid "File"
- msgstr "Datei"
- 
--#: ../web/statuspage.c:425
-+#: ../web/statuspage.c:446
- msgid "Show Client in col 1"
--msgstr ""
-+msgstr "Zeige Client in Spalte 1"
- 
--#: ../web/statuspage.c:426
-+#: ../web/statuspage.c:447
- msgid "Show PID in col 1"
--msgstr ""
-+msgstr "Zeige PID in Spalte 1"
- 
--#: ../param/loadparm.c:755
-+#: ../param/loadparm.c:836
- msgid "Base Options"
- msgstr "Basisoptionen"
- 
--#: ../param/loadparm.c:775
-+#: ../param/loadparm.c:855
- msgid "Security Options"
- msgstr "Sicherheitsoptionen"
- 
--#: ../param/loadparm.c:859
-+#: ../param/loadparm.c:945
- msgid "Logging Options"
--msgstr "Log Optionen"
-+msgstr "Protokollier-Optionen"
- 
--#: ../param/loadparm.c:874
-+#: ../param/loadparm.c:962
- msgid "Protocol Options"
--msgstr "Protokoll Optionen"
-+msgstr "Protokoll-Optionen"
- 
--#: ../param/loadparm.c:911
-+#: ../param/loadparm.c:1008
- msgid "Tuning Options"
- msgstr "Optimierungsoptionen"
- 
--#: ../param/loadparm.c:940
-+#: ../param/loadparm.c:1037
- msgid "Printing Options"
- msgstr "Druckoptionen"
- 
--#: ../param/loadparm.c:970
-+#: ../param/loadparm.c:1075
- msgid "Filename Handling"
--msgstr "Verwaltung Dateinamen"
-+msgstr "Dateinamen-Verwaltung"
- 
--#: ../param/loadparm.c:996
-+#: ../param/loadparm.c:1105
- msgid "Domain Options"
--msgstr "Domänen Optionen"
-+msgstr "Domänen-Optionen"
- 
--#: ../param/loadparm.c:1000
-+#: ../param/loadparm.c:1109
- msgid "Logon Options"
--msgstr "Login optionen"
-+msgstr "Anmelde-Optionen"
- 
--#: ../param/loadparm.c:1019
-+#: ../param/loadparm.c:1130
- msgid "Browse Options"
--msgstr "Browsing Optionen"
-+msgstr "Browsing-Optionen"
- 
--#: ../param/loadparm.c:1033
-+#: ../param/loadparm.c:1144
- msgid "WINS Options"
--msgstr "WINS Optionen"
-+msgstr "WINS-Optionen"
- 
--#: ../param/loadparm.c:1043
-+#: ../param/loadparm.c:1153
- msgid "Locking Options"
--msgstr "Locking Optionen"
-+msgstr "Locking-(Sperr-)Optionen"
- 
--#: ../param/loadparm.c:1061
-+#: ../param/loadparm.c:1170
- msgid "Ldap Options"
--msgstr "LDAP Optionen"
-+msgstr "LDAP-Optionen"
- 
--#: ../param/loadparm.c:1078
-+#: ../param/loadparm.c:1186
- msgid "Miscellaneous Options"
--msgstr "Verschiedene Optionen"
-+msgstr "Sonstige Optionen"
-+
-+#: ../param/loadparm.c:1191
-+#| msgid "Logon Options"
-+msgid "EventLog Options"
-+msgstr "EventLog-Optionen"
- 
--#: ../param/loadparm.c:1138
-+#: ../param/loadparm.c:1258
- msgid "VFS module options"
--msgstr "VFS Optionen"
-+msgstr "VFS-Modul-Optionen"
- 
--#: ../param/loadparm.c:1148
-+#: ../param/loadparm.c:1268
- msgid "Winbind options"
--msgstr "Winbind Optionen"
-+msgstr "Winbind-Optionen"

Modified: trunk/samba/debian/patches/undefined-symbols.patch
===================================================================
--- trunk/samba/debian/patches/undefined-symbols.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/undefined-symbols.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,283 +1,24 @@
-Goal:	Add -Wl,-z,defs to the link options for shared libraries, to prevent
-	future instances of undefined symbols
+Goal:  Fix missing symbols in libsmbclient (and libnss_wins), and add
+       -Wl,-z,defs to the libsmbclient link options to prevent future
+       instances of undefined symbols
 
 Fixes: #281181
 
-Status wrt upstream: forwarded in <20090516224019.GA7314 at dario.dodds.net>
+Status wrt upstream: Not forwarded. Should be once there is a configure test 
+for it.
 
 Note: 
 
-Index: samba-deb/source/Makefile.in
+Index: samba-3.4.0~pre1/source3/Makefile.in
 ===================================================================
---- samba-deb.orig/source/Makefile.in
-+++ samba-deb/source/Makefile.in
-@@ -27,7 +27,7 @@
- ## Dynamic shared libraries build settings
- DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
- DSO_EXPORTS=@DSO_EXPORTS@
--SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
-+SHLD_LIBS = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
+--- samba-3.4.0~pre1.orig/source3/Makefile.in	2009-05-09 20:36:33.735433063 +0200
++++ samba-3.4.0~pre1/source3/Makefile.in	2009-05-16 09:46:02.135574618 +0200
+@@ -2122,7 +2122,7 @@
  
- # The MODULE_EXPORTS variable contains the platform-specific linker flags
- # needed to restrict the exports for VFS, IDMAP, RPC and PASSDB modules.
-@@ -43,6 +43,7 @@
- EXEEXT=@EXEEXT@
- AR=@AR@
- LDSHFLAGS=@LDSHFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
-+LDDSOFLAGS=@LDDSOFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
- LDFLAGS=@PIE_LDFLAGS@ @RELRO_LDFLAGS@ @LDFLAGS@
- 
- WINBIND_NSS_LDSHFLAGS=@WINBIND_NSS_LDSHFLAGS@ @LDFLAGS@
-@@ -1230,6 +1231,7 @@
- 	@echo "      LDFLAGS    = $(LDFLAGS)"
- 	@echo "      DYNEXP     = $(DYNEXP)"
- 	@echo "      LDSHFLAGS  = $(LDSHFLAGS)"
-+	@echo "      LDDSOFLAGS = $(LDDSOFLAGS)"
- 	@echo "      SHLIBEXT   = @SHLIBEXT@"
- 	@echo "      SONAMEFLAG = @SONAMEFLAG@"
- 
-@@ -1625,7 +1627,7 @@
- 
- $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+ $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
  	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
-+	@$(SHLD_LIBS) $(LIBTALLOC_OBJ) @SONAMEFLAG@`basename $@`
- 
- $(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
- 	@rm -f $@
-@@ -1690,7 +1692,7 @@
- 
- $(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
- 	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBTDB_OBJ) \
-+	@$(SHLD_LIBS) $(LIBTDB_OBJ) \
- 		@SONAMEFLAG@`basename $@`
- 
- $(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
-@@ -1765,7 +1767,7 @@
- 
- $(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) @LIBTALLOC_SHARED@
- 	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
-+	@$(SHLD_LIBS) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
- 		@SONAMEFLAG@`basename $@`
- 
- $(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
-@@ -1825,7 +1827,7 @@
- 
- $(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) @LIBTALLOC_SHARED@
- 	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
-+	@$(SHLD_LIBS) $(LIBADDNS_OBJ) $(LIBS) \
- 		$(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \
- 		@SONAMEFLAG@`basename $@`
- 
-@@ -1910,7 +1912,7 @@
- 
- $(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
- 	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
-+	@$(SHLD_LIBS) $(LIBNETAPI_OBJ) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
- 		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
- 		@SONAMEFLAG@`basename $@`
-@@ -1975,7 +1977,7 @@
- 
- $(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@ @LIBWBCLIENT_SHARED@
- 	@echo Linking shared library $@
 -	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
-+	@$(SHLD_LIBS) $(LIBSMBCLIENT_OBJ) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
++	@$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
+ 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
  		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
  		@SONAMEFLAG@`basename $@`
-@@ -2047,7 +2049,7 @@
- 
- $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ) $(LIBSMBSHAREMODES_SYMS) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
- 	@echo Linking shared library $@
--	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
-+	@$(SHLD_LIBS) $(LIBSMBSHAREMODES_OBJ) \
- 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		$(KRB5LIBS) $(LDAP_LIBS) \
- 		@SONAMEFLAG@`basename $@`
-@@ -2121,7 +2123,7 @@
- #####################################################################
- 
- # Linker command to link a RPC, VFS, AUTH, CHARSET or PASSDB module.
--SHLD_MODULE = $(SHLD) $(LDSHFLAGS) $(MODULE_EXPORTS) \
-+SHLD_MODULE = $(SHLD) $(LDDSOFLAGS) $(MODULE_EXPORTS) \
- 	      -o $@ @SONAMEFLAG@`basename $@`
- 
- bin/librpc_lsarpc. at SHLIBEXT@: $(BINARY_PREREQS) $(RPC_LSA_OBJ)
-@@ -2201,18 +2203,18 @@
- 
- @WINBIND_WINS_NSS@: $(BINARY_PREREQS) $(WINBIND_WINS_NSS_OBJ) @LIBTALLOC_SHARED@ @LIBTDB_SHARED@
- 	@echo "Linking $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
-+	@$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_WINS_NSS_OBJ) \
- 		$(LDAP_LIBS) $(KRB5LIBS) $(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
- 		@SONAMEFLAG@`basename $@`@NSSSONAMEVERSIONSUFFIX@
- 
- bin/winbind_krb5_locator. at SHLIBEXT@: $(BINARY_PREREQS) $(WINBIND_KRB5_LOCATOR_OBJ) @LIBWBCLIENT_SHARED@
- 	@echo "Linking $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
-+	@$(SHLD) $(LDDSOFLAGS) -o $@ $(WINBIND_KRB5_LOCATOR_OBJ) $(WINBIND_LIBS) \
- 		@SONAMEFLAG@`basename $@`
- 
- bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@
- 	@echo "Linking shared library $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
-+	@$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ \
- 		$(PAM_WINBIND_EXTRA_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) @SONAMEFLAG@`basename $@`
- 
- bin/builtin. at SHLIBEXT@: $(BINARY_PREREQS) $(AUTH_BUILTIN_OBJ)
-@@ -2492,7 +2494,7 @@
- 
- bin/pam_smbpass. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_SMBPASS_OBJ) @LIBTALLOC_SHARED@ @LIBWBCLIENT_SHARED@ @LIBTDB_SHARED@
- 	@echo "Linking shared library $@"
--	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
-+	@$(SHLD) $(LDDSOFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(DYNEXP) \
- 		$(LIBS) $(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
- 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
- 
-Index: samba-deb/source/configure.in
-===================================================================
---- samba-deb.orig/source/configure.in
-+++ samba-deb/source/configure.in
-@@ -65,6 +65,7 @@
- AC_SUBST(SAMBA_CPPFLAGS)
- AC_SUBST(SHELL)
- AC_SUBST(LDSHFLAGS)
-+AC_SUBST(LDDSOFLAGS)
- AC_SUBST(SONAMEFLAG)
- AC_SUBST(SHLD)
- AC_SUBST(MODULE_EXPORTS)
-@@ -1768,6 +1769,7 @@
- # these are the defaults, good for lots of systems
- HOST_OS="$host_os"
- LDSHFLAGS="-shared"
-+LDDSOFLAGS="-shared"
- MODULE_EXPORTS=""
- SONAMEFLAG="#"
- SHLD="\${CC} \${CFLAGS}"
-@@ -1789,9 +1791,11 @@
- 			esac
- 			BLDSHARED="true"
- 			if test "${ac_cv_gnu_ld_no_default_allow_shlib_undefined}" = "yes"; then
--				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
--			else
-+				LDDSOFLAGS="-shared -Wl,-Bsymbolic -Wl,--allow-shlib-undefined"
- 				LDSHFLAGS="-shared -Wl,-Bsymbolic"
-+			else
-+				LDDSOFLAGS="-shared -Wl,-Bsymbolic"
-+				LDSHFLAGS="-shared -Wl,-Bsymbolic -Wl,-z,defs"
- 			fi
- 			DYNEXP="-Wl,--export-dynamic"
- 			PICFLAG="-fPIC"
-@@ -1801,6 +1805,7 @@
- 		*solaris*) AC_DEFINE(SUNOS5,1,[Whether the host os is solaris])
- 			BLDSHARED="true"
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-h "
- 			if test "${GCC}" = "yes"; then
- 				PICFLAG="-fPIC"
-@@ -1813,6 +1818,7 @@
- 				## ${CFLAGS} added for building 64-bit shared
- 				## libs using Sun's Compiler
- 				LDSHFLAGS="-G \${CFLAGS}"
-+				LDDSOFLAGS="$LDSHFLAGS"
- 			fi
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512,[The size of a block])
- 			AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
-@@ -1820,6 +1826,7 @@
- 		*sunos*) AC_DEFINE(SUNOS4,1,[Whether the host os is sunos4])
- 			BLDSHARED="true"
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-Wl,-h,"
- 			PICFLAG="-KPIC"   # Is this correct for SunOS
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-@@ -1827,7 +1834,6 @@
- 			;;
- 		*netbsd* | *freebsd* | *dragonfly* )
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			DYNEXP="-Wl,--export-dynamic"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC -DPIC"
-@@ -1835,7 +1841,6 @@
- 			AC_DEFINE(BROKEN_GETGRNAM,1,[Does getgrnam work correctly])
- 			;;
- 		*openbsd*)  BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			DYNEXP="-Wl,-Bdynamic"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC"
-@@ -1849,6 +1854,7 @@
- 			esac
- 			BLDSHARED="true"
- 			LDSHFLAGS="-set_version sgi1.0 -shared"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			SONAMEFLAG="-soname "
- 			SHLD="\${LD}"
- 			if test "${GCC}" = "yes"; then
-@@ -1863,6 +1869,7 @@
- 			# use expfull to export underscored symbols
- 			# add rtl to remove /lib/crt0.o warning
- 			LDSHFLAGS="-Wl,-G,-bexpfull,-bbigtoc,-brtl"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			DYNEXP="-Wl,-brtl,-bexpfull,-bbigtoc"
- 			PICFLAG="-O2"
- 			# as AIX code is always position independent...
-@@ -1881,6 +1888,7 @@
- 				BLDSHARED="true"
- 				SHLD="cc"
- 				LDSHFLAGS="-b -Wl,-B,symbolic,-b,-z"
-+				LDDSOFLAGS="$LDSHFLAGS"
- 				SONAMEFLAG="-Wl,+h "
- 				PICFLAG="+z"
- 			if test "${GCC}" = "yes"; then
-@@ -1904,7 +1912,6 @@
- 			;;
- 		*osf*) AC_DEFINE(OSF1,1,[Whether the host os is osf1])
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-fPIC"
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-@@ -1915,7 +1922,6 @@
- 			;;
- 		*unixware*) AC_DEFINE(UNIXWARE,1,[Whether the host os is unixware])
- 			BLDSHARED="true"
--			LDSHFLAGS="-shared"
- 			SONAMEFLAG="-Wl,-soname,"
- 			PICFLAG="-KPIC"
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
-@@ -1932,6 +1938,7 @@
- 						AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
- 					fi
- 					LDSHFLAGS="-G"
-+					LDDSOFLAGS="$LDSHFLAGS"
-                              		DYNEXP="-Bexport"
- 				;;
- 				*mips-sni-sysv4*) AC_DEFINE(RELIANTUNIX,1,[Whether the host os is reliantunix]);;
-@@ -1944,16 +1951,19 @@
- 				AC_DEFINE(HAVE_MEMSET,1,[Whether memset() is available])
- 			fi
- 			LDSHFLAGS="-G"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			AC_DEFINE(STAT_ST_BLOCKSIZE,512)
- 			;;
- 		*vos*) AC_DEFINE(STAT_ST_BLOCKSIZE,4096)
- 			BLDSHARED="false"
- 			LDSHFLAGS=""
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			;;
- 
- 		*darwin*)   AC_DEFINE(DARWINOS,1,[Whether the host os is Darwin/MacOSX])
- 			BLDSHARED="true"
- 			LDSHFLAGS="-dynamiclib -flat_namespace -undefined suppress"
-+			LDDSOFLAGS="$LDSHFLAGS"
- 			CFLAGS="$CFLAGS -fno-common"
- 			SHLD="\${CC}"
- 			SHLIBEXT="dylib"

Modified: trunk/samba/debian/patches/usershare.patch
===================================================================
--- trunk/samba/debian/patches/usershare.patch	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/patches/usershare.patch	2009-07-06 19:56:10 UTC (rev 2937)
@@ -24,10 +24,10 @@
  .PP
  The usershare commands are:
  .RS 4
-Index: samba-3.3.0/source/param/loadparm.c
+Index: samba-3.3.0/source3/param/loadparm.c
 ===================================================================
---- samba-3.3.0.orig/source/param/loadparm.c
-+++ samba-3.3.0/source/param/loadparm.c
+--- samba-3.3.0.orig/source3/param/loadparm.c
++++ samba-3.3.0/source3/param/loadparm.c
 @@ -4906,7 +4906,7 @@
  	string_set(&Globals.szUsersharePath, s);
  	SAFE_FREE(s);

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/rules	2009-07-06 19:56:10 UTC (rev 2937)
@@ -58,8 +58,11 @@
 		--without-libnetapi \
 		--with-modulesdir=/usr/lib/samba \
 		--datarootdir=/usr/share \
+		--datadir=/usr/share/samba \
 		--with-swatdir=/usr/share/samba/swat \
 		--with-lockdir=/var/run/samba \
+		--with-statedir=/var/lib/samba \
+		--with-cachedir=/var/cache/samba \
 
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -88,10 +91,10 @@
 	dh_testdir
 
 	if [ -f debian/config.cache ]; then \
-		cp -f debian/config.cache source/config.cache; \
+		cp -f debian/config.cache source3/config.cache; \
 	fi
 
-	[ -f source/Makefile ] || (cd source && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
+	[ -f source3/Makefile ] || (cd source3 && CFLAGS="$(CFLAGS)" ./configure $(conf_args))
 
 	touch configure-stamp
 
@@ -99,8 +102,9 @@
 build-stamp:
 	dh_testdir
 
-	$(MAKE) -C source # headers
-	$(MAKE) -C source everything nsswitch/libnss_wins.so
+	$(MAKE) -C source3 # headers
+	$(MAKE) -C source3 everything
+	$(MAKE) -C source3 nsswitch
 
 	touch build-stamp
 
@@ -111,13 +115,13 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	[ ! -f source/Makefile ] || $(MAKE) -C source distclean
+	[ ! -f source3/Makefile ] || $(MAKE) -C source3 distclean
 
 	# Delete stuff left after a build that is not deleted by 'make clean'
-	rm -f source/bin/wbinfo source/bin/winbindd source/bin/debug2html \
-	source/bin/libsmbclient.a \
-	source/client/mount.cifs source/client/umount.cifs \
-	source/include/stamp-h
+	rm -f source3/bin/wbinfo source3/bin/winbindd source3/bin/debug2html \
+	source3/bin/libsmbclient.a \
+	source3/client/mount.cifs source3/client/umount.cifs \
+	source3/include/stamp-h
 
 	debconf-updatepo
 
@@ -137,7 +141,7 @@
 	mkdir -p $(DESTDIR)/usr/lib/cups/backend $(DESTDIR)/usr/share/samba \
 	         $(DESTDIR)/etc/pam.d $(DESTDIR)/etc/dhcp3/dhclient-enter-hooks.d
 
-	$(MAKE) -C source install DESTDIR=$(DESTDIR)
+	$(MAKE) -C source3 install DESTDIR=$(DESTDIR)
 
 	# Rename to *.samba3 for alternatives
 	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3
@@ -148,10 +152,6 @@
 	mv $(DESTDIR)/usr/bin/testparm $(DESTDIR)/usr/bin/testparm.samba3
 	mv $(DESTDIR)/usr/share/man/man1/testparm.1 $(DESTDIR)/usr/share/man/man1/testparm.samba3.1
 
-	mv $(DESTDIR)/usr/share/samba/lowcase.dat $(DESTDIR)/usr/share/samba/lowcase.dat.samba3
-	mv $(DESTDIR)/usr/share/samba/upcase.dat $(DESTDIR)/usr/share/samba/upcase.dat.samba3
-	mv $(DESTDIR)/usr/share/samba/valid.dat $(DESTDIR)/usr/share/samba/valid.dat.samba3
-
 	# Starting with Samba 3.0.6 libsmbclient.so is installed in
 	# /usr/lib/samba. We don't want it there since it is not in the
 	# default library path. Here we move it to /usr/lib/.
@@ -163,21 +163,21 @@
 	# Install other stuff not installed by "make install"
 	install -m 0755 debian/mksmbpasswd.awk $(DESTDIR)/usr/sbin/mksmbpasswd
 	install -m 0644 debian/mksmbpasswd.8 $(DESTDIR)/usr/share/man/man8/mksmbpasswd.8
-	install -m 0644 source/nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
-	install -m 0644 source/nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
+	install -m 0644 nsswitch/libnss_winbind.so $(DESTDIR)/lib/libnss_winbind.so.2
+	install -m 0644 nsswitch/libnss_wins.so $(DESTDIR)/lib/libnss_wins.so.2
 	# Install torture stuff
-	install -m 0755 source/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
-	install -m 0755 source/bin/msgtest $(DESTDIR)/usr/bin/msgtest
-	install -m 0755 source/bin/masktest $(DESTDIR)/usr/bin/masktest
-	install -m 0755 source/bin/locktest $(DESTDIR)/usr/bin/locktest
-	install -m 0755 source/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
-	install -m 0755 source/bin/nsstest $(DESTDIR)/usr/bin/nsstest
-	install -m 0755 source/bin/vfstest $(DESTDIR)/usr/bin/vfstest
-	install -m 0755 source/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
-	install -m 0755 source/bin/talloctort $(DESTDIR)/usr/bin/talloctort
-	install -m 0755 source/bin/replacetort $(DESTDIR)/usr/bin/replacetort
-	install -m 0755 source/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
-	install -m 0755 source/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
+	install -m 0755 source3/bin/smbtorture $(DESTDIR)/usr/bin/smbtorture
+	install -m 0755 source3/bin/msgtest $(DESTDIR)/usr/bin/msgtest
+	install -m 0755 source3/bin/masktest $(DESTDIR)/usr/bin/masktest
+	install -m 0755 source3/bin/locktest $(DESTDIR)/usr/bin/locktest
+	install -m 0755 source3/bin/locktest2 $(DESTDIR)/usr/bin/locktest2
+	install -m 0755 source3/bin/nsstest $(DESTDIR)/usr/bin/nsstest
+	install -m 0755 source3/bin/vfstest $(DESTDIR)/usr/bin/vfstest
+	install -m 0755 source3/bin/pdbtest $(DESTDIR)/usr/bin/pdbtest
+	install -m 0755 source3/bin/talloctort $(DESTDIR)/usr/bin/talloctort
+	install -m 0755 source3/bin/replacetort $(DESTDIR)/usr/bin/replacetort
+	install -m 0755 source3/bin/tdbtorture $(DESTDIR)/usr/bin/tdbtorture
+	install -m 0755 source3/bin/smbconftort $(DESTDIR)/usr/bin/smbconftort
 	mkdir -p $(DESTDIR)/usr/share/pam-configs
 	install -m 0644 debian/libpam-smbpass.pam-config $(DESTDIR)/usr/share/pam-configs/smbpasswd-migrate
 
@@ -191,7 +191,7 @@
 	ln -s ../../../bin/smbspool $(DESTDIR)/usr/lib/cups/backend/smb
 
 	cp debian/smb.conf* $(DESTDIR)/usr/share/samba/
-	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action.samba3
+	install -m755 debian/panic-action $(DESTDIR)/usr/share/samba/panic-action
 	# Install samba-common's conffiles - they'll get moved later to their
 	# correct place by dh_movefiles.
 	cp debian/gdbcommands $(DESTDIR)/etc/samba/
@@ -239,9 +239,9 @@
 	  install -m 0644 -D debian/$$pkg.lintian debian/$$pkg/usr/share/lintian/overrides/$$pkg || exit; \
 	done
 	dh_installchangelogs -Nlibpam-smbpass
-	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG
-	DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common --dbg-package=samba-dbg
-	DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common
+	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source3/pam_smbpass/CHANGELOG
+	DH_OPTIONS= dh_strip -psamba -psmbclient -pwinbind -psamba-common-bin --dbg-package=samba-dbg
+	DH_OPTIONS= dh_strip -Nsamba -Nsmbclient -Nwinbind -Nsamba-common-bin
 	dh_link
 	dh_compress
 	dh_fixperms

Copied: trunk/samba/debian/samba-common-bin.files (from rev 2936, branches/samba/experimental/debian/samba-common-bin.files)
===================================================================
--- trunk/samba/debian/samba-common-bin.files	                        (rev 0)
+++ trunk/samba/debian/samba-common-bin.files	2009-07-06 19:56:10 UTC (rev 2937)
@@ -0,0 +1,12 @@
+usr/bin/net.samba3
+usr/bin/nmblookup.samba3
+usr/bin/smbpasswd
+usr/bin/testparm.samba3
+usr/share/man/man1/nmblookup.samba3.1
+usr/share/man/man1/testparm.samba3.1
+usr/share/man/man5/lmhosts.5
+usr/share/man/man5/smb.conf.5
+usr/share/man/man5/smbpasswd.5
+usr/share/man/man7/samba.7
+usr/share/man/man8/net.samba3.8
+usr/share/man/man8/smbpasswd.8

Copied: trunk/samba/debian/samba-common-bin.postinst (from rev 2936, branches/samba/experimental/debian/samba-common-bin.postinst)
===================================================================
--- trunk/samba/debian/samba-common-bin.postinst	                        (rev 0)
+++ trunk/samba/debian/samba-common-bin.postinst	2009-07-06 19:56:10 UTC (rev 2937)
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+#
+
+set -e
+
+if [ "$1" = "configure" ]
+then
+	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
+		--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
+	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
+		--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
+	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
+		--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
+fi
+
+#DEBHELPER#

Modified: trunk/samba/debian/samba-common.files
===================================================================
--- trunk/samba/debian/samba-common.files	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba-common.files	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,20 +1,8 @@
 etc/samba/
 etc/dhcp3/
 etc/pam.d/
-usr/bin/net.samba3
-usr/bin/nmblookup.samba3
-usr/bin/smbpasswd
-usr/bin/testparm.samba3
-usr/share/man/man1/nmblookup.samba3.1
-usr/share/man/man1/testparm.samba3.1
-usr/share/man/man5/lmhosts.5
-usr/share/man/man5/smb.conf.5
-usr/share/man/man5/smbpasswd.5
-usr/share/man/man7/samba.7
-usr/share/man/man8/net.samba3.8
-usr/share/man/man8/smbpasswd.8
-usr/share/samba/lowcase.dat.samba3
-usr/share/samba/panic-action.samba3
+usr/share/samba/lowcase.dat
+usr/share/samba/panic-action
 usr/share/samba/smb.conf*
-usr/share/samba/upcase.dat.samba3
-usr/share/samba/valid.dat.samba3
+usr/share/samba/upcase.dat
+usr/share/samba/valid.dat

Modified: trunk/samba/debian/samba-common.postinst
===================================================================
--- trunk/samba/debian/samba-common.postinst	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba-common.postinst	2009-07-06 19:56:10 UTC (rev 2937)
@@ -4,21 +4,6 @@
 
 set -e
 
-if [ "$1" = "configure" ]
-then
-	update-alternatives --install /usr/bin/nmblookup nmblookup /usr/bin/nmblookup.samba3 0 \
-		--slave /usr/share/man/man1/nmblookup.1.gz nmblookup.1.gz /usr/share/man/man1/nmblookup.samba3.1.gz
-	update-alternatives --install /usr/bin/net net /usr/bin/net.samba3 10 \
-		--slave /usr/share/man/man8/net.8.gz net.8.gz /usr/share/man/man8/net.samba3.8.gz
-	update-alternatives --install /usr/bin/testparm testparm /usr/bin/testparm.samba3 10 \
-		--slave /usr/share/man/man1/testparm.1.gz testparm.1.gz /usr/share/man/man1/testparm.samba3.1.gz
-	for N in valid.dat upcase.dat lowcase.dat
-	do
-		update-alternatives --install /usr/share/samba/$N $N /usr/share/samba/$N.samba3 0
-	done
-	update-alternatives --install /usr/share/samba/panic-action samba-panic-action /usr/share/samba/panic-action.samba3 0
-fi
-
 # Do debconf stuff here
 . /usr/share/debconf/confmodule
 

Modified: trunk/samba/debian/samba-common.prerm
===================================================================
--- trunk/samba/debian/samba-common.prerm	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba-common.prerm	2009-07-06 19:56:10 UTC (rev 2937)
@@ -7,11 +7,6 @@
 	update-alternatives --remove nmblookup /usr/bin/nmblookup.samba3
 	update-alternatives --remove net /usr/bin/net.samba3
 	update-alternatives --remove testparm /usr/bin/testparm.samba3
-	for N in valid.dat upcase.dat lowcase.dat
-	do
-		update-alternatives --remove $N /usr/share/samba/$N.samba3
-	done
-	update-alternatives --remove samba-panic-action /usr/share/samba/panic-action.samba3
 		;;
 esac
 

Deleted: trunk/samba/debian/samba-doc.doc-base.samba-using
===================================================================
--- trunk/samba/debian/samba-doc.doc-base.samba-using	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba-doc.doc-base.samba-using	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,15 +0,0 @@
-Document: samba-using
-Title: Using Samba, 2nd Edition
-Author: Jay Ts, Robert Eckstein, and David Collier-Brown
-Abstract: This is a book about Samba, a software suite that networks
- Windows, Unix, and other operating systems using Windows' native
- networking protocol. Samba allows Unix servers to offer Windows
- networking services by matching the filesystem and networking models
- of Unix to those of Windows. Samba acts as a bridge between the two
- systems, connecting the corresponding parts of their architectures and
- providing a translation wherever necessary.
-Section: Network/File Transfer
-
-Format: HTML
-Index: /usr/share/doc/samba-doc/htmldocs/using_samba/toc.html
-Files: /usr/share/doc/samba-doc/htmldocs/using_samba/*

Copied: trunk/samba/debian/samba-doc.doc-base.samba-using (from rev 2936, branches/samba/experimental/debian/samba-doc.doc-base.samba-using)
===================================================================
--- trunk/samba/debian/samba-doc.doc-base.samba-using	                        (rev 0)
+++ trunk/samba/debian/samba-doc.doc-base.samba-using	2009-07-06 19:56:10 UTC (rev 2937)
@@ -0,0 +1,15 @@
+Document: samba-using
+Title: Using Samba, 2nd Edition
+Author: Jay Ts, Robert Eckstein, and David Collier-Brown
+Abstract: This is a book about Samba, a software suite that networks
+ Windows, Unix, and other operating systems using Windows' native
+ networking protocol. Samba allows Unix servers to offer Windows
+ networking services by matching the filesystem and networking models
+ of Unix to those of Windows. Samba acts as a bridge between the two
+ systems, connecting the corresponding parts of their architectures and
+ providing a translation wherever necessary.
+Section: Network/File Transfer
+
+Format: HTML
+Index: /usr/share/doc/samba-doc/htmldocs/using_samba/toc.html
+Files: /usr/share/doc/samba-doc/htmldocs/using_samba/*

Modified: trunk/samba/debian/samba-doc.examples
===================================================================
--- trunk/samba/debian/samba-doc.examples	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba-doc.examples	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,3 +1,3 @@
 debian/wins2dns.awk
-source/smbadduser
+source3/smbadduser.in
 examples/*

Modified: trunk/samba/debian/samba.postinst
===================================================================
--- trunk/samba/debian/samba.postinst	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/samba.postinst	2009-07-06 19:56:10 UTC (rev 2937)
@@ -75,7 +75,7 @@
 # FIXME: we don't want to pass these through the smbpasswd backend,
 # some of the faking can cause us problems!
 if [ "${GENERATE_SMBPASSWD}" = "true" -a ! -e /var/lib/samba/passdb.tdb -a ! -e /etc/samba/smbpasswd ]; then
-	getent passwd | mksmbpasswd > /etc/samba/smbpasswd
+	getent passwd | /usr/sbin/mksmbpasswd > /etc/samba/smbpasswd
 	pdbedit -i smbpasswd -e tdbsam
 	rm /etc/samba/smbpasswd
 fi

Modified: trunk/samba/debian/smbwrapper.docs
===================================================================
--- trunk/samba/debian/smbwrapper.docs	2009-07-06 18:17:09 UTC (rev 2936)
+++ trunk/samba/debian/smbwrapper.docs	2009-07-06 19:56:10 UTC (rev 2937)
@@ -1,2 +1,2 @@
-source/smbwrapper/README
-source/smbwrapper/PORTING
+source3/smbwrapper/README
+source3/smbwrapper/PORTING




More information about the Pkg-samba-maint mailing list