Index: branches/samba-3.2.x/WHATSNEW.txt
===================================================================
--- branches/samba-3.2.x/WHATSNEW.txt	(revision 200)
+++ branches/samba-3.2.x/WHATSNEW.txt	(revision 201)
@@ -1,20 +1,18 @@
                    ==============================
-                   Release Notes for Samba 3.2.2
-			  August, 19 2008
+                   Release Notes for Samba 3.2.3
+			  August, 27 2008
                    ==============================
 
-This is a bug fix release of the Samba 3.2 series.
+This is a security release in order to address CVE-2008-3789 ("Wrong
+permissions of group_mapping.ldb").
 
-Major bug fixes included in Samba 3.2.2 are:
+   o CVE-2008-3789
+     The file group_mapping.ldb is created with
+     the permissions 0666. That means everyone
+     is able to edit this file and might map any
+     SID to root.
 
-  o Fix removal of dead records in tdb files. This can lead to very large
-    tdb files and to overflowing partitions as a consequence on systems
-    running an nmbd daemon.
-  o Fix "force group" in setups using Winbind.
-  o Fix freezing Windows Explorer on WinXP while browsing Samba shares.
-    This one led to timeouts during printing as well.
-  o Fix assigning of primary group memberships when authenticating via
-    Winbind.
-  o Fix creation and installation of shared libraries.
+The original security announcement for this and past advisories can
+be found http://www.samba.org/samba/security/
 
 
@@ -23,80 +21,9 @@
 #######
 
-Changes since 3.2.1
+Changes since 3.2.2
 -------------------
 
-
-o   Michael Adam <obnox@samba.org>
-    * BUG 5592: Fix creation and installation of shared libraries.
-    * Fix replacement of random seed generator.
-    * Fix a race condition in idmap_tdb2_allocate_id().
-    * Fix unix_convert() for "*" after changing map_nt_error_from_unix().
-    * Make sure to always set errno on error path in OpenDir.
-
-
-o   Jeremy Allison <jra@samba.org>
-    * BUG 5675: Fix smbspool program assuming Kerberos authentication by
-      mistake.
-    * BUG 5686: Fix segfaults in libsmbclient.
-    * BUG 5692: Fix coredump in full_audit.so.
-    * BUG 5696: Fix "force group" in setups using Winbind.
-    * Rename cifs.spnego to cifs.upcall.
-    * Fix segfault in cifs.upcall when it is called without any arguments.
-    * Fix coverity ID 594 (resource leak on error path).
-    * Fix assigning of primary group memberships when authenticating via
-      Winbind.
-    * Several build fixes.
-
-
-o   Bartosz Antosik <antosik@gmail.com>
-    * BUG #5617: Fix freezing Windows Explorer on WinXP while browsing
-      Samba shares.
-
-
-o   Andrew Bartlett <abartlet@samba.org>
-    * Include stdlib.h to get a prototype for free().
-
-
-o   Yannick Bergeron <yaberger@ca.ibm.com>
-    * Solve an IBM XL C/C++ compiler error encountered in get_exit_code()
-      auth_errors array initialization in client/smbspool.c.
-    * Use NGROUPS_MAX instead of 32 for the max group value in
-      rep_initgroups().
-
-
-o   GÃŒnther Deschner <gd@samba.org>
-    * Fix build warning.
-    * Add add c++ guard to netapi.
-
-
-o   Steve French <stevef@smf-t60p.smfdom>
-    * Fix compile warning in cifs.upcall.
-    * Add "dns_resolver" key type to cifs.upcall.
-
-
-o   SATOH Fumiyasu <fumiyas@osstech.co.jp>
-    * BUG 5688: Fix orphaned LPQ processes if socket address is invalid.
-
-
-o   Volker Lendecke <vl@samba.org>
-    * BUG 5684: Fix removal of dead records in tdb files.
-    * Fix coverity IDs 595, 596.
-    * Fix smb_len calculation for chained requests.
-
-
-o   Herb Lewis <herb@samba.org>
-    * Fix output of test status.
-
-
-o   Jim McDonough <jmcd@samba.org>
-    * Fix smbclient connections to older servers.
-
-
 o   Andrew Tridgell <tridge@samba.org>
-    * Fix a fd leak when trying to regain contact to a domain controller
-      in Winbind.
-    * Fix permissions on ctdb databases.
-    * Fix passing back success when a function had in fact failed in two
-      places.
+    * Fix for CVE-2008-3789.
 
 
Index: branches/samba-3.2.x/docs/manpages/cifs.upcall.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/cifs.upcall.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/cifs.upcall.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "CIFS\.UPCALL" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "CIFS\.UPCALL" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/eventlogadm.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/eventlogadm.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "EVENTLOGADM" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "EVENTLOGADM" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/findsmb.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/findsmb.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/findsmb.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "FINDSMB" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "FINDSMB" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/idmap_ad.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/idmap_ad.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/idmap_ad.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "IDMAP_AD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "IDMAP_AD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/idmap_ldap.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/idmap_ldap.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/idmap_ldap.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "IDMAP_LDAP" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/idmap_nss.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/idmap_nss.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/idmap_nss.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "IDMAP_NSS" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "IDMAP_NSS" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/idmap_rid.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/idmap_rid.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/idmap_rid.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "IDMAP_RID" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "IDMAP_RID" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/idmap_tdb.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/idmap_tdb.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/idmap_tdb.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "IDMAP_TDB" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "IDMAP_TDB" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldb.3
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldb.3	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldb.3	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: C Library Functions
 .\"    Source: Samba 3.2
 .\"
-.TH "LDB" "3" "08/18/2008" "Samba 3\.2" "C Library Functions"
+.TH "LDB" "3" "08/27/2008" "Samba 3\.2" "C Library Functions"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldbadd.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldbadd.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldbadd.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LDBADD" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LDBADD" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldbdel.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldbdel.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldbdel.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LDBDEL" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LDBDEL" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldbedit.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldbedit.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldbedit.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LDBEDIT" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LDBEDIT" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldbmodify.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldbmodify.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldbmodify.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LDBMODIFY" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LDBMODIFY" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ldbsearch.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ldbsearch.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ldbsearch.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LDBSEARCH" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LDBSEARCH" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba-3.2.x/docs/manpages/libsmbclient.7	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/libsmbclient.7	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: 7
 .\"    Source: Samba 3.2
 .\"
-.TH "LIBSMBCLIENT" "7" "08/18/2008" "Samba 3\.2" "7"
+.TH "LIBSMBCLIENT" "7" "08/27/2008" "Samba 3\.2" "7"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/lmhosts.5
===================================================================
--- branches/samba-3.2.x/docs/manpages/lmhosts.5	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/lmhosts.5	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.2
 .\"
-.TH "LMHOSTS" "5" "08/18/2008" "Samba 3\.2" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "08/27/2008" "Samba 3\.2" "File Formats and Conventions"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/log2pcap.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/log2pcap.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/log2pcap.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "LOG2PCAP" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "LOG2PCAP" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/mount.cifs.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/mount.cifs.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/mount.cifs.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "MOUNT\.CIFS" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "MOUNT\.CIFS" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/net.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/net.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/net.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "NET" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "NET" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/nmbd.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/nmbd.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/nmbd.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "NMBD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "NMBD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/nmblookup.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/nmblookup.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/nmblookup.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "NMBLOOKUP" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "NMBLOOKUP" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/ntlm_auth.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/ntlm_auth.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "NTLM_AUTH" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "NTLM_AUTH" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/pam_winbind.7
===================================================================
--- branches/samba-3.2.x/docs/manpages/pam_winbind.7	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/pam_winbind.7	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: 7
 .\"    Source: Samba 3.2
 .\"
-.TH "PAM_WINBIND" "7" "08/18/2008" "Samba 3\.2" "7"
+.TH "PAM_WINBIND" "7" "08/27/2008" "Samba 3\.2" "7"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/pdbedit.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/pdbedit.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/pdbedit.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "PDBEDIT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "PDBEDIT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/profiles.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/profiles.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/profiles.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "PROFILES" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "PROFILES" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/rpcclient.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/rpcclient.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/rpcclient.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "RPCCLIENT" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "RPCCLIENT" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/samba.7
===================================================================
--- branches/samba-3.2.x/docs/manpages/samba.7	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/samba.7	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.2
 .\"
-.TH "SAMBA" "7" "08/18/2008" "Samba 3\.2" "Miscellanea"
+.TH "SAMBA" "7" "08/27/2008" "Samba 3\.2" "Miscellanea"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smb.conf.5
===================================================================
--- branches/samba-3.2.x/docs/manpages/smb.conf.5	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smb.conf.5	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.2
 .\"
-.TH "SMB\.CONF" "5" "08/18/2008" "Samba 3\.2" "File Formats and Conventions"
+.TH "SMB\.CONF" "5" "08/27/2008" "Samba 3\.2" "File Formats and Conventions"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbcacls.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbcacls.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbcacls.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBCACLS" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBCACLS" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbclient.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbclient.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbclient.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBCLIENT" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBCLIENT" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbcontrol.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbcontrol.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBCONTROL" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBCONTROL" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbcquotas.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbcquotas.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBCQUOTAS" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBCQUOTAS" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbd.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbd.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbd.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "SMBD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbget.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbget.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbget.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBGET" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBGET" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbgetrc.5	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbgetrc.5	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBGETRC" "5" "08/18/2008" "Samba 3\.2" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "08/27/2008" "Samba 3\.2" "File Formats and Conventions"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbpasswd.5
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbpasswd.5	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbpasswd.5	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBPASSWD" "5" "08/18/2008" "Samba 3\.2" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "08/27/2008" "Samba 3\.2" "File Formats and Conventions"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbpasswd.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbpasswd.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbpasswd.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBPASSWD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "SMBPASSWD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbspool.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbspool.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbspool.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBSPOOL" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "SMBSPOOL" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbstatus.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbstatus.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbstatus.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBSTATUS" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBSTATUS" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbtar.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbtar.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbtar.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBTAR" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBTAR" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/smbtree.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/smbtree.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/smbtree.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "SMBTREE" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "SMBTREE" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/swat.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/swat.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/swat.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "SWAT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "SWAT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/tdbbackup.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/tdbbackup.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "TDBBACKUP" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "TDBBACKUP" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/tdbdump.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/tdbdump.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/tdbdump.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "TDBDUMP" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "TDBDUMP" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/tdbtool.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/tdbtool.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/tdbtool.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "TDBTOOL" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "TDBTOOL" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/testparm.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/testparm.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/testparm.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "TESTPARM" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "TESTPARM" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/umount.cifs.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/umount.cifs.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/umount.cifs.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "UMOUNT\.CIFS" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "UMOUNT\.CIFS" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_audit.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_audit.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_audit.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_AUDIT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_AUDIT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_cacheprime.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_cacheprime.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_cacheprime.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_CACHEPRIME" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_cap.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_cap.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_cap.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_CAP" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_CAP" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_catia.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_catia.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_catia.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_CATIA" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_CATIA" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_commit.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_commit.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_commit.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_COMMIT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_COMMIT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_default_quota.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_default_quota.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_default_quota.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_extd_audit.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_extd_audit.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_extd_audit.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_fake_perms.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_fake_perms.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_fake_perms.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_FAKE_PERMS" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_full_audit.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_full_audit.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_full_audit.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_FULL_AUDIT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_gpfs.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_gpfs.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_gpfs.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_GPFS" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_GPFS" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_netatalk.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_netatalk.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_netatalk.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_NETATALK" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_NETATALK" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_notify_fam.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_notify_fam.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_notify_fam.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_prealloc.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_prealloc.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_prealloc.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_PREALLOC" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_readahead.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_readahead.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_readahead.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_READAHEAD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_readonly.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_readonly.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_readonly.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_READONLY" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_READONLY" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_recycle.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_recycle.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_recycle.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_RECYCLE" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_shadow_copy.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_shadow_copy.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_shadow_copy.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_SHADOW_COPY" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_streams_depot.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_streams_depot.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_streams_depot.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_streams_xattr.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_streams_xattr.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_streams_xattr.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfs_xattr_tdb.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfs_xattr_tdb.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "VFS_XATTR_TDB" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/vfstest.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/vfstest.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/vfstest.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "VFSTEST" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "VFSTEST" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/wbinfo.1
===================================================================
--- branches/samba-3.2.x/docs/manpages/wbinfo.1	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/wbinfo.1	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: User Commands
 .\"    Source: Samba 3.2
 .\"
-.TH "WBINFO" "1" "08/18/2008" "Samba 3\.2" "User Commands"
+.TH "WBINFO" "1" "08/27/2008" "Samba 3\.2" "User Commands"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/docs/manpages/winbindd.8
===================================================================
--- branches/samba-3.2.x/docs/manpages/winbindd.8	(revision 200)
+++ branches/samba-3.2.x/docs/manpages/winbindd.8	(revision 201)
@@ -2,9 +2,9 @@
 .\"    Author: 
 .\" Generator: DocBook XSL Stylesheets v1.73.1 <http://docbook.sf.net/>
-.\"      Date: 08/18/2008
+.\"      Date: 08/27/2008
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.2
 .\"
-.TH "WINBINDD" "8" "08/18/2008" "Samba 3\.2" "System Administration tools"
+.TH "WINBINDD" "8" "08/27/2008" "Samba 3\.2" "System Administration tools"
 .\" disable hyphenation
 .nh
Index: branches/samba-3.2.x/source/Makefile
===================================================================
--- branches/samba-3.2.x/source/Makefile	(revision 200)
+++ branches/samba-3.2.x/source/Makefile	(revision 201)
@@ -26,7 +26,6 @@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/shared_libraries_disabled$$/syms/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/shared_libraries_disabled\(.[0-9]\{1,\}\)\{0,1\}$$/syms/'`
 DSO_EXPORTS=
-SONAME_VER=`grep \^$@ $(builddir)/library-versions | cut -d: -f2`
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
 
@@ -51,5 +50,5 @@
 PICFLAG=
 DYNEXP=
-PERL=e:/Perl/bin/perl.exe
+PERL=u:/Perl/bin/perl.exe
 
 PIDL_ARGS=
@@ -83,6 +82,6 @@
 
 
-srcdir=U:/DEV/sambasvn/samba/source
-builddir=U:/DEV/sambasvn/samba/source
+srcdir=U:/Develop/Samba/samba-3.2.x/source
+builddir=U:/Develop/Samba/samba-3.2.x/source
 SHELL=/bin/sh
 DESTDIR=/
@@ -150,32 +149,4 @@
 PIDDIR = ${VARDIR}/locks
 
-LIBTALLOC_SHARED_TARGET=bin/libtalloc.shared_libraries_disabled
-LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
-LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) 
-LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.syms
-LIBTALLOC_HEADERS=$(srcdir)/lib/talloc/talloc.h
-
-LIBTDB_SHARED_TARGET=bin/libtdb.shared_libraries_disabled
-LIBTDB_STATIC_TARGET=bin/libtdb.a
-LIBTDB=$(LIBTDB_STATIC_TARGET) 
-LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms
-LIBTDB_HEADERS=$(srcdir)/lib/tdb/include/tdb.h
-
-LIBSMBCLIENT=bin/libsmbclient.a 
-LIBSMBSHAREMODES=bin/libsmbsharemodes.a 
-LIBADDNS=bin/libaddns.a 
-
-LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.shared_libraries_disabled
-LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
-LIBWBCLIENT=bin/libwbclient.a 
-LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.syms
-LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
-
-LIBNETAPI_SHARED_TARGET=bin/libnetapi.shared_libraries_disabled
-LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
-LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) 
-LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.syms
-LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
-
 FLAGS1 = $(CFLAGS)  -I$(srcdir)/iniparser/src -Iinclude -I./include  -I. -I. -I./lib/replace -I./lib/talloc -I./lib/tdb/include -I./libaddns -I./librpc $(CPPFLAGS)
 FLAGS2 =
@@ -235,6 +206,4 @@
 	bin/vlp.exe bin/smbiconv.exe
 
-SHLIBS = libtalloc libtdb  libsmbclient libsmbsharemodes  libnetapi
-
 PAM_MODULES = 
 
@@ -256,7 +225,4 @@
 # object file lists
 ######################################################################
-
-LIBTDB_OBJ0 =  lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/transaction.o lib/tdb/common/error.o lib/tdb/common/traverse.o lib/tdb/common/freelist.o lib/tdb/common/freelistcheck.o lib/tdb/common/io.o lib/tdb/common/lock.o lib/tdb/common/open.o
-LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
 
 TDB_OBJ = lib/util_tdb.o \
@@ -326,10 +292,4 @@
 SOCKET_WRAPPER_OBJ = 
 NSS_WRAPPER_OBJ = 
-
-TALLOC_OBJ =  lib/talloc/talloc.o
-
-
-LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
-LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
 
 LIBSAMBAUTIL_OBJ = bin/libtalloc.a \
@@ -387,14 +347,4 @@
 	       libaddns/dnsgss.o libaddns/dnsmarshall.o
 LIBADDNS_OBJ = $(LIBADDNS_OBJ0) $(SOCKET_WRAPPER_OBJ) bin/libtalloc.a
-
-LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
-		  nsswitch/libwbclient/wbc_util.o \
-		  nsswitch/libwbclient/wbc_pwd.o \
-		  nsswitch/libwbclient/wbc_idmap.o \
-		  nsswitch/libwbclient/wbc_sid.o \
-		  nsswitch/libwbclient/wbc_pam.o
-LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
-		  $(WBCOMMON_OBJ) \
-		  bin/libtalloc.a $(LIBREPLACE_OBJ)
 
 LIBGPO_OBJ0 = libgpo/gpo_ldap.o libgpo/gpo_ini.o libgpo/gpo_util.o \
@@ -828,7 +778,4 @@
 LIBSMBCLIENT_OBJ = $(LIBSMBCLIENT_OBJ1) bin/libwbclient.a
 
-LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
-LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) bin/libtdb.a
-
 # This shared library is intended for linking with unit test programs
 # to test Samba internals.  It's called libbigballofmud.so to
@@ -851,22 +798,4 @@
              $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
 	     $(DISPLAY_SEC_OBJ) 
-
-LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
-		 lib/netapi/cm.o \
-		 librpc/gen_ndr/ndr_libnetapi.o \
-		 lib/netapi/libnetapi.o \
-		 lib/netapi/joindomain.o \
-		 lib/netapi/serverinfo.o \
-		 lib/netapi/getdc.o \
-		 lib/netapi/user.o
-
-LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
-		 $(LIBSMBCONF_OBJ) \
-		 $(REG_SMBCONF_OBJ) \
-		 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
-		 $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
-		 $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
-		 $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
-		 $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
 
 LIBSMBCONF_OBJ = lib/smbconf/smbconf.o lib/smbconf/smbconf_util.o \
@@ -926,5 +855,5 @@
 CIFS_UMOUNT_OBJ = client/umount.cifs.o
 
-CIFS_SPNEGO_OBJ = client/cifs.spnego.o
+CIFS_UPCALL_OBJ = client/cifs.upcall.o
 
 NMBLOOKUP_OBJ = utils/nmblookup.o $(PARAM_OBJ) $(LIBNMB_OBJ) \
@@ -1163,10 +1092,10 @@
 # now the rules...
 ######################################################################
-all : SHOWFLAGS $(SHLIBS) $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
+all:: SHOWFLAGS libs $(SBIN_PROGS) $(BIN_PROGS) $(ROOT_SBIN_PROGS) \
 	$(MODULES) $(NSS_MODULES) $(PAM_MODULES) 
 
-nss_modules : $(NSS_MODULES)
-
-pam_modules : $(PAM_MODULES)
+nss_modules:: $(NSS_MODULES)
+
+pam_modules:: $(PAM_MODULES)
 
 pam_smbpass : SHOWFLAGS bin/pam_smbpass.shared_libraries_disabled
@@ -1174,5 +1103,5 @@
 pam_winbind : SHOWFLAGS bin/pam_winbind.shared_libraries_disabled
 
-torture : SHOWFLAGS $(TORTURE_PROGS)
+torture:: SHOWFLAGS $(TORTURE_PROGS)
 
 smbtorture : SHOWFLAGS bin/smbtorture.exe
@@ -1212,5 +1141,5 @@
 wins : SHOWFLAGS 
 
-modules: SHOWFLAGS $(MODULES)
+modules:: SHOWFLAGS $(MODULES)
 
 #####################################################################
@@ -1221,5 +1150,5 @@
 	dssetup.idl krb5pac.idl ntsvcs.idl libnetapi.idl
 
-idl:
+idl::
 	@IDL_FILES="$(IDL_FILES)" CPP="$(CPP)" PERL="$(PERL)" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh $(PIDL_ARGS)
@@ -1229,5 +1158,5 @@
 
 
-everything: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
+everything:: all libtalloc libsmbclient libnetapi debug2html smbfilter talloctort replacetort smbconftort modules torture \
 	$(EVERYTHING_PROGS)
 
@@ -1235,5 +1164,5 @@
 .SUFFIXES: .c .o .lo
 
-SHOWFLAGS:
+SHOWFLAGS::
 	@echo "Using FLAGS      = $(FLAGS)"
 	@echo "      PICFLAG    = $(PICFLAG)"
@@ -1280,5 +1209,5 @@
 # this adds support for precompiled headers. To use it, install a snapshot
 # of gcc-3.4 and run 'make pch' before you do the main build.
-pch: proto_exists
+pch:: proto_exists
 	rm -f $(PRECOMPILED_HEADER)
 	$(MAKE) $(PRECOMPILED_HEADER)
@@ -1391,7 +1320,7 @@
 	@$(CC) $(FLAGS) -o $@ $(CIFS_UMOUNT_OBJ) $(DYNEXP) $(LDFLAGS) $(POPT_LIBS)
 
-bin/cifs.spnego.exe: $(BINARY_PREREQS) $(CIFS_SPNEGO_OBJ) $(LIBSMBCLIENT_OBJ1)    
-	@echo Linking $@
-	@$(CC) $(FLAGS) -o $@ $(CIFS_SPNEGO_OBJ) $(DYNEXP) $(LDFLAGS) \
+bin/cifs.upcall.exe: $(BINARY_PREREQS) $(CIFS_UPCALL_OBJ) $(LIBSMBCLIENT_OBJ1)    
+	@echo Linking $@
+	@$(CC) $(FLAGS) -o $@ $(CIFS_UPCALL_OBJ) $(DYNEXP) $(LDFLAGS) \
 		-lkeyutils $(LIBS) $(LIBSMBCLIENT_OBJ1) $(KRB5LIBS) \
 		$(LDAP_LIBS) $(POPT_LIBS) $(LIBTALLOC_LIBS) $(WINBIND_LIBS) \
@@ -1590,15 +1519,43 @@
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS)
 
+
+#####################################################################
+#
+# libraries
+#
+#####################################################################
+
 MKSYMS_SH = $(srcdir)/script/mksyms.sh
+
+
+#-------------------------------------------------------------------
+#
+# libtalloc
+#
+#-------------------------------------------------------------------
+
+TALLOC_OBJ =  lib/talloc/talloc.o
+
+LIBTALLOC_OBJ0 = $(TALLOC_OBJ)
+LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTALLOC_SHARED_TARGET=bin/libtalloc.shared_libraries_disabled
+LIBTALLOC_SOVER=1
+LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
+LIBTALLOC_STATIC_TARGET=bin/libtalloc.a
+LIBTALLOC=$(LIBTALLOC_STATIC_TARGET) 
+LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.syms
+LIBTALLOC_HEADERS=$(srcdir)/lib/talloc/talloc.h
 
 $(LIBTALLOC_SYMS): $(LIBTALLOC_HEADERS)
 	@$(MKSYMS_SH) $(AWK) $@ $(LIBTALLOC_HEADERS)
 
-$(LIBTALLOC_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
+$(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTALLOC_OBJ) $(LIBTALLOC_SYMS)
 	@echo Linking shared library $@
-	@$(SHLD_DSO) $(LIBTALLOC_OBJ) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-	@rm -f $@.$(SONAME_VER)
-	@ln -s -f `basename $@` $@.$(SONAME_VER)
+	@$(SHLD_DSO) $(LIBTALLOC_OBJ) shared-libraries-disabled`basename $@`
+
+$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
 
 $(LIBTALLOC_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTALLOC_OBJ0)
@@ -1606,13 +1563,65 @@
 	@-$(AR) -rc $@ $(LIBTALLOC_OBJ0)
 
+libtalloc: $(LIBTALLOC)
+
+cleanlibtalloc::
+	-rm -f \
+		$(LIBTALLOC_SYMS) \
+		$(LIBTALLOC_STATIC_TARGET) \
+		$(LIBTALLOC_SHARED_TARGET) \
+		$(LIBTALLOC_SHARED_TARGET_SONAME)
+
+installlibtalloc:: installdirs libtalloc
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+	-if test -e $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibtalloc::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_STATIC_TARGET)`
+	-rm -f $(DESTDIR)${prefix}/include/talloc.h
+
+libs:: libtalloc
+installlibs:: installlibtalloc
+uninstalllibs:: uninstalllibtalloc
+cleanlibs:: cleanlibtalloc
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libtdb
+#
+#-------------------------------------------------------------------
+
+LIBTDB_OBJ0 =  lib/tdb/common/tdb.o lib/tdb/common/dump.o lib/tdb/common/transaction.o lib/tdb/common/error.o lib/tdb/common/traverse.o lib/tdb/common/freelist.o lib/tdb/common/freelistcheck.o lib/tdb/common/io.o lib/tdb/common/lock.o lib/tdb/common/open.o
+LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
+
+LIBTDB_SHARED_TARGET=bin/libtdb.shared_libraries_disabled
+LIBTDB_SOVER=1
+LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
+LIBTDB_STATIC_TARGET=bin/libtdb.a
+LIBTDB=$(LIBTDB_STATIC_TARGET) 
+LIBTDB_SYMS=$(srcdir)/exports/libtdb.syms
+LIBTDB_HEADERS=$(srcdir)/lib/tdb/include/tdb.h
+
 $(LIBTDB_SYMS): $(LIBTDB_HEADERS)
 	@$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
 
-$(LIBTDB_SHARED_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
+$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBTDB_OBJ) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-	@rm -f $@.$(SONAME_VER)
-	@ln -s -f `basename $@` $@.$(SONAME_VER)
+		shared-libraries-disabled`basename $@`
+
+$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
 
 $(LIBTDB_STATIC_TARGET): $(BINARY_PREREQS) $(LIBTDB_OBJ0)
@@ -1620,13 +1629,73 @@
 	@-$(AR) -rc $@ $(LIBTDB_OBJ0)
 
+libtdb: $(LIBTDB)
+
+cleanlibtdb::
+	-rm -f \
+		$(LIBTDB_SYMS) \
+		$(LIBTDB_STATIC_TARGET) \
+		$(LIBTDB_SHARED_TARGET) \
+		$(LIBTDB_SHARED_TARGET_SONAME)
+
+
+installlibtdb:: installdirs libtdb
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+	-if test -e $(LIBTDB_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibtdb::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_STATIC_TARGET)`
+	-rm -f $(DESTDIR)${prefix}/include/tdb.h
+
+libs:: libtdb
+installlibs:: installlibtdb
+uninstalllibs:: uninstalllibtdb
+cleanlibs:: cleanlibtdb
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libwbclient
+#
+#-------------------------------------------------------------------
+
+LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
+		  nsswitch/libwbclient/wbc_util.o \
+		  nsswitch/libwbclient/wbc_pwd.o \
+		  nsswitch/libwbclient/wbc_idmap.o \
+		  nsswitch/libwbclient/wbc_sid.o \
+		  nsswitch/libwbclient/wbc_pam.o
+LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
+		  $(WBCOMMON_OBJ) \
+		  bin/libtalloc.a $(LIBREPLACE_OBJ)
+
+LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.shared_libraries_disabled
+LIBWBCLIENT_SOVER=0
+LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
+LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
+LIBWBCLIENT=bin/libwbclient.a 
+LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.syms
+LIBWBCLIENT_HEADERS=$(srcdir)/nsswitch/libwbclient/wbclient.h
+
 $(LIBWBCLIENT_SYMS): $(LIBWBCLIENT_HEADERS)
 	@$(MKSYMS_SH) $(AWK) $@ $(LIBWBCLIENT_HEADERS)
 
-$(LIBWBCLIENT_SHARED_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) 
+$(LIBWBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) $(LIBWBCLIENT_SYMS) 
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBTALLOC_LIBS) $(LIBWBCLIENT_OBJ) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-	@rm -f $@.$(SONAME_VER)
-	@ln -s -f `basename $@` $@.$(SONAME_VER)
+		shared-libraries-disabled`basename $@`
+
+$(LIBWBCLIENT_SHARED_TARGET): $(LIBWBCLIENT_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` $@
 
 $(LIBWBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
@@ -1634,25 +1703,139 @@
 	@-$(AR) -rc $@ $(LIBWBCLIENT_OBJ0) $(WBCOMMON_OBJ)
 
-bin/libaddns.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBADDNS_OBJ) 
+libwbclient: $(LIBWBCLIENT)
+
+cleanlibwbclient::
+	-rm -f \
+		$(LIBWBCLIENT_SYMS) \
+		$(LIBWBCLIENT_STATIC_TARGET) \
+		$(LIBWBCLIENT_SHARED_TARGET) \
+		$(LIBWBCLIENT_SHARED_TARGET_SONAME)
+
+installlibwbclient:: installdirs libwbclient
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBWBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
+	-if test -e $(LIBWBCLIENT_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)` ; \
+	fi
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBWBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibwbclient::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBWBCLIENT_SHARED_TARGET_SONAME)`
+	-rm -f $(DESTDIR)${prefix}/include/wbclient.h
+
+libs:: libwbclient
+installlibs:: 
+uninstalllibs:: uninstalllibwbclient
+cleanlibs:: cleanlibwbclient
+shlibs test_shlibs: 
+
+
+#-------------------------------------------------------------------
+#
+# libaddns
+#
+#-------------------------------------------------------------------
+
+
+LIBADDNS_SHARED_TARGET=bin/libaddns.shared_libraries_disabled
+LIBADDNS_SOVER=0
+LIBADDNS_SHARED_TARGET_SONAME=$(LIBADDNS_SHARED_TARGET).$(LIBADDNS_SOVER)
+LIBADDNS_STATIC_TARGET=bin/libaddns.a
+LIBADDNS=$(LIBADDNS_STATIC_TARGET) 
+#LIBADDNS_SYMS=$(srcdir)/exports/libaddns.syms
+LIBADDNS_HEADERS=$(srcdir)/libaddns/addns.h
+
+$(LIBADDNS_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBADDNS_OBJ) 
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBADDNS_OBJ) $(LIBS) \
 		$(KRB5LIBS) $(UUID_LIBS) $(LIBTALLOC_LIBS) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-
-bin/libaddns.a: $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
+		shared-libraries-disabled`basename $@`
+
+$(LIBADDNS_SHARED_TARGET): $(LIBADDNS_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` $@
+
+$(LIBADDNS_STATIC_TARGET): $(BINARY_PREREQS) $(LIBADDNS_OBJ0)
 	@echo Linking non-shared library $@
 	@-$(AR) -rc $@ $(LIBADDNS_OBJ0)
 
+libaddns: $(LIBADDNS)
+
+cleanlibaddns::
+	-rm -f \
+		$(LIBADDNS_SHARED_TARGET) \
+		$(LIBADDNS_SHARED_TARGET_SONAME) \
+		$(LIBADDNS_STATIC_TARGET)
+
+installlibaddns:: installdirs libaddns
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBADDNS_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
+	-if test -e $(LIBADDNS_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBADDNS_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBADDNS_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+
+uninstalllibaddns::
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET_SONAME)`
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBADDNS_STATIC_TARGET)`
+
+libs:: libaddns
+installlibs:: 
+uninstalllibs:: 
+cleanlibs:: cleanlibaddns
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libnetapi
+#
+#-------------------------------------------------------------------
+
+LIBNETAPI_OBJ1 = lib/netapi/netapi.o \
+		 lib/netapi/cm.o \
+		 librpc/gen_ndr/ndr_libnetapi.o \
+		 lib/netapi/libnetapi.o \
+		 lib/netapi/joindomain.o \
+		 lib/netapi/serverinfo.o \
+		 lib/netapi/getdc.o \
+		 lib/netapi/user.o
+
+LIBNETAPI_OBJ  = $(LIBNETAPI_OBJ1) $(LIBNET_OBJ) \
+		 $(LIBSMBCONF_OBJ) \
+		 $(REG_SMBCONF_OBJ) \
+		 $(PARAM_WITHOUT_REG_OBJ) $(LIB_NONSMBD_OBJ) \
+		 $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \
+		 $(LIBMSRPC_OBJ) $(LIBMSRPC_GEN_OBJ) $(RPC_PARSE_OBJ) \
+		 $(PASSDB_OBJ) bin/libwbclient.a $(SMBLDAP_OBJ) $(GROUPDB_OBJ) $(LDB_OBJ) \
+		 $(DCUTIL_OBJ) $(LIBADS_OBJ) $(PRIVILEGES_BASIC_OBJ)
+
+LIBNETAPI_SHARED_TARGET=bin/libnetapi.shared_libraries_disabled
+LIBNETAPI_SOVER=0
+LIBNETAPI_SHARED_TARGET_SONAME=$(LIBNETAPI_SHARED_TARGET).$(LIBNETAPI_SOVER)
+LIBNETAPI_STATIC_TARGET=bin/libnetapi.a
+LIBNETAPI=$(LIBNETAPI_STATIC_TARGET) 
+LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.syms
+LIBNETAPI_HEADERS=$(srcdir)/lib/netapi/netapi.h
+
 $(LIBNETAPI_SYMS): $(LIBNETAPI_HEADERS)
 	@$(MKSYMS_SH) $(AWK) $@ $(LIBNETAPI_HEADERS)
 
-$(LIBNETAPI_SHARED_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS)   
+$(LIBNETAPI_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBNETAPI_OBJ) $(LIBNETAPI_SYMS)   
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBNETAPI_OBJ) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
 		$(LDAP_LIBS) $(KRB5LIBS) $(NSCD_LIBS) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-	@rm -f $@.$(SONAME_VER)
-	@ln -s -f `basename $@` $@.$(SONAME_VER)
+		shared-libraries-disabled`basename $@`
+
+$(LIBNETAPI_SHARED_TARGET): $(LIBNETAPI_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` $@
 
 $(LIBNETAPI_STATIC_TARGET): $(BINARY_PREREQS) $(LIBNETAPI_OBJ1)
@@ -1660,25 +1843,174 @@
 	@-$(AR) -rc $@ $(LIBNETAPI_OBJ1)
 
-bin/libsmbclient.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)   
+libnetapi: $(LIBNETAPI)
+
+cleanlibnetapi::
+	-rm -f \
+		$(LIBNETAPI_SYMS) \
+		$(LIBNETAPI_STATIC_TARGET) \
+		$(LIBNETAPI_SHARED_TARGET) \
+		$(LIBNETAPI_SHARED_TARGET_SONAME)
+
+installlibnetapi:: installdirs libnetapi
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
+	-if test -e $(LIBNETAPI_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBNETAPI_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
+
+uninstalllibnetapi::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_SHARED_TARGET_SONAME)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBNETAPI_STATIC_TARGET)`
+	-rm -f $(DESTDIR)${prefix}/include/netapi.h
+
+libs:: libnetapi
+installlibs:: installlibnetapi
+uninstalllibs:: uninstalllibnetapi
+cleanlibs:: cleanlibnetapi
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libsmbclient
+#
+#-------------------------------------------------------------------
+
+LIBSMBCLIENT_SHARED_TARGET=bin/libsmbclient.shared_libraries_disabled
+LIBSMBCLIENT_SOVER=0
+LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)
+LIBSMBCLIENT_STATIC_TARGET=bin/libsmbclient.a
+LIBSMBCLIENT=$(LIBSMBCLIENT_STATIC_TARGET) 
+#LIBSMBCLIENT_SYMS=$(srcdir)/exports/libsmbclient.syms
+LIBSMBCLIENT_HEADERS=$(srcdir)/include/libsmbclient.h
+
+$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ)   
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
 		$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(WINBIND_LIBS) $(LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-
-bin/libsmbclient.a: $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ0)
+		shared-libraries-disabled`basename $@`
+
+$(LIBSMBCLIENT_SHARED_TARGET): $(LIBSMBCLIENT_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` $@
+
+$(LIBSMBCLIENT_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ1)
 	@echo Linking non-shared library $@
-	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ0)
-
-bin/libsmbsharemodes.shared_libraries_disabled: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)  
+	@-$(AR) -rc $@ $(LIBSMBCLIENT_OBJ1)
+
+libsmbclient: $(LIBSMBCLIENT)
+
+cleanlibsmbclient::
+	-rm -f \
+		$(LIBSMBCLIENT_SHARED_TARGET) \
+		$(LIBSMBCLIENT_SHARED_TARGET_SONAME) \
+		$(LIBSMBCLIENT_STATIC_TARGET)
+
+installlibsmbclient:: installdirs libsmbclient
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBSMBCLIENT_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
+	-if test -e $(LIBSMBCLIENT_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBSMBCLIENT_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBCLIENT_HEADERS) $(DESTDIR)${prefix}/include
+
+installclientlib:: installlibsmbclient
+
+uninstalllibsmbclient::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_SHARED_TARGET_SONAME)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBCLIENT_STATIC_TARGET)`
+	-rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
+
+uninstallclientlib:: uninstalllibsmbclient
+
+libs:: libsmbclient
+installlibs:: installlibsmbclient
+uninstalllibs:: uninstalllibsmbclient
+cleanlibs:: cleanlibsmbclient
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libsmbsharemodes
+#
+#-------------------------------------------------------------------
+
+LIBSMBSHAREMODES_OBJ0 = libsmb/smb_share_modes.o
+
+LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0) bin/libtdb.a
+
+LIBSMBSHAREMODES_SHARED_TARGET=bin/libsmbsharemodes.shared_libraries_disabled
+LIBSMBSHAREMODES_SOVER=0
+LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER)
+LIBSMBSHAREMODES_STATIC_TARGET=bin/libsmbsharemodes.a
+LIBSMBSHAREMODES=$(LIBSMBSHAREMODES_STATIC_TARGET) 
+#LIBSMBSHAREMODES_SYMS=$(srcdir)/exports/libsmbsharemodes.syms
+LIBSMBSHAREMODES_HEADERS=$(srcdir)/include/smb_share_modes.h
+
+LIBSMBSHAREMODES=bin/libsmbsharemodes.a 
+
+$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ)  
 	@echo Linking shared library $@
 	@$(SHLD_DSO) $(LIBSMBSHAREMODES_OBJ) \
 		$(LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \
 		$(KRB5LIBS) $(LDAP_LIBS) \
-		shared-libraries-disabled`basename $@`.$(SONAME_VER)
-
-bin/libsmbsharemodes.a: $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
+		shared-libraries-disabled`basename $@`
+
+$(LIBSMBSHAREMODES_SHARED_TARGET): $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)
+	@rm -f $@
+	@ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` $@
+
+$(LIBSMBSHAREMODES_STATIC_TARGET): $(BINARY_PREREQS) $(LIBSMBSHAREMODES_OBJ0)
 	@echo Linking non-shared library $@
 	@-$(AR) -rc $@ $(LIBSMBSHAREMODES_OBJ0)
+
+libsmbsharemodes: $(LIBSMBSHAREMODES)
+
+cleanlibsmbsharemodes::
+	-rm -f \
+		$(LIBSMBSHAREMODES_SHARED_TARGET) \
+		$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) \
+		$(LIBSMBSHAREMODES_STATIC_TARGET)
+
+installlibsmbsharemodes:: installdirs libsmbsharemodes
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
+	-$(INSTALLLIBCMD_SH) $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+	@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
+	-if test -e $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME) ; then \
+		ln -s -f `basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)` \
+			$(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)` ; \
+	fi
+	-$(INSTALLLIBCMD_A) $(LIBSMBSHAREMODES_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
+	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
+	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBSMBSHAREMODES_HEADERS) $(DESTDIR)${prefix}/include
+
+uninstalllibsmbsharemodes::
+	-rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET)`
+	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)`
+	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/`basename $(LIBSMBSHAREMODES_STATIC_TARGET)`
+	-rm -f $(DESTDIR)${prefix}/include/smb_share_modes.h
+
+libs:: libsmbsharemodes
+installlibs:: installlibsmbsharemodes
+uninstalllibs:: uninstalllibsmbsharemodes
+cleanlibs:: cleanlibsmbsharemodes
+shlibs test_shlibs: 
+
+#-------------------------------------------------------------------
+#
+# libbigballofmud
+#
+#-------------------------------------------------------------------
 
 # This is probably wrong for anything other than the GNU linker.
@@ -1696,11 +2028,11 @@
 # library.
 
-libtalloc: $(LIBTALLOC)
-libtdb: $(LIBTDB)
-libsmbclient: $(LIBSMBCLIENT)
-libsmbsharemodes: $(LIBSMBSHAREMODES)
-libaddns: $(LIBADDNS)
-libwbclient: $(LIBWBCLIENT)
-libnetapi: $(LIBNETAPI)
+
+
+#####################################################################
+#
+# shared modules
+#
+#####################################################################
 
 # Linker command to link a RPC, VFS, AUTH, CHARSET or PASSDB module.
@@ -2080,12 +2412,9 @@
 	@$(CC) $(FLAGS) -o $@ $(DYNEXP) script/tests/timelimit.o
 
-install: installservers installbin   installman \
+install:: installservers installbin   installman \
 		installscripts installdat installmodules installswat \
-		installlibtalloc \
-		installlibtdb \
-		installclientlib  \
-		installlibsmbsharemodes  installlibnetapi
-
-install-everything: install installmodules
+		 installlibs
+
+install-everything:: install installmodules
 
 # DESTDIR is used here to prevent packagers wasting their time
@@ -2097,18 +2426,18 @@
 # is not used
 
-installdirs:
+installdirs::
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(SBINDIR) $(LIBDIR) $(VARDIR) $(PRIVATEDIR) $(PIDDIR) $(LOCKDIR) $(MANDIR)
 
-installservers: all installdirs
+installservers:: all installdirs
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
 
-installbin: all installdirs
+installbin:: all installdirs
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
 
-installcifsmount: 
+installcifsmount:: 
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR)
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) 
 
-installcifsspnego: 
+installcifsupcall:: 
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(ROOTSBINDIR)
 	@$(SHELL) script/installbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) 
@@ -2116,5 +2445,5 @@
 # Some symlinks are required for the 'probing' of modules.
 # This mechanism should go at some point..
-installmodules: modules installdirs
+installmodules:: modules installdirs
 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
 	@$(SHELL) $(srcdir)/script/installmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
@@ -2133,61 +2462,17 @@
 	@$(SHELL) $(srcdir)/script/linkmodules.sh $(DESTDIR)$(NSSINFOLIBDIR) ../idmap/ad.shared_libraries_disabled rfc2307.shared_libraries_disabled sfu.shared_libraries_disabled sfu20.shared_libraries_disabled
 
-installscripts: installdirs
+installscripts:: installdirs
 	@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
-installdat: installdirs
+installdat:: installdirs
 	@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
 
-installmsg: installdirs
+installmsg:: installdirs
 	@$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
 
-installswat: installdirs installmsg
+installswat:: installdirs installmsg
 	@$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
 
-installclientlib: installdirs libsmbclient
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) bin/libsmbclient.shared_libraries_disabled $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) bin/libsmbclient.a $(DESTDIR)$(LIBDIR)
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/libsmbclient.h $(DESTDIR)${prefix}/include
-
-installlibtalloc: installdirs libtalloc
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) $(LIBTALLOC_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTALLOC_HEADERS) $(DESTDIR)${prefix}/include
-
-installlibtdb: installdirs libtdb
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) $(LIBTDB_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(LIBTDB_HEADERS) $(DESTDIR)${prefix}/include
-
-installlibsmbsharemodes: installdirs libsmbsharemodes
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) bin/libsmbsharemodes.shared_libraries_disabled $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) bin/libsmbsharemodes.a $(DESTDIR)$(LIBDIR)
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/include/smb_share_modes.h $(DESTDIR)${prefix}/include
-
-installlibaddns: installdirs libaddns
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) bin/libaddns.shared_libraries_disabled $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) bin/libaddns.a $(DESTDIR)$(LIBDIR)
-
-installlibwbclient: installdirs libwbclient
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) bin/libwbclient.shared_libraries_disabled $(DESTDIR)$(LIBDIR)
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) ${prefix}/include
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/nsswitch/libwbclient/wbclient.h $(DESTDIR)${prefix}/include
-
-installlibnetapi: installdirs libnetapi
-	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(LIBDIR)
-	-$(INSTALLLIBCMD_SH) $(LIBNETAPI_SHARED_TARGET) $(DESTDIR)$(LIBDIR)
-	-$(INSTALLLIBCMD_A) $(LIBNETAPI_STATIC_TARGET) $(DESTDIR)$(LIBDIR)
-	-$(INSTALLCMD) -m $(INSTALLPERMS_DATA) $(srcdir)/lib/netapi/netapi.h $(DESTDIR)${prefix}/include
-
-installpammodules: $(PAM_MODULES)
+installpammodules:: $(PAM_MODULES)
 	@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(PAMMODULESDIR)
 	@for module in $(PAM_MODULES); do \
@@ -2198,14 +2483,14 @@
 
 # revert to the previously installed version
-revert:
+revert::
 	@$(SHELL) $(srcdir)/script/revert.sh $(SBINDIR) $(SBIN_PROGS)
 	@$(SHELL) $(srcdir)/script/revert.sh $(BINDIR) $(BIN_PROGS) $(SCRIPTS)
 
-installman: installdirs
+installman:: installdirs
 	@$(SHELL) $(srcdir)/script/installman.sh $(DESTDIR)$(MANDIR) $(srcdir) C ""
 
 .PHONY: showlayout
 
-showlayout:
+showlayout::
 	@echo "Samba will be installed into:"
 	@echo "  prefix:      $(prefix)"
@@ -2222,22 +2507,22 @@
 
 
-uninstall: uninstallman uninstallservers uninstallbin   uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibtalloc uninstalllibtdb uninstallclientlib   uninstalllibnetapi
-
-uninstallman:
+uninstall:: uninstallman uninstallservers uninstallbin   uninstallscripts uninstalldat uninstallswat uninstallmodules uninstalllibs 
+
+uninstallman::
 	@$(SHELL) $(srcdir)/script/uninstallman.sh $(DESTDIR)$(MANDIR) $(srcdir) C
 
-uninstallservers:
+uninstallservers::
 	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(SBINDIR) $(SBIN_PROGS)
 
-uninstallbin:
+uninstallbin::
 	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(BINDIR) $(BIN_PROGS)
 
-uninstallcifsmount:
+uninstallcifsmount::
 	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) 
 
-uninstallcifsspnego:
+uninstallcifsupcall::
 	@$(SHELL) script/uninstallbin.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(ROOTSBINDIR) 
 
-uninstallmodules:
+uninstallmodules::
 	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(VFSLIBDIR) $(VFS_MODULES)
 	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(PDBLIBDIR) $(PDB_MODULES)
@@ -2247,35 +2532,17 @@
 	@$(SHELL) $(srcdir)/script/uninstallmodules.sh $(INSTALLPERMS_BIN) $(DESTDIR) $(prefix) $(AUTHLIBDIR) $(AUTH_MODULES)
 
-uninstallscripts:
+uninstallscripts::
 	@$(SHELL) $(srcdir)/script/uninstallscripts.sh $(INSTALLPERMS_BIN) $(DESTDIR)$(BINDIR) $(SCRIPTS)
 
-uninstalldat:
+uninstalldat::
 	@$(SHELL) $(srcdir)/script/uninstalldat.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
-uninstallmsg:
+uninstallmsg::
 	@$(SHELL) $(srcdir)/script/uninstallmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
 
-uninstallswat: uninstallmsg
+uninstallswat:: uninstallmsg
 	@$(SHELL) $(srcdir)/script/uninstallswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
 
-uninstallclientlib:
-	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libsmbclient.shared_libraries_disabled
-	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbclient.a
-	-rm -f $(DESTDIR)${prefix}/include/libsmbclient.h
-
-uninstalllibsmbsharemodes:
-	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libsmbsharemodes.shared_libraries_disabled
-	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libsmbsharemodes.a
-
-uninstalllibaddns:
-	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libaddns.shared_libraries_disabled
-	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libaddns.a
-
-uninstalllibnetapi:
-	-$(UNINSTALLLIBCMD_SH) $(DESTDIR)$(LIBDIR)/libnetapi.shared_libraries_disabled
-	-$(UNINSTALLLIBCMD_A) $(DESTDIR)$(LIBDIR)/libnetapi.a
-	-rm -f $(DESTDIR)${prefix}/include/netapi.h
-
-uninstallpammodules:
+uninstallpammodules::
 	@for module in $(PAM_MODULES); do \
 		echo "Removing $(DESTDIR)/$(PAMMODULESDIR)/$${module}.shared_libraries_disabled "; \
@@ -2286,5 +2553,5 @@
 TOPFILES=dynconfig.o
 
-clean: delheaders 
+clean:: delheaders cleanlibs
 	-rm -f $(PRECOMPILED_HEADER)
 	-rm -f core */*~ *~ \
@@ -2294,9 +2561,7 @@
 		$(TOPFILES) $(BIN_PROGS) $(SBIN_PROGS) $(ROOT_SBIN_PROGS) \
 		$(MODULES) $(TORTURE_PROGS) \
-		$(LIBTALLOC) $(LIBSMBCLIENT) $(LIBADDNS) \
-		$(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBNETAPI) \
-		bin/libwbclient.so.0 bin/timelimit \
-		.headers.stamp */src/*.o proto_exists \
-		$(LIBTALLOC_SYMS) $(LIBWBCLIENT_SYMS) $(LIBTDB_SYMS) $(LIBNETAPI_SYMS)
+		$(EVERYTHING_PROGS) \
+		bin/timelimit \
+		.headers.stamp */src/*.o proto_exists
 	-rm -rf t_dir
 
@@ -2305,5 +2570,5 @@
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
-proto_exists: include/proto.h include/build_env.h \
+proto_exists:: include/proto.h include/build_env.h \
 	winbindd/winbindd_proto.h web/swat_proto.h \
 	libnet/libnet_proto.h \
@@ -2311,5 +2576,5 @@
 	@touch proto_exists
 
-delheaders:
+delheaders::
 	@echo Removing prototype headers
 	@rm -f include/proto.h include/build_env.h \
@@ -2370,5 +2635,5 @@
 # make sure these commands are executed in sequence even for a
 # parallel make.
-headers:
+headers::
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
@@ -2383,5 +2648,5 @@
 	$(MAKE) libnet/libnet_proto.h;
 
-proto: headers
+proto:: headers
 
 .PHONY: headers proto
@@ -2393,9 +2658,9 @@
 	ctags `find $(srcdir) -name "*.[ch]" | grep -v /.svn/`
 
-realclean: clean delheaders
+realclean:: clean delheaders
 	-rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh
 	-rm -f script/installbin.sh script/uninstallbin.sh
 
-distclean: realclean
+distclean:: realclean
 	-rm -f smbadduser
 	-rm -f include/config.h Makefile
@@ -2403,5 +2668,5 @@
 	-rm -rf .deps TAGS
 
-realdistclean: distclean
+realdistclean:: distclean
 	-rm -f include/config.h.in
 	-rm -f include/version.h
@@ -2411,5 +2676,5 @@
 # range of machines and is used to produce a list of potentially
 # dead (ie. unused) functions in the code. (tridge)
-finddead:
+finddead::
 	nm */*.o |grep 'U ' | awk '{print $$2}' | sort -u > nmused.txt
 	nm */*.o |grep 'T ' | awk '{print $$3}' | sort -u > nmfns.txt
@@ -2431,14 +2696,14 @@
 
 # Check shared libs for unresolved symbols
-test_shlibs: $(SHLIBS)
-	@echo "Testing $(SHLIBS) "
+test_shlibs:
+	@echo "Testing $? "
 	@export $(LIB_PATH_VAR)=./bin && \
-	for module in $(SHLIBS); do \
-		./script/tests/dlopen.sh bin/$${module}.shared_libraries_disabled \
+	for module in $?; do \
+		./script/tests/dlopen.sh $${module} \
 			|| exit 1; \
 	done
 
 # Check for NSS module problems.
-test_nss_modules: nss_modules
+test_nss_modules:: nss_modules
 	@echo "Testing $(NSS_MODULES) "
 	@export $(LIB_PATH_VAR)=./bin && \
@@ -2450,5 +2715,5 @@
 # Check for PAM module problems.  Specifically, check that every module we
 # built can actually be loaded by a minimal PAM-aware application.
-test_pam_modules: pam_modules
+test_pam_modules:: pam_modules
 	@echo "Testing $(PAM_MODULES) "
 	@export $(LIB_PATH_VAR)=./bin && \
@@ -2462,9 +2727,9 @@
 ## Targets for 'make test'
 ##
-test: all torture timelimit
+test:: all torture timelimit
 	@echo Running Test suite
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) PERL="$(PERL)" $(srcdir)/script/tests/selftest.sh ${selftest_prefix} all "${smbtorture4_path}"
 
-valgrindtest: all torture timelimit
+valgrindtest:: all torture timelimit
 	@echo Running Test suite with valgrind
 	@LIB_PATH_VAR=$(LIB_PATH_VAR) \
Index: branches/samba-3.2.x/source/VERSION
===================================================================
--- branches/samba-3.2.x/source/VERSION	(revision 200)
+++ branches/samba-3.2.x/source/VERSION	(revision 201)
@@ -26,5 +26,5 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=2
-SAMBA_VERSION_RELEASE=2
+SAMBA_VERSION_RELEASE=3
 
 ########################################################
Index: branches/samba-3.2.x/source/groupdb/mapping_ldb.c
===================================================================
--- branches/samba-3.2.x/source/groupdb/mapping_ldb.c	(revision 200)
+++ branches/samba-3.2.x/source/groupdb/mapping_ldb.c	(revision 201)
@@ -75,5 +75,11 @@
 		goto failed;
 	}
-	
+
+	/* force the permissions on the ldb to 0600 - this will fix
+	   existing databases as well as new ones */
+	if (chmod(db_path, 0600) != 0) {
+		goto failed;
+	}
+
 	if (!existed) {
 		/* initialise the ldb with an index */
Index: branches/samba-3.2.x/source/include/proto.h
===================================================================
--- branches/samba-3.2.x/source/include/proto.h	(revision 200)
+++ branches/samba-3.2.x/source/include/proto.h	(revision 201)
@@ -663,4 +663,15 @@
 	       bool is_case_sensitive);
 int gen_fnmatch(const char *pattern, const char *string);
+
+/* The following definitions come from lib/os2ea.c  */
+
+int os2_ftruncate(int fd, off_t size);
+int os2_isattribute(char *path, unsigned short attr);
+void os2_randget(char * buffer, int length);
+void maperrno(int rc);
+ssize_t unigetxattr (const char *path, int file, const char *name, void *value, size_t size);
+ssize_t unilistxattr (const char *path, int file, char *list, size_t size);
+int uniremovexattr (const char *path, int file, const char *name);
+int unisetxattr (const char *path, int file, const char *name, const void *value, size_t size, int flags);
 
 /* The following definitions come from lib/pam_errors.c  */
Index: branches/samba-3.2.x/source/include/version.h
===================================================================
--- branches/samba-3.2.x/source/include/version.h	(revision 200)
+++ branches/samba-3.2.x/source/include/version.h	(revision 201)
@@ -2,5 +2,5 @@
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 2
-#define SAMBA_VERSION_RELEASE 2
-#define SAMBA_VERSION_OFFICIAL_STRING "3.2.2"
+#define SAMBA_VERSION_RELEASE 3
+#define SAMBA_VERSION_OFFICIAL_STRING "3.2.3"
 #define SAMBA_VERSION_STRING samba_version_string()
Index: branches/samba-3.2.x/source/lib/ldb/common/ldb.c
===================================================================
--- branches/samba-3.2.x/source/lib/ldb/common/ldb.c	(revision 200)
+++ branches/samba-3.2.x/source/lib/ldb/common/ldb.c	(revision 201)
@@ -52,5 +52,5 @@
 
 	ldb_set_utf8_default(ldb);
-	ldb_set_create_perms(ldb, 0666);
+	ldb_set_create_perms(ldb, 0600);
 
 	return ldb;
Index: branches/samba-3.2.x/source/script/findsmb
===================================================================
--- branches/samba-3.2.x/source/script/findsmb	(revision 200)
+++ branches/samba-3.2.x/source/script/findsmb	(revision 201)
@@ -1,3 +1,3 @@
-#!e:/Perl/bin/perl.exe
+#!u:/Perl/bin/perl.exe
 #
 # Prints info on all smb responding machines on a subnet.
Index: branches/samba-3.2.x/source/smbd/build_options.c
===================================================================
--- branches/samba-3.2.x/source/smbd/build_options.c	(revision 200)
+++ branches/samba-3.2.x/source/smbd/build_options.c	(revision 201)
@@ -1276,4 +1276,7 @@
 	output(screen, "   HAVE_KRB5_AUTH_CON_SETUSERUSERKEY\n");
 #endif
+#ifdef HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE
+	output(screen, "   HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE\n");
+#endif
 #ifdef HAVE_KRB5_CRYPTO
 	output(screen, "   HAVE_KRB5_CRYPTO\n");
@@ -1323,4 +1326,7 @@
 #ifdef HAVE_KRB5_FREE_UNPARSED_NAME
 	output(screen, "   HAVE_KRB5_FREE_UNPARSED_NAME\n");
+#endif
+#ifdef HAVE_KRB5_FWD_TGT_CREDS
+	output(screen, "   HAVE_KRB5_FWD_TGT_CREDS\n");
 #endif
 #ifdef HAVE_KRB5_GET_DEFAULT_IN_TKT_ETYPES
@@ -2450,6 +2456,6 @@
 	output(screen, "   WITH_CIFSMOUNT\n");
 #endif
-#ifdef WITH_CIFSSPNEGO
-	output(screen, "   WITH_CIFSSPNEGO\n");
+#ifdef WITH_CIFSUPCALL
+	output(screen, "   WITH_CIFSUPCALL\n");
 #endif
 #ifdef WITH_DFS
@@ -2826,6 +2832,6 @@
 	output(screen, "   WITH_CIFSMOUNT\n");
 #endif
-#ifdef WITH_CIFSSPNEGO
-	output(screen, "   WITH_CIFSSPNEGO\n");
+#ifdef WITH_CIFSUPCALL
+	output(screen, "   WITH_CIFSUPCALL\n");
 #endif
 #ifdef WITH_DFS
