Merge commit 'origin/v3-2-test' into v3-2-stable

Conflicts:

	WHATSNEW.txt
(This used to be commit a390bcf9403df4cf4d5eef42b35ebccbe253882e)

diff --cc WHATSNEW.txt
index 253fe260ded46f1118ee5c694b2b202ce2af33cd,76a66b3d297910ff484999d6b403514da9be3afd..2ac227d141ffcb696d58d92e94b637bdf7c1c658
--- 1/WHATSNEW.txt
--- 2/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@@ -109,16 -114,19 +114,20 @@@ smb.conf change
      client plaintext auth             Changed Default No
      clustering                                New             No
      cluster addresses                 New             ""
-     debug class                         New             No
+     config backend                    New             file
      ctdb socket                               New             ""
+     debug class                               New             No
+     hidden                            New             No
      lanman auth                               Changed Default No
-     mangle map                          Removed
-     min receive file size                New             0
-     open files database hash size     Removed
-     read bmpx                           Removed
+     ldap debug level                  New             0
+     ldap debug threshold              New             10
+     mangle map                                Removed
++    min receive file size             New             0
+     open files database hashsize      Removed
+     read bmpx                         Removed                         
      registry shares                   New             No
-     winbind expand groups               New             1
-     winbind rpc only                    New             No
+     winbind expand groups             New             1
+     winbind rpc only                  New             No
  
  
  Changes since 3.2.0pre1:
@@@ -179,12 -210,24 +211,24 @@@ o   Volker Lendecke <vl@samba.org
  
  
  o   Stefan Metzmacher <metze@samba.org>
 -    * Fixes for libreplace.
 +    * Refactor Winbind internal parent-child interface tables
 +      to achieve better unit testing support.
 +    * Add nss_wrapper API for local Winbind unit tests.
 +    * Networking fixes to the libreplace library.
      * Pidl fixes.
 -    * Add nss_wrapper support.
 -    * Start and test winbindd by 'make test'.
 -    * Split up child_dispatch_table into domain, idmap and locator tables
 -      in winbindd.
 +    * Remove unused Winbind pipe calls.
+     * Build fixes.
+     * Fix for a crash bug in pidl generated client code.
+       This could have happend with [in,out,unique] pointers
+       when the client sends a valid pointer, but the server
+       responds with a NULL pointer (as samba-3.0.26a does for some calls).
+     * Change NTSTATUS into enum ndr_err_code in librpc/ndr.
+     * Remove unused calls in the struct based winbindd protocol.
+     * Add --configfile option to wbinfo.
+     * Convert winbind_env_set(), winbind_on() and winbind_off() into macros.
+     * Return rids and other_sids arrays in WBFLAG_PAM_INFO3_TEXT mode.
+     * Implement wbcErrorString() and wbcAuthenticateUserEx().
+     * Convert auth_winbind to use wbcAuthenticateUserEx().
  
  
  o   James Peach <jpeach@samba.org>
@@@ -195,6 -238,9 +239,8 @@@
  o   Andreas Schneider <anschneider@suse.de>
      * Don't restart winbind if a corrupted tdb is found during
        initialization.
 -    * Fix crashbug in winbindd.
+     * Fix Windows 2008 (Longhorn) join.
+     * Add share parameter "hidden".
  
  
  o   Karolin Seeger <ks@sernet.de>