Index: /branches/samba-3.5.x/README.contributing
===================================================================
--- /branches/samba-3.5.x/README.contributing	(revision 732)
+++ /branches/samba-3.5.x/README.contributing	(revision 732)
@@ -0,0 +1,120 @@
+How to contribute a patch to Samba
+----------------------------------
+
+Simple, just make the code change, and email it as either a "diff -u"
+change, or as a "git format-patch" change against the original source
+code to samba-technical@samba.org, or attach it to a bug report at
+http://bugzilla.samba.org
+
+For larger code changes, breaking the changes up into a set of simple
+patches, each of which does a single thing, are much easier to review.
+Patch sets like that will most likely have an easier time being merged
+into the Samba code than large single patches that make lots of
+changes in one large diff.
+
+Ownership of the contributed code
+---------------------------------
+
+Samba is a project with distributed copyright ownership, which means
+we prefer the copyright on parts of Samba to be held by individuals
+rather than corporations if possible. There are historical legal
+reasons for this, but one of the best ways to explain it is that it's
+much easier to work with individuals who have ownership than corporate
+legal departments if we ever need to make reasonable compromises with
+people using and working with Samba.
+
+We track the ownership of every part of Samba via git, our source code
+control system, so we know the provenance of every piece of code that
+is committed to Samba.
+
+So if possible, if you're doing Samba changes on behalf of a company
+who normally owns all the work you do please get them to assign
+personal copyright ownership of your changes to you as an individual,
+that makes things very easy for us to work with and avoids bringing
+corporate legal departments into the picture.
+
+If you can't do this we can still accept patches from you owned by
+your employer under a standard employment contract with corporate
+copyright ownership. It just requires a simple set-up process first.
+
+We use a process very similar to the way things are done in the Linux
+kernel community, so it should be very easy to get a sign off from
+your corporate legal department. The only changes we've made are to
+accommodate the licenses we use, which are GPLv3 and LGPLv3 (or later)
+whereas the Linux kernel uses GPLv2.
+
+The process is called signing.
+
+How to sign your work
+---------------------
+
+Once you have permission to contribute to Samba from
+your employer, simply email a copy of the following text
+from your corporate email address to contributing@samba.org
+
+------------------------------------------------------------
+Samba Developer's Certificate of Origin. Version 1.0
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+    have the right to submit it under the appropriate
+    version of the GNU General Public License; or
+
+(b) The contribution is based upon previous work that, to the best
+    of my knowledge, is covered under an appropriate open source
+    license and I have the right under that license to submit that
+    work with modifications, whether created in whole or in part
+    by me, under the GNU General Public License, in the
+    appropriate version; or
+
+(c) The contribution was provided directly to me by some other
+    person who certified (a) or (b) and I have not modified
+    it.
+
+(d) I understand and agree that this project and the
+    contribution are public and that a record of the
+    contribution (including all metadata and personal
+    information I submit with it, including my sign-off) is
+    maintained indefinitely and may be redistributed
+    consistent with the Samba Team's policies and the
+    requirements of the GNU GPL where they are relevant.
+
+(e) I am granting this work to this project under the terms of both
+    the GNU General Public License and the GNU Lesser General Public
+    License as published by the Free Software Foundation; either version
+    3 of these Licenses, or (at the option of the project) any later
+    version.
+
+    http://www.gnu.org/licenses/gpl-3.0.html
+    http://www.gnu.org/licenses/lgpl-3.0.html
+------------------------------------------------------------
+
+We will maintain a copy of that email as a record that you have the
+rights to contribute code to Samba under the required licenses whilst
+working for the company where the email came from.
+
+Then when sending in a patch via the normal mechanisms described
+above, add a line that states:
+
+Signed-off-by: Random J Developer <random@developer.example.org>
+
+using your real name and the email address you sent the original email
+you used to send the Samba Developer's Certificate of Origin to us
+(sorry, no pseudonyms or anonymous contributions.)
+
+That's it ! Such code can then quite happily contain changes that have
+copyright messages such as :
+
+        (C) Example Corporation.
+
+and can be merged into the Samba codebase in the same way as patches
+from any other individual. You don't need to send in a copy of the
+Samba Developer's Certificate of Origin for each patch, or inside each
+patch. Just the sign-off message is all that is required once we've
+received the initial email.
+
+Have fun and happy Samba hacking !
+
+The Samba Team.
+
Index: /branches/samba-3.5.x/WHATSNEW.txt
===================================================================
--- /branches/samba-3.5.x/WHATSNEW.txt	(revision 731)
+++ /branches/samba-3.5.x/WHATSNEW.txt	(revision 732)
@@ -1,2 +1,100 @@
+                   ==============================
+                   Release Notes for Samba 3.5.12
+			  November 2, 2011
+                   ==============================
+
+
+This is the latest stable release of Samba 3.5.
+
+Major enhancements in Samba 3.5.12 include:
+
+o  Fix race condition in Winbind (bug 7844).
+o  The VFS ACL modules are no longer experimental but production-ready.
+
+
+Changes since 3.5.11:
+--------------------
+
+
+o   Jeremy Allison <jra@samba.org>
+    * BUG 7509: smb_acl_to_posix: ACL is invalid for set (Invalid argument).
+    * BUG 7551: Return error of cli_push when 'put - /some/file' is used.
+    * BUG 8156: 'net ads join' fails to use the user's kerberos ticket.
+    * BUG 8370: Fix vfs_chown_fsp.
+    * BUG 8422: Fix infinite loop in ACL module code.
+    * BUG 8443: Be smarter about setting default permissions when a ACL_USER_OBJ
+      isn't given.
+    * BUG 8458: IE9 on Windows 7 cannot download files to samba 3.5.11 share.
+    * BUG 8493: DFS breaks zip file extracting unless "follow symlinks = no"
+      set.
+    * BUG 8507: Make smbd correctly honor the "force create mode" bits from a
+      cifsfs create.
+    * BUG 8541: Fix readlink() on Linux clients if the symlink target is
+      outside of the share.
+    * BUG 8542: smbclient posix_open command fails to return correct info on
+      open file.
+
+
+o   Pierre Carrier <pcarrier@redhat.com>
+    * BUG 8186: Allow changing the maximum number of simultaneous clients in
+      Winbind through an smb.conf option.
+
+
+o   GÃŒnther Deschner <gd@samba.org>
+    * BUG 7465: Fix 'net ads join -k' when KRB5CCNAME is not set.
+    * BUG 7888: Deal with buggy 3.0 based PDCs.
+    * BUG 8491: Fix some coverity issues.
+
+
+o   David Disseldorp <ddiss@suse.de>
+    * BUG 8480: acl_xattr can free an invalid pointer if no blob is loaded.
+
+
+o   BjÃ¶rn Jacke <bj@sernet.de>
+    * BUG 8256: Add man vfs_aio_fork.
+    * BUG 8362: Fix SWAT build issue on old glibc systems.
+    * BUG 8531: Make DSO_EXPORTS_CMD more portable.
+
+
+o   Volodymyr Khomenko <Volodymyr_Khomenko@dell.com>
+    * BUG 8515: Disallow "." in can_set_delete_on_close().
+
+
+o   Volker Lendecke <vl@samba.org>
+    * BUG 7844: Fix race condition in Winbind.
+    * BUG 8338: Add a fallback for missing open&x support in OS/X Lion.
+    * BUG 8420: Fix getent group if trusted domains are not reachable.
+
+
+o   Stefan Metzmacher <metze@samba.org
+    * BUG 8347: Fix regression on HP-UX, AIX and OSF introduced by the fix for
+      CVE-2011-2522.
+    * BUG 8452: Check the wct of the incoming SMBnegprot responses in libsmb.
+    * BUG 8491: Fix some coverity issues.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.5 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
                    ==============================
                    Release Notes for Samba 3.5.11
@@ -10,6 +108,5 @@
 
 o  Fix access to Samba shares when Windows security patch KB2536276 is installed
-   (bug #7460).
-o  Fix DoS in Winbind and smbd with many file descriptors open (bug #7949).
+   (bug #8238).
 o  Fix Winbind panics if verify_idpool() fails (bug #8253).
 
@@ -46,5 +143,4 @@
 o   Stefan Metzmacher <metze@samba.org>
     * BUG 7841: Make WINBINDD_LOOKUPRIDS ask the right domain.
-    * BUG 7949: Fix DoS in Winbind and smbd with many file descriptors open.
     * BUG 8276: Close all sockets attached to a subnet in close_subnet().
 
@@ -70,6 +166,6 @@
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    ==============================
Index: /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_tdb.8.xml
===================================================================
--- /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_tdb.8.xml	(revision 731)
+++ /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_tdb.8.xml	(revision 732)
@@ -41,8 +41,4 @@
 	</para>
 
-	<para>Please note that this module is
-	<emphasis>experimental</emphasis>!
-	</para>
-
 	<para>This module is stackable.</para>
 </refsect1>
Index: /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_xattr.8.xml
===================================================================
--- /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_xattr.8.xml	(revision 731)
+++ /branches/samba-3.5.x/docs-xml/manpages-3/vfs_acl_xattr.8.xml	(revision 732)
@@ -45,8 +45,4 @@
 	</para>
 
-	<para>Please note that this module is
-	<emphasis>experimental</emphasis>!
-	</para>
-
 	<para>This module is stackable.</para>
 </refsect1>
Index: /branches/samba-3.5.x/docs-xml/manpages-3/vfs_aio_fork.8.xml
===================================================================
--- /branches/samba-3.5.x/docs-xml/manpages-3/vfs_aio_fork.8.xml	(revision 732)
+++ /branches/samba-3.5.x/docs-xml/manpages-3/vfs_aio_fork.8.xml	(revision 732)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="vfs_aio_fork.8">
+
+<refmeta>
+	<refentrytitle>vfs_aio_fork</refentrytitle>
+	<manvolnum>8</manvolnum>
+	<refmiscinfo class="source">Samba</refmiscinfo>
+	<refmiscinfo class="manual">System Administration tools</refmiscinfo>
+	<refmiscinfo class="version">3.5</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+	<refname>vfs_aio_fork</refname>
+	<refpurpose>implement async I/O in Samba vfs</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+	<cmdsynopsis>
+		<command>vfs objects = aio_fork</command>
+	</cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+	<title>DESCRIPTION</title>
+
+	<para>This VFS module is part of the
+	<citerefentry><refentrytitle>samba</refentrytitle>
+	<manvolnum>7</manvolnum></citerefentry> suite.</para>
+
+	<para>The <command>aio_fork</command> VFS module enables async
+	I/O for Samba on platforms where the system level Posix AIO
+	interface is insufficient. Posix AIO can suffer from severe
+	limitations.  For example, on some Linux versions the
+	real-time signals that it uses are broken under heavy load.
+	Other systems only allow AIO when special kernel modules are
+	loaded or only allow a certain system-wide amount of async
+	requests being scheduled. Systems based on glibc (most Linux
+	systems) only allow a single outstanding request per file
+	descriptor.  </para>
+
+	<para>To work around all these limitations, the aio_fork module
+	was written. It uses forked helper processes instead of the
+	internal Posix AIO interface to create asynchronousity for
+	read and write calls. It has no parameters, it will create
+	helper processes when async requests come in as needed. Idle
+	helper processes will be removed every 30 seconds.
+	</para>
+
+	<para>This module is stackable.</para>
+
+</refsect1>
+
+
+<refsect1>
+	<title>EXAMPLES</title>
+
+	<para>Straight forward use:</para>
+
+<programlisting>
+        <smbconfsection name="[cooldata]"/>
+	<smbconfoption name="path">/data/ice</smbconfoption>
+	<smbconfoption name="vfs objects">aio_fork</smbconfoption>
+</programlisting>
+
+</refsect1>
+
+<refsect1>
+	<title>VERSION</title>
+
+	<para>This man page is correct for version 3.5.0 of the Samba suite.
+	</para>
+</refsect1>
+
+<refsect1>
+	<title>AUTHOR</title>
+
+	<para>The original Samba software and related utilities
+	were created by Andrew Tridgell. Samba is now developed
+	by the Samba Team as an Open Source project similar
+	to the way the Linux kernel is developed.</para>
+
+</refsect1>
+
+</refentry>
Index: /branches/samba-3.5.x/docs-xml/smbdotconf/winbind/winbindmaxclients.xml
===================================================================
--- /branches/samba-3.5.x/docs-xml/smbdotconf/winbind/winbindmaxclients.xml	(revision 732)
+++ /branches/samba-3.5.x/docs-xml/smbdotconf/winbind/winbindmaxclients.xml	(revision 732)
@@ -0,0 +1,14 @@
+<samba:parameter name="winbind max clients"
+                 context="G"
+				 type="integer"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+	<para>This parameter specifies the maximum number of clients
+	the <citerefentry><refentrytitle>winbindd</refentrytitle>
+	<manvolnum>8</manvolnum></citerefentry> daemon can connect with.
+	</para>
+</description>
+
+<value type="default">200</value>
+</samba:parameter>
Index: /branches/samba-3.5.x/docs/manpages/cifs.upcall.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/cifs.upcall.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/cifs.upcall.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "CIFS\&.UPCALL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "CIFS\&.UPCALL" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/eventlogadm.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/eventlogadm.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/eventlogadm.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "EVENTLOGADM" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/findsmb.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/findsmb.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/findsmb.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "FINDSMB" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_ad.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_ad.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_ad.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_AD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_adex.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_adex.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_adex.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_hash.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_hash.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_hash.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_HASH" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_ldap.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_ldap.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_ldap.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_nss.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_nss.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_nss.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_NSS" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_rid.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_rid.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_rid.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_RID" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_tdb.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_tdb.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_tdb.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_TDB" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/idmap_tdb2.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/idmap_tdb2.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/idmap_tdb2.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldb.3
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldb.3	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldb.3	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: C Library Functions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDB" "3" "08/02/2011" "Samba 3\&.5" "C Library Functions"
+.TH "LDB" "3" "10/24/2011" "Samba 3\&.5" "C Library Functions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbadd.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbadd.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbadd.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBADD" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBADD" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbdel.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbdel.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbdel.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBDEL" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBDEL" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbedit.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbedit.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbedit.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBEDIT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBEDIT" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbmodify.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbmodify.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbmodify.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBMODIFY" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBMODIFY" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbrename.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbrename.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbrename.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBRENAME" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBRENAME" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ldbsearch.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ldbsearch.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ldbsearch.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBSEARCH" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBSEARCH" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/libsmbclient.7
===================================================================
--- /branches/samba-3.5.x/docs/manpages/libsmbclient.7	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/libsmbclient.7	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: 7
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "08/02/2011" "Samba 3\&.5" "7"
+.TH "LIBSMBCLIENT" "7" "10/24/2011" "Samba 3\&.5" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/lmhosts.5
===================================================================
--- /branches/samba-3.5.x/docs/manpages/lmhosts.5	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/lmhosts.5	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "10/24/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/log2pcap.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/log2pcap.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/log2pcap.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "LOG2PCAP" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/mount.cifs.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/mount.cifs.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/mount.cifs.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "MOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "MOUNT\&.CIFS" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/net.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/net.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/net.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NET" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "NET" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/nmbd.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/nmbd.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/nmbd.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "NMBD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/nmblookup.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/nmblookup.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/nmblookup.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "NMBLOOKUP" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/ntlm_auth.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/ntlm_auth.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/ntlm_auth.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "NTLM_AUTH" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/pam_winbind.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/pam_winbind.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/pam_winbind.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: 8
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "08/02/2011" "Samba 3\&.5" "8"
+.TH "PAM_WINBIND" "8" "10/24/2011" "Samba 3\&.5" "8"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/pam_winbind.conf.5
===================================================================
--- /branches/samba-3.5.x/docs/manpages/pam_winbind.conf.5	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/pam_winbind.conf.5	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "08/02/2011" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "10/24/2011" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/pdbedit.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/pdbedit.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/pdbedit.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "PDBEDIT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/profiles.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/profiles.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/profiles.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "PROFILES" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/rpcclient.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/rpcclient.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/rpcclient.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "RPCCLIENT" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/samba.7
===================================================================
--- /branches/samba-3.5.x/docs/manpages/samba.7	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/samba.7	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "08/02/2011" "Samba 3\&.5" "Miscellanea"
+.TH "SAMBA" "7" "10/24/2011" "Samba 3\&.5" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/sharesec.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/sharesec.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/sharesec.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SHARESEC" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smb.conf.5
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smb.conf.5	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smb.conf.5	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "10/24/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
@@ -10240,4 +10240,16 @@
 .RE
 
+winbind max clients (G)
+.\" winbind max clients
+.PP
+.RS 4
+This parameter specifies the maximum number of clients the
+\fBwinbindd\fR(8)
+daemon can connect with\&.
+.sp
+Default:
+\fI\fIwinbind max clients\fR\fR\fI = \fR\fI200\fR\fI \fR
+.RE
+
 winbind nested groups (G)
 .\" winbind nested groups
Index: /branches/samba-3.5.x/docs/manpages/smbcacls.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbcacls.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbcacls.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCACLS" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbclient.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbclient.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbclient.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCLIENT" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbcontrol.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbcontrol.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbcontrol.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCONTROL" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbcquotas.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbcquotas.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbcquotas.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCQUOTAS" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbd.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbd.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbd.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbget.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbget.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbget.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBGET" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbgetrc.5
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbgetrc.5	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbgetrc.5	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "10/24/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbpasswd.5
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbpasswd.5	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbpasswd.5	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "10/24/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbpasswd.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbpasswd.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbpasswd.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBPASSWD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbspool.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbspool.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbspool.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBSPOOL" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbstatus.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbstatus.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbstatus.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBSTATUS" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbtar.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbtar.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbtar.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBTAR" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/smbtree.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/smbtree.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/smbtree.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBTREE" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/swat.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/swat.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/swat.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SWAT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/tdbbackup.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/tdbbackup.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/tdbbackup.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBBACKUP" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/tdbdump.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/tdbdump.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/tdbdump.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBDUMP" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/tdbtool.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/tdbtool.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/tdbtool.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBTOOL" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/testparm.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/testparm.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/testparm.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "TESTPARM" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/umount.cifs.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/umount.cifs.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/umount.cifs.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "UMOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "UMOUNT\&.CIFS" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_acl_tdb.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_acl_tdb.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_acl_tdb.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
@@ -37,7 +37,4 @@
 $LOCKDIR/file_ntacls\&.tdb\&.
 .PP
-Please note that this module is
-\fIexperimental\fR!
-.PP
 This module is stackable\&.
 .SH "OPTIONS"
Index: /branches/samba-3.5.x/docs/manpages/vfs_acl_xattr.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_acl_xattr.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_acl_xattr.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
@@ -42,7 +42,4 @@
 getfattr \-n security\&.NTACL filename)\&.
 .PP
-Please note that this module is
-\fIexperimental\fR!
-.PP
 This module is stackable\&.
 .SH "OPTIONS"
Index: /branches/samba-3.5.x/docs/manpages/vfs_aio_fork.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_aio_fork.8	(revision 732)
+++ /branches/samba-3.5.x/docs/manpages/vfs_aio_fork.8	(revision 732)
@@ -0,0 +1,59 @@
+'\" t
+.\"     Title: vfs_aio_fork
+.\"    Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
+.\"      Date: 10/24/2011
+.\"    Manual: System Administration tools
+.\"    Source: Samba 3.5
+.\"  Language: English
+.\"
+.TH "VFS_AIO_FORK" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "NAME"
+vfs_aio_fork \- implement async I/O in Samba vfs
+.SH "SYNOPSIS"
+.HP \w'\ 'u
+vfs objects = aio_fork
+.SH "DESCRIPTION"
+.PP
+This VFS module is part of the
+\fBsamba\fR(7)
+suite\&.
+.PP
+The
+aio_fork
+VFS module enables async I/O for Samba on platforms where the system level Posix AIO interface is insufficient\&. Posix AIO can suffer from severe limitations\&. For example, on some Linux versions the real\-time signals that it uses are broken under heavy load\&. Other systems only allow AIO when special kernel modules are loaded or only allow a certain system\-wide amount of async requests being scheduled\&. Systems based on glibc (most Linux systems) only allow a single outstanding request per file descriptor\&.
+.PP
+To work around all these limitations, the aio_fork module was written\&. It uses forked helper processes instead of the internal Posix AIO interface to create asynchronousity for read and write calls\&. It has no parameters, it will create helper processes when async requests come in as needed\&. Idle helper processes will be removed every 30 seconds\&.
+.PP
+This module is stackable\&.
+.SH "EXAMPLES"
+.PP
+Straight forward use:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+        \fI[cooldata]\fR
+	\m[blue]\fBpath = /data/ice\fR\m[]
+	\m[blue]\fBvfs objects = aio_fork\fR\m[]
+.fi
+.if n \{\
+.RE
+.\}
+.SH "VERSION"
+.PP
+This man page is correct for version 3\&.5\&.0 of the Samba suite\&.
+.SH "AUTHOR"
+.PP
+The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
Index: /branches/samba-3.5.x/docs/manpages/vfs_audit.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_audit.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_audit.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_AUDIT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_cacheprime.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_cacheprime.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_cacheprime.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_cap.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_cap.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_cap.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CAP" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_catia.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_catia.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_catia.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CATIA" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_commit.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_commit.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_commit.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_COMMIT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_default_quota.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_default_quota.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_default_quota.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_dirsort.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_dirsort.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_dirsort.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_extd_audit.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_extd_audit.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_extd_audit.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_fake_perms.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_fake_perms.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_fake_perms.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_fileid.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_fileid.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_fileid.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FILEID" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_full_audit.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_full_audit.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_full_audit.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_gpfs.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_gpfs.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_gpfs.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_GPFS" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_netatalk.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_netatalk.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_netatalk.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_NETATALK" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_notify_fam.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_notify_fam.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_notify_fam.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_prealloc.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_prealloc.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_prealloc.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_preopen.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_preopen.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_preopen.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_readahead.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_readahead.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_readahead.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_readonly.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_readonly.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_readonly.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_READONLY" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_recycle.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_recycle.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_recycle.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_scannedonly.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_scannedonly.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_scannedonly.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy2.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_shadow_copy2.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_smb_traffic_analyzer.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_smb_traffic_analyzer.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_streams_depot.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_streams_depot.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_streams_depot.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_streams_xattr.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_streams_xattr.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_streams_xattr.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfs_xattr_tdb.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfs_xattr_tdb.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/vfstest.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/vfstest.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/vfstest.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "VFSTEST" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/wbinfo.1
===================================================================
--- /branches/samba-3.5.x/docs/manpages/wbinfo.1	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/wbinfo.1	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
+.TH "WBINFO" "1" "10/24/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/winbind_krb5_locator.7
===================================================================
--- /branches/samba-3.5.x/docs/manpages/winbind_krb5_locator.7	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/winbind_krb5_locator.7	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: 7
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "08/02/2011" "Samba 3\&.5" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "10/24/2011" "Samba 3\&.5" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/docs/manpages/winbindd.8
===================================================================
--- /branches/samba-3.5.x/docs/manpages/winbindd.8	(revision 731)
+++ /branches/samba-3.5.x/docs/manpages/winbindd.8	(revision 732)
@@ -3,10 +3,10 @@
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/02/2011
+.\"      Date: 10/24/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
+.TH "WINBINDD" "8" "10/24/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
Index: /branches/samba-3.5.x/libcli/auth/spnego_parse.c
===================================================================
--- /branches/samba-3.5.x/libcli/auth/spnego_parse.c	(revision 731)
+++ /branches/samba-3.5.x/libcli/auth/spnego_parse.c	(revision 732)
@@ -381,4 +381,8 @@
 	struct asn1_data *asn1 = asn1_init(mem_ctx);
 
+	if (asn1 == NULL) {
+		return false;
+	}
+
 	/* Write mechTypes */
 	if (mech_types && *mech_types) {
Index: /branches/samba-3.5.x/librpc/gen_ndr/ndr_security.c
===================================================================
--- /branches/samba-3.5.x/librpc/gen_ndr/ndr_security.c	(revision 731)
+++ /branches/samba-3.5.x/librpc/gen_ndr/ndr_security.c	(revision 732)
@@ -1043,4 +1043,5 @@
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_DACL", SECINFO_DACL, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_SACL", SECINFO_SACL, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_LABEL", SECINFO_LABEL, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_SACL", SECINFO_UNPROTECTED_SACL, r);
 	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_DACL", SECINFO_UNPROTECTED_DACL, r);
Index: /branches/samba-3.5.x/librpc/gen_ndr/security.h
===================================================================
--- /branches/samba-3.5.x/librpc/gen_ndr/security.h	(revision 731)
+++ /branches/samba-3.5.x/librpc/gen_ndr/security.h	(revision 732)
@@ -359,4 +359,5 @@
 #define SECINFO_DACL ( 0x00000004 )
 #define SECINFO_SACL ( 0x00000008 )
+#define SECINFO_LABEL ( 0x00000010 )
 #define SECINFO_UNPROTECTED_SACL ( 0x10000000 )
 #define SECINFO_UNPROTECTED_DACL ( 0x20000000 )
Index: /branches/samba-3.5.x/librpc/idl/security.idl
===================================================================
--- /branches/samba-3.5.x/librpc/idl/security.idl	(revision 731)
+++ /branches/samba-3.5.x/librpc/idl/security.idl	(revision 732)
@@ -449,4 +449,5 @@
 		SECINFO_DACL                 = 0x00000004,
 		SECINFO_SACL                 = 0x00000008,
+		SECINFO_LABEL                = 0x00000010,
 		SECINFO_UNPROTECTED_SACL     = 0x10000000,
 		SECINFO_UNPROTECTED_DACL     = 0x20000000,
Index: /branches/samba-3.5.x/packaging/RHEL-CTDB/samba.spec
===================================================================
--- /branches/samba-3.5.x/packaging/RHEL-CTDB/samba.spec	(revision 731)
+++ /branches/samba-3.5.x/packaging/RHEL-CTDB/samba.spec	(revision 732)
@@ -6,5 +6,5 @@
 Packager: Samba Team <samba@samba.org>
 Name:         samba
-Version:      3.5.11
+Version:      3.5.12
 Release:      1GITHASH
 Epoch:        0
Index: /branches/samba-3.5.x/packaging/RHEL/makerpms.sh
===================================================================
--- /branches/samba-3.5.x/packaging/RHEL/makerpms.sh	(revision 731)
+++ /branches/samba-3.5.x/packaging/RHEL/makerpms.sh	(revision 732)
@@ -21,5 +21,5 @@
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.5.11'
+VERSION='3.5.12'
 REVISION=''
 SPECFILE="samba.spec"
Index: /branches/samba-3.5.x/packaging/RHEL/samba.spec
===================================================================
--- /branches/samba-3.5.x/packaging/RHEL/samba.spec	(revision 731)
+++ /branches/samba-3.5.x/packaging/RHEL/samba.spec	(revision 732)
@@ -6,5 +6,5 @@
 Packager: Samba Team <samba@samba.org>
 Name:         samba
-Version:      3.5.11
+Version:      3.5.12
 Release:      1
 Epoch:        0
Index: /branches/samba-3.5.x/source3/Makefile.in
===================================================================
--- /branches/samba-3.5.x/source3/Makefile.in	(revision 731)
+++ /branches/samba-3.5.x/source3/Makefile.in	(revision 732)
@@ -29,5 +29,5 @@
 
 ## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's:\.@SHLIBEXT@[\.0-9]*$$:.@SYMSEXT@:'`
 DSO_EXPORTS=@DSO_EXPORTS@
 SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
Index: /branches/samba-3.5.x/source3/VERSION
===================================================================
--- /branches/samba-3.5.x/source3/VERSION	(revision 731)
+++ /branches/samba-3.5.x/source3/VERSION	(revision 732)
@@ -26,5 +26,5 @@
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=11
+SAMBA_VERSION_RELEASE=12
 
 ########################################################
Index: /branches/samba-3.5.x/source3/build.cmd
===================================================================
--- /branches/samba-3.5.x/source3/build.cmd	(revision 731)
+++ /branches/samba-3.5.x/source3/build.cmd	(revision 732)
@@ -15,4 +15,5 @@
 /* version 0.3.7 from 23.04.2012 Silvan (compile and link flags need to be
                                          set here [happy birthday Jason]) */
+/* version 0.3.8 from 09.11.2012 Silvan (eliminated the 2nd brand function) */
                                          
 /* load the sysfuncs if not already loaded */
@@ -24,6 +25,6 @@
 
 /* init the version string (don't forget to change) */
-version = "0.3.7"
-version_date = "23.04.2012"
+version = "0.3.8"
+version_date = "09.11.2012"
 
 /* number of make jobs to execute at the same time */
@@ -112,7 +113,9 @@
 end
 
+say "Building with: " || build_parms
+say
 ok = SysFileTree(".\include\version.h",versionh.,'FO')
 
-if versionh.0 = 0 & conf = "YES" then do
+if (versionh.0 = 0 & conf = "YES") | (brand = "YES") then do
     svninfo = ".\svninfo"
     address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
@@ -159,14 +162,5 @@
 end
 
-if brand = "YES" then do
-    svninfo = ".\svninfo"
-    address cmd 'svn status -q -u | grep "^Status against revision:" | sed -e "s/Status against revision: *//">'svninfo
-    revision = strip(translate(linein(svninfo)))
-    ok = stream(svninfo,'c','close')
-    call brand revision
-end
-
 if make <> "" then do
-    say build_parms
     address cmd 'make -j 'jobs' 2>&1 | tee build.log'
 end
@@ -257,5 +251,6 @@
     ok = SysFileDelete(NewVersion)
     verstring = suffix'-'Major'.'minor'.'release'.'revision'-'vendor'-'date('S')
-    say "Samba "verstring
+    say "Samba branded as: "verstring
+    say
 return
 
Index: /branches/samba-3.5.x/source3/client/client.c
===================================================================
--- /branches/samba-3.5.x/source3/client/client.c	(revision 731)
+++ /branches/samba-3.5.x/source3/client/client.c	(revision 732)
@@ -1669,4 +1669,5 @@
 	if (!NT_STATUS_IS_OK(status)) {
 		d_fprintf(stderr, "cli_push returned %s\n", nt_errstr(status));
+		rc = 1;
 	}
 
@@ -1701,5 +1702,5 @@
 	if (f == x_stdin) {
 		cli_shutdown(cli);
-		exit(0);
+		exit(rc);
 	}
 
@@ -2305,6 +2306,6 @@
 
 	if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDWR, mode, &fnum))) {
-		if (!NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
-			d_printf("posix_open file %s: for read/write fnum %d\n", targetname, fnum);
+		if (NT_STATUS_IS_OK(cli_posix_open(targetcli, targetname, O_CREAT|O_RDONLY, mode, &fnum))) {
+			d_printf("posix_open file %s: for readonly fnum %d\n", targetname, fnum);
 		} else {
 			d_printf("Failed to open file %s. %s\n", targetname, cli_errstr(cli));
Index: /branches/samba-3.5.x/source3/include/local.h
===================================================================
--- /branches/samba-3.5.x/source3/include/local.h	(revision 731)
+++ /branches/samba-3.5.x/source3/include/local.h	(revision 732)
@@ -241,7 +241,4 @@
 #define WINBIND_SERVER_MUTEX_WAIT_TIME (( ((NUM_CLI_AUTH_CONNECT_RETRIES) * ((CLI_AUTH_TIMEOUT)/1000)) + 5)*2)
 
-/* Max number of simultaneous winbindd socket connections. */
-#define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200
-
 /* Buffer size to use when printing backtraces */
 #define BACKTRACE_STACK_SIZE 64
Index: /branches/samba-3.5.x/source3/include/proto.h
===================================================================
--- /branches/samba-3.5.x/source3/include/proto.h	(revision 731)
+++ /branches/samba-3.5.x/source3/include/proto.h	(revision 732)
@@ -1243,4 +1243,11 @@
 			      struct tevent_context *ev,
 			      NTSTATUS *status);
+bool is_executable(const char *fname);
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+				 int deny_mode, int open_func,
+				 uint32 *paccess_mask,
+				 uint32 *pshare_mode,
+				 uint32 *pcreate_disposition,
+				 uint32 *pcreate_options);
 
 /* The following definitions come from lib/util_file.c  */
@@ -4258,4 +4265,5 @@
 int lp_winbind_cache_time(void);
 int lp_winbind_reconnect_delay(void);
+int lp_winbind_max_clients(void);
 const char **lp_winbind_nss_info(void);
 int lp_algorithmic_rid_base(void);
@@ -6347,4 +6355,5 @@
 		      struct smb_filename **smb_fname,
 		      uint32_t ucf_flags);
+NTSTATUS check_veto_path(connection_struct *conn, const char *name);
 NTSTATUS check_name(connection_struct *conn, const char *name);
 int get_real_filename(connection_struct *conn, const char *path,
@@ -6609,5 +6618,4 @@
 				    const char *fname,
 				    SMB_STRUCT_STAT *psbuf);
-bool is_executable(const char *fname);
 bool is_stat_open(uint32 access_mask);
 bool request_timed_out(struct timeval request_time,
@@ -6629,10 +6637,4 @@
 			 uint32 share_access,
 			 uint32 create_options);
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
-				 int deny_mode, int open_func,
-				 uint32 *paccess_mask,
-				 uint32 *pshare_mode,
-				 uint32 *pcreate_disposition,
-				 uint32 *pcreate_options);
 NTSTATUS open_file_fchmod(connection_struct *conn,
 			  struct smb_filename *smb_fname,
@@ -7054,4 +7056,5 @@
 		bool case_sensitive);
 bool stat_cache_lookup(connection_struct *conn,
+			bool posix_paths,
 			char **pp_name,
 			char **pp_dirpath,
Index: /branches/samba-3.5.x/source3/include/smb.h
===================================================================
--- /branches/samba-3.5.x/source3/include/smb.h	(revision 731)
+++ /branches/samba-3.5.x/source3/include/smb.h	(revision 732)
@@ -1958,4 +1958,5 @@
 #define UCF_COND_ALLOW_WCARD_LCOMP	0x00000004
 #define UCF_POSIX_PATHNAMES		0x00000008
+#define UCF_UNIX_NAME_LOOKUP		0x00000010
 
 /*
Index: /branches/samba-3.5.x/source3/lib/netapi/netapi.c
===================================================================
--- /branches/samba-3.5.x/source3/lib/netapi/netapi.c	(revision 731)
+++ /branches/samba-3.5.x/source3/lib/netapi/netapi.c	(revision 732)
@@ -56,5 +56,4 @@
 	NET_API_STATUS status;
 	struct libnetapi_ctx *ctx = NULL;
-	char *krb5_cc_env = NULL;
 
 	if (stat_ctx && libnetapi_initialized) {
@@ -101,10 +100,4 @@
 
 	BlockSignals(True, SIGPIPE);
-
-	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-	if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-		ctx->krb5_cc_env = talloc_strdup(frame, "MEMORY:libnetapi");
-		setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
-	}
 
 	if (getenv("USER")) {
@@ -251,4 +244,7 @@
 }
 
+/****************************************************************
+****************************************************************/
+
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx)
 {
Index: /branches/samba-3.5.x/source3/lib/util.c
===================================================================
--- /branches/samba-3.5.x/source3/lib/util.c	(revision 731)
+++ /branches/samba-3.5.x/source3/lib/util.c	(revision 732)
@@ -3076,2 +3076,160 @@
 	return ret;
 }
+
+/*******************************************************************
+ Return True if the filename is one of the special executable types.
+********************************************************************/
+
+bool is_executable(const char *fname)
+{
+	if ((fname = strrchr_m(fname,'.'))) {
+		if (strequal(fname,".com") ||
+		    strequal(fname,".dll") ||
+		    strequal(fname,".exe") ||
+		    strequal(fname,".sym")) {
+			return True;
+		}
+	}
+	return False;
+}
+
+/****************************************************************************
+ Open a file with a share mode - old openX method - map into NTCreate.
+****************************************************************************/
+
+bool map_open_params_to_ntcreate(const char *smb_base_fname,
+				 int deny_mode, int open_func,
+				 uint32 *paccess_mask,
+				 uint32 *pshare_mode,
+				 uint32 *pcreate_disposition,
+				 uint32 *pcreate_options)
+{
+	uint32 access_mask;
+	uint32 share_mode;
+	uint32 create_disposition;
+	uint32 create_options = FILE_NON_DIRECTORY_FILE;
+
+	DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
+		  "open_func = 0x%x\n",
+		  smb_base_fname, (unsigned int)deny_mode,
+		  (unsigned int)open_func ));
+
+	/* Create the NT compatible access_mask. */
+	switch (GET_OPENX_MODE(deny_mode)) {
+		case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */
+		case DOS_OPEN_RDONLY:
+			access_mask = FILE_GENERIC_READ;
+			break;
+		case DOS_OPEN_WRONLY:
+			access_mask = FILE_GENERIC_WRITE;
+			break;
+		case DOS_OPEN_RDWR:
+		case DOS_OPEN_FCB:
+			access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
+			break;
+		default:
+			DEBUG(10,("map_open_params_to_ntcreate: bad open mode = 0x%x\n",
+				  (unsigned int)GET_OPENX_MODE(deny_mode)));
+			return False;
+	}
+
+	/* Create the NT compatible create_disposition. */
+	switch (open_func) {
+		case OPENX_FILE_EXISTS_FAIL|OPENX_FILE_CREATE_IF_NOT_EXIST:
+			create_disposition = FILE_CREATE;
+			break;
+
+		case OPENX_FILE_EXISTS_OPEN:
+			create_disposition = FILE_OPEN;
+			break;
+
+		case OPENX_FILE_EXISTS_OPEN|OPENX_FILE_CREATE_IF_NOT_EXIST:
+			create_disposition = FILE_OPEN_IF;
+			break;
+
+		case OPENX_FILE_EXISTS_TRUNCATE:
+			create_disposition = FILE_OVERWRITE;
+			break;
+
+		case OPENX_FILE_EXISTS_TRUNCATE|OPENX_FILE_CREATE_IF_NOT_EXIST:
+			create_disposition = FILE_OVERWRITE_IF;
+			break;
+
+		default:
+			/* From samba4 - to be confirmed. */
+			if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_EXEC) {
+				create_disposition = FILE_CREATE;
+				break;
+			}
+			DEBUG(10,("map_open_params_to_ntcreate: bad "
+				  "open_func 0x%x\n", (unsigned int)open_func));
+			return False;
+	}
+
+	/* Create the NT compatible share modes. */
+	switch (GET_DENY_MODE(deny_mode)) {
+		case DENY_ALL:
+			share_mode = FILE_SHARE_NONE;
+			break;
+
+		case DENY_WRITE:
+			share_mode = FILE_SHARE_READ;
+			break;
+
+		case DENY_READ:
+			share_mode = FILE_SHARE_WRITE;
+			break;
+
+		case DENY_NONE:
+			share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+			break;
+
+		case DENY_DOS:
+			create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
+	                if (is_executable(smb_base_fname)) {
+				share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
+			} else {
+				if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
+					share_mode = FILE_SHARE_READ;
+				} else {
+					share_mode = FILE_SHARE_NONE;
+				}
+			}
+			break;
+
+		case DENY_FCB:
+			create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
+			share_mode = FILE_SHARE_NONE;
+			break;
+
+		default:
+			DEBUG(10,("map_open_params_to_ntcreate: bad deny_mode 0x%x\n",
+				(unsigned int)GET_DENY_MODE(deny_mode) ));
+			return False;
+	}
+
+	DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
+		  "share_mode = 0x%x, create_disposition = 0x%x, "
+		  "create_options = 0x%x\n",
+		  smb_base_fname,
+		  (unsigned int)access_mask,
+		  (unsigned int)share_mode,
+		  (unsigned int)create_disposition,
+		  (unsigned int)create_options ));
+
+	if (paccess_mask) {
+		*paccess_mask = access_mask;
+	}
+	if (pshare_mode) {
+		*pshare_mode = share_mode;
+	}
+	if (pcreate_disposition) {
+		*pcreate_disposition = create_disposition;
+	}
+	if (pcreate_options) {
+		*pcreate_options = create_options;
+	}
+
+	return True;
+
+}
Index: /branches/samba-3.5.x/source3/libnet/libnet_join.c
===================================================================
--- /branches/samba-3.5.x/source3/libnet/libnet_join.c	(revision 731)
+++ /branches/samba-3.5.x/source3/libnet/libnet_join.c	(revision 732)
@@ -1621,15 +1621,8 @@
 static int libnet_destroy_JoinCtx(struct libnet_JoinCtx *r)
 {
-	const char *krb5_cc_env = NULL;
-
 	if (r->in.ads) {
 		ads_destroy(&r->in.ads);
 	}
 
-	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-	if (krb5_cc_env && StrCaseCmp(krb5_cc_env, "MEMORY:libnetjoin")) {
-		unsetenv(KRB5_ENV_CCNAME);
-	}
-
 	return 0;
 }
@@ -1640,15 +1633,8 @@
 static int libnet_destroy_UnjoinCtx(struct libnet_UnjoinCtx *r)
 {
-	const char *krb5_cc_env = NULL;
-
 	if (r->in.ads) {
 		ads_destroy(&r->in.ads);
 	}
 
-	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-	if (krb5_cc_env && StrCaseCmp(krb5_cc_env, "MEMORY:libnetjoin")) {
-		unsetenv(KRB5_ENV_CCNAME);
-	}
-
 	return 0;
 }
@@ -1661,5 +1647,4 @@
 {
 	struct libnet_JoinCtx *ctx;
-	const char *krb5_cc_env = NULL;
 
 	ctx = talloc_zero(mem_ctx, struct libnet_JoinCtx);
@@ -1673,11 +1658,4 @@
 	W_ERROR_HAVE_NO_MEMORY(ctx->in.machine_name);
 
-	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-	if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-		krb5_cc_env = talloc_strdup(mem_ctx, "MEMORY:libnetjoin");
-		W_ERROR_HAVE_NO_MEMORY(krb5_cc_env);
-		setenv(KRB5_ENV_CCNAME, krb5_cc_env, 1);
-	}
-
 	ctx->in.secure_channel_type = SEC_CHAN_WKSTA;
 
@@ -1694,5 +1672,4 @@
 {
 	struct libnet_UnjoinCtx *ctx;
-	const char *krb5_cc_env = NULL;
 
 	ctx = talloc_zero(mem_ctx, struct libnet_UnjoinCtx);
@@ -1705,11 +1682,4 @@
 	ctx->in.machine_name = talloc_strdup(mem_ctx, global_myname());
 	W_ERROR_HAVE_NO_MEMORY(ctx->in.machine_name);
-
-	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
-	if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
-		krb5_cc_env = talloc_strdup(mem_ctx, "MEMORY:libnetjoin");
-		W_ERROR_HAVE_NO_MEMORY(krb5_cc_env);
-		setenv(KRB5_ENV_CCNAME, krb5_cc_env, 1);
-	}
 
 	*r = ctx;
Index: /branches/samba-3.5.x/source3/libsmb/cliconnect.c
===================================================================
--- /branches/samba-3.5.x/source3/libsmb/cliconnect.c	(revision 731)
+++ /branches/samba-3.5.x/source3/libsmb/cliconnect.c	(revision 732)
@@ -1075,4 +1075,7 @@
 			if (dest_realm) {
 				realm = SMB_STRDUP(dest_realm);
+				if (!realm) {
+					return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+				}
 				strupper_m(realm);
 			} else {
@@ -1086,17 +1089,31 @@
 			}
 
-			if (realm && *realm) {
-				principal = talloc_asprintf(talloc_tos(),
-							    "cifs/%s@%s",
-							    cli->desthost,
-							    realm);
-				if (!principal) {
-					SAFE_FREE(realm);
+			if (realm == NULL || *realm == '\0') {
+				realm = SMB_STRDUP(lp_realm());
+				if (!realm) {
 					return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
 				}
-				DEBUG(3,("cli_session_setup_spnego: guessed "
-					"server principal=%s\n",
-					principal ? principal : "<null>"));
+				strupper_m(realm);
+				DEBUG(3,("cli_session_setup_spnego: cannot "
+					"get realm from dest_realm %s, "
+					"desthost %s. Using default "
+					"smb.conf realm %s\n",
+					dest_realm ? dest_realm : "<null>",
+					cli->desthost,
+					realm));
 			}
+
+			principal = talloc_asprintf(talloc_tos(),
+						    "cifs/%s@%s",
+						    cli->desthost,
+						    realm);
+			if (!principal) {
+				SAFE_FREE(realm);
+				return ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
+			}
+			DEBUG(3,("cli_session_setup_spnego: guessed "
+				"server principal=%s\n",
+				principal ? principal : "<null>"));
+
 			SAFE_FREE(realm);
 		}
@@ -1700,4 +1717,9 @@
 		struct timespec ts;
 		bool negotiated_smb_signing = false;
+
+		if (wct != 0x11) {
+			tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+			return;
+		}
 
 		/* NT protocol */
@@ -1766,4 +1788,9 @@
 
 	} else if (cli->protocol >= PROTOCOL_LANMAN1) {
+		if (wct != 0x0D) {
+			tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
+			return;
+		}
+
 		cli->use_spnego = False;
 		cli->sec_mode = SVAL(vwv + 1, 0);
Index: /branches/samba-3.5.x/source3/libsmb/clifile.c
===================================================================
--- /branches/samba-3.5.x/source3/libsmb/clifile.c	(revision 731)
+++ /branches/samba-3.5.x/source3/libsmb/clifile.c	(revision 732)
@@ -2150,10 +2150,17 @@
 
 struct cli_open_state {
+	struct tevent_context *ev;
+	struct cli_state *cli;
+	const char *fname;
 	uint16_t vwv[15];
 	uint16_t fnum;
+	unsigned openfn;
+	unsigned dos_deny;
+	uint8_t additional_flags;
 	struct iovec bytes;
 };
 
 static void cli_open_done(struct tevent_req *subreq);
+static void cli_open_ntcreate_done(struct tevent_req *subreq);
 
 struct tevent_req *cli_open_create(TALLOC_CTX *mem_ctx,
@@ -2165,7 +2172,4 @@
 	struct tevent_req *req, *subreq;
 	struct cli_open_state *state;
-	unsigned openfn;
-	unsigned accessmode;
-	uint8_t additional_flags;
 	uint8_t *bytes;
 
@@ -2174,32 +2178,34 @@
 		return NULL;
 	}
-
-	openfn = 0;
+	state->ev = ev;
+	state->cli = cli;
+	state->fname = fname;
+
 	if (flags & O_CREAT) {
-		openfn |= (1<<4);
+		state->openfn |= (1<<4);
 	}
 	if (!(flags & O_EXCL)) {
 		if (flags & O_TRUNC)
-			openfn |= (1<<1);
+			state->openfn |= (1<<1);
 		else
-			openfn |= (1<<0);
-	}
-
-	accessmode = (share_mode<<4);
+			state->openfn |= (1<<0);
+	}
+
+	state->dos_deny = (share_mode<<4);
 
 	if ((flags & O_ACCMODE) == O_RDWR) {
-		accessmode |= 2;
+		state->dos_deny |= 2;
 	} else if ((flags & O_ACCMODE) == O_WRONLY) {
-		accessmode |= 1;
+		state->dos_deny |= 1;
 	}
 
 #if defined(O_SYNC)
 	if ((flags & O_SYNC) == O_SYNC) {
-		accessmode |= (1<<14);
+		state->dos_deny |= (1<<14);
 	}
 #endif /* O_SYNC */
 
 	if (share_mode == DENY_FCB) {
-		accessmode = 0xFF;
+		state->dos_deny = 0xFF;
 	}
 
@@ -2208,19 +2214,17 @@
 	SSVAL(state->vwv + 1, 0, 0);
 	SSVAL(state->vwv + 2, 0, 0);  /* no additional info */
-	SSVAL(state->vwv + 3, 0, accessmode);
+	SSVAL(state->vwv + 3, 0, state->dos_deny);
 	SSVAL(state->vwv + 4, 0, aSYSTEM | aHIDDEN);
 	SSVAL(state->vwv + 5, 0, 0);
 	SIVAL(state->vwv + 6, 0, 0);
-	SSVAL(state->vwv + 8, 0, openfn);
+	SSVAL(state->vwv + 8, 0, state->openfn);
 	SIVAL(state->vwv + 9, 0, 0);
 	SIVAL(state->vwv + 11, 0, 0);
 	SIVAL(state->vwv + 13, 0, 0);
 
-	additional_flags = 0;
-
 	if (cli->use_oplocks) {
 		/* if using oplocks then ask for a batch oplock via
                    core and extended methods */
-		additional_flags =
+		state->additional_flags =
 			FLAG_REQUEST_OPLOCK|FLAG_REQUEST_BATCH_OPLOCK;
 		SSVAL(state->vwv+2, 0, SVAL(state->vwv+2, 0) | 6);
@@ -2238,5 +2242,6 @@
 	state->bytes.iov_len = talloc_get_size(bytes);
 
-	subreq = cli_smb_req_create(state, ev, cli, SMBopenX, additional_flags,
+	subreq = cli_smb_req_create(state, ev, cli, SMBopenX,
+				    state->additional_flags,
 				    15, state->vwv, 1, &state->bytes);
 	if (subreq == NULL) {
@@ -2279,12 +2284,58 @@
 	uint16_t *vwv;
 	NTSTATUS status;
+	uint32_t access_mask, share_mode, create_disposition, create_options;
 
 	status = cli_smb_recv(subreq, 3, &wct, &vwv, NULL, NULL);
-	if (!NT_STATUS_IS_OK(status)) {
-		TALLOC_FREE(subreq);
+	TALLOC_FREE(subreq);
+
+	if (NT_STATUS_IS_OK(status)) {
+		state->fnum = SVAL(vwv+2, 0);
+		tevent_req_done(req);
+		return;
+	}
+
+	if (!NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED)) {
 		tevent_req_nterror(req, status);
 		return;
 	}
-	state->fnum = SVAL(vwv+2, 0);
+
+	/*
+	 * For the new shiny OS/X Lion SMB server, try a ntcreate
+	 * fallback.
+	 */
+
+	if (!map_open_params_to_ntcreate(state->fname, state->dos_deny,
+					state->openfn, &access_mask,
+					&share_mode, &create_disposition,
+					&create_options)) {
+		tevent_req_nterror(req, NT_STATUS_NOT_SUPPORTED);
+		return;
+	}
+
+	subreq = cli_ntcreate_send(state, state->ev, state->cli,
+				state->fname, 0, access_mask,
+				0, share_mode, create_disposition,
+				create_options, 0);
+	if (tevent_req_nomem(subreq, req)) {
+		return;
+	}
+	tevent_req_set_callback(subreq, cli_open_ntcreate_done, req);
+}
+
+static void cli_open_ntcreate_done(struct tevent_req *subreq)
+{
+	struct tevent_req *req = tevent_req_callback_data(
+		subreq, struct tevent_req);
+	struct cli_open_state *state = tevent_req_data(
+		req, struct cli_open_state);
+	NTSTATUS status;
+
+	status = cli_ntcreate_recv(subreq, &state->fnum);
+	TALLOC_FREE(subreq);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		tevent_req_nterror(req, status);
+		return;
+	}
 	tevent_req_done(req);
 }
Index: /branches/samba-3.5.x/source3/locking/locking.c
===================================================================
--- /branches/samba-3.5.x/source3/locking/locking.c	(revision 731)
+++ /branches/samba-3.5.x/source3/locking/locking.c	(revision 732)
@@ -1351,4 +1351,12 @@
 	if (fsp->is_directory) {
 		SMB_ASSERT(!is_ntfs_stream_smb_fname(fsp->fsp_name));
+
+		/* Or the root of a share. */
+		if (ISDOT(fsp->fsp_name->base_name)) {
+			DEBUG(10,("can_set_delete_on_close: can't set delete on "
+				  "close for the root of a share.\n"));
+			return NT_STATUS_ACCESS_DENIED;
+		}
+
 		return can_delete_directory(fsp->conn,
 					    fsp->fsp_name->base_name);
Index: /branches/samba-3.5.x/source3/modules/vfs_acl_common.c
===================================================================
--- /branches/samba-3.5.x/source3/modules/vfs_acl_common.c	(revision 731)
+++ /branches/samba-3.5.x/source3/modules/vfs_acl_common.c	(revision 732)
@@ -248,5 +248,5 @@
 				struct security_descriptor **ppdesc)
 {
-	DATA_BLOB blob;
+	DATA_BLOB blob = data_blob_null;
 	NTSTATUS status;
 	uint16_t hash_type;
@@ -826,4 +826,11 @@
 	struct smb_filename local_fname;
 	int saved_errno = 0;
+	char *saved_dir = NULL;
+
+	saved_dir = vfs_GetWd(talloc_tos(),conn);
+	if (!saved_dir) {
+		saved_errno = errno;
+		goto out;
+	}
 
 	if (!parent_dirname(talloc_tos(), path,
@@ -838,5 +845,5 @@
 
 	/* cd into the parent dir to pin it. */
-	ret = SMB_VFS_CHDIR(conn, parent_dir);
+	ret = vfs_ChDir(conn, parent_dir);
 	if (ret == -1) {
 		saved_errno = errno;
@@ -856,5 +863,5 @@
 	/* Ensure we have this file open with DELETE access. */
 	id = vfs_file_id_from_sbuf(conn, &local_fname.st);
-	for (fsp = file_find_di_first(id); fsp; file_find_di_next(fsp)) {
+	for (fsp = file_find_di_first(id); fsp; fsp = file_find_di_next(fsp)) {
 		if (fsp->access_mask & DELETE_ACCESS &&
 				fsp->delete_on_close) {
@@ -891,5 +898,7 @@
 	TALLOC_FREE(parent_dir);
 
-	vfs_ChDir(conn, conn->connectpath);
+	if (saved_dir) {
+		vfs_ChDir(conn, saved_dir);
+	}
 	if (saved_errno) {
 		errno = saved_errno;
Index: /branches/samba-3.5.x/source3/nmbd/nmbd_packets.c
===================================================================
--- /branches/samba-3.5.x/source3/nmbd/nmbd_packets.c	(revision 731)
+++ /branches/samba-3.5.x/source3/nmbd/nmbd_packets.c	(revision 732)
@@ -1716,4 +1716,5 @@
 		errno = EBADF;
 		SAFE_FREE(pset);
+		SAFE_FREE(sock_array);
 		return True;
 	}
@@ -1753,4 +1754,5 @@
 		errno = EBADF;
 		SAFE_FREE(pset);
+		SAFE_FREE(sock_array);
 		return True;
 	}
Index: /branches/samba-3.5.x/source3/param/loadparm.c
===================================================================
--- /branches/samba-3.5.x/source3/param/loadparm.c	(revision 731)
+++ /branches/samba-3.5.x/source3/param/loadparm.c	(revision 732)
@@ -255,5 +255,5 @@
 	int winbind_cache_time;
 	int winbind_reconnect_delay;
-	int winbind_max_idle_children;
+	int winbind_max_clients;
 	char **szWinbindNssInfo;
 	int iLockSpinTime;
@@ -4556,4 +4556,13 @@
 	},
 	{
+		.label		= "winbind max clients",
+		.type		= P_INTEGER,
+		.p_class	= P_GLOBAL,
+		.ptr		= &Globals.winbind_max_clients,
+		.special	= NULL,
+		.enum_list	= NULL,
+		.flags		= FLAG_ADVANCED,
+	},
+	{
 		.label		= "winbind enum users",
 		.type		= P_BOOL,
@@ -5223,4 +5232,5 @@
 	Globals.winbind_cache_time = 300;	/* 5 minutes */
 	Globals.winbind_reconnect_delay = 30;	/* 30 seconds */
+	Globals.winbind_max_clients = 200;
 	Globals.bWinbindEnumUsers = False;
 	Globals.bWinbindEnumGroups = False;
@@ -5790,4 +5800,5 @@
 FN_GLOBAL_INTEGER(lp_winbind_cache_time, &Globals.winbind_cache_time)
 FN_GLOBAL_INTEGER(lp_winbind_reconnect_delay, &Globals.winbind_reconnect_delay)
+FN_GLOBAL_INTEGER(lp_winbind_max_clients, &Globals.winbind_max_clients)
 FN_GLOBAL_LIST(lp_winbind_nss_info, &Globals.szWinbindNssInfo)
 FN_GLOBAL_INTEGER(lp_algorithmic_rid_base, &Globals.AlgorithmicRidBase)
Index: /branches/samba-3.5.x/source3/rpc_server/srv_wkssvc_nt.c
===================================================================
--- /branches/samba-3.5.x/source3/rpc_server/srv_wkssvc_nt.c	(revision 731)
+++ /branches/samba-3.5.x/source3/rpc_server/srv_wkssvc_nt.c	(revision 732)
@@ -846,5 +846,7 @@
 
 	become_root();
+	setenv(KRB5_ENV_CCNAME, "MEMORY:_wkssvc_NetrJoinDomain2", 1);
 	werr = libnet_Join(p->mem_ctx, j);
+	unsetenv(KRB5_ENV_CCNAME);
 	unbecome_root();
 
@@ -912,5 +914,7 @@
 
 	become_root();
+	setenv(KRB5_ENV_CCNAME, "MEMORY:_wkssvc_NetrUnjoinDomain2", 1);
 	werr = libnet_Unjoin(p->mem_ctx, u);
+	unsetenv(KRB5_ENV_CCNAME);
 	unbecome_root();
 
Index: /branches/samba-3.5.x/source3/smbd/filename.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/filename.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/filename.c	(revision 732)
@@ -296,5 +296,5 @@
 	if((!conn->case_sensitive || !(conn->fs_capabilities &
 				       FILE_CASE_SENSITIVE_SEARCH)) &&
-	    stat_cache_lookup(conn, &smb_fname->base_name, &dirpath, &start,
+	    stat_cache_lookup(conn, posix_pathnames, &smb_fname->base_name, &dirpath, &start,
 			      &smb_fname->st)) {
 		goto done;
@@ -840,4 +840,21 @@
 
 /****************************************************************************
+ Ensure a path is not vetod.
+****************************************************************************/
+
+NTSTATUS check_veto_path(connection_struct *conn, const char *name)
+{
+	if (IS_VETO_PATH(conn, name))  {
+		/* Is it not dot or dot dot. */
+		if (!(ISDOT(name) || ISDOTDOT(name))) {
+			DEBUG(5,("check_veto_path: file path name %s vetoed\n",
+						name));
+			return map_nt_error_from_unix(ENOENT);
+		}
+	}
+	return NT_STATUS_OK;
+}
+
+/****************************************************************************
  Check a filename - possibly calling check_reduced_name.
  This is called by every routine before it allows an operation on a filename.
@@ -848,16 +865,12 @@
 NTSTATUS check_name(connection_struct *conn, const char *name)
 {
-	if (IS_VETO_PATH(conn, name))  {
-		/* Is it not dot or dot dot. */
-		if (!((name[0] == '.') && (!name[1] ||
-					(name[1] == '.' && !name[2])))) {
-			DEBUG(5,("check_name: file path name %s vetoed\n",
-						name));
-			return map_nt_error_from_unix(ENOENT);
-		}
+	NTSTATUS status = check_veto_path(conn, name);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		return status;
 	}
 
 	if (!lp_widelinks(SNUM(conn)) || !lp_symlinks(SNUM(conn))) {
-		NTSTATUS status = check_reduced_name(conn,name);
+		status = check_reduced_name(conn,name);
 		if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(5,("check_name: name %s failed with %s\n",name,
@@ -1177,4 +1190,10 @@
 	}
 
+	if ((ucf_flags & UCF_UNIX_NAME_LOOKUP) &&
+			VALID_STAT((*pp_smb_fname)->st) &&
+			S_ISLNK((*pp_smb_fname)->st.st_ex_mode)) {
+		return check_veto_path(conn, (*pp_smb_fname)->base_name);
+	}
+
 	status = check_name(conn, (*pp_smb_fname)->base_name);
 	if (!NT_STATUS_IS_OK(status)) {
Index: /branches/samba-3.5.x/source3/smbd/msdfs.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/msdfs.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/msdfs.c	(revision 732)
@@ -526,13 +526,8 @@
 
 	/*
- 	 * Note the unix path conversion here we're doing we can
+	 * Note the unix path conversion here we're doing we
 	 * throw away. We're looking for a symlink for a dfs
 	 * resolution, if we don't find it we'll do another
 	 * unix_convert later in the codepath.
-	 * If we needed to remember what we'd resolved in
-	 * dp->reqpath (as the original code did) we'd
-	 * copy (localhost, dp->reqpath) on any code
-	 * path below that returns True - but I don't
-	 * think this is needed. JRA.
 	 */
 
@@ -545,9 +540,5 @@
 			return status;
 		}
-
-		/* Create an smb_fname to use below. */
-		status = create_synthetic_smb_fname(ctx, pdp->reqpath, NULL,
-						    NULL, &smb_fname);
-		if (!NT_STATUS_IS_OK(status)) {
+		if (smb_fname == NULL || smb_fname->base_name == NULL) {
 			return status;
 		}
Index: /branches/samba-3.5.x/source3/smbd/nttrans.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/nttrans.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/nttrans.c	(revision 732)
@@ -861,4 +861,10 @@
 	/* Ensure we have at least one thing set. */
 	if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
+		if (security_info_sent & SECINFO_LABEL) {
+			/* Only consider SECINFO_LABEL if no other
+			   bits are set. Just like W2K3 we don't
+			   store this. */
+			return NT_STATUS_OK;
+		}
 		return NT_STATUS_INVALID_PARAMETER;
 	}
@@ -1850,5 +1856,15 @@
 	}
 
+	if (security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|
+			SECINFO_GROUP|SECINFO_SACL)) {
+		/* Don't return SECINFO_LABEL if anything else was
+		   requested. See bug #8458. */
+		security_info_wanted &= ~SECINFO_LABEL;
+	}
+
 	if (!lp_nt_acl_support(SNUM(conn))) {
+		status = get_null_nt_acl(talloc_tos(), &psd);
+	} else if (security_info_wanted & SECINFO_LABEL) {
+		/* Like W2K3 return a null object. */
 		status = get_null_nt_acl(talloc_tos(), &psd);
 	} else {
@@ -1882,4 +1898,13 @@
 	    security_info_wanted & DACL_SECURITY_INFORMATION)
 		psd->type |= SEC_DESC_DACL_PRESENT;
+
+	if (security_info_wanted & SECINFO_LABEL) {
+		/* Like W2K3 return a null object. */
+		psd->owner_sid = NULL;
+		psd->group_sid = NULL;
+		psd->dacl = NULL;
+		psd->sacl = NULL;
+		psd->type &= ~(SEC_DESC_DACL_PRESENT|SEC_DESC_SACL_PRESENT);
+	}
 
 	sd_size = ndr_size_security_descriptor(psd, NULL, 0);
Index: /branches/samba-3.5.x/source3/smbd/open.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/open.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/open.c	(revision 732)
@@ -661,21 +661,4 @@
 }
 
-/*******************************************************************
- Return True if the filename is one of the special executable types.
-********************************************************************/
-
-bool is_executable(const char *fname)
-{
-	if ((fname = strrchr_m(fname,'.'))) {
-		if (strequal(fname,".com") ||
-		    strequal(fname,".dll") ||
-		    strequal(fname,".exe") ||
-		    strequal(fname,".sym")) {
-			return True;
-		}
-	}
-	return False;
-}
-
 /****************************************************************************
  Check if we can open a file with a share mode.
@@ -1221,145 +1204,4 @@
 	return dup_file_fsp(req, fsp, access_mask, share_access,
 			    create_options, fsp_to_dup_into);
-}
-
-/****************************************************************************
- Open a file with a share mode - old openX method - map into NTCreate.
-****************************************************************************/
-
-bool map_open_params_to_ntcreate(const struct smb_filename *smb_fname,
-				 int deny_mode, int open_func,
-				 uint32 *paccess_mask,
-				 uint32 *pshare_mode,
-				 uint32 *pcreate_disposition,
-				 uint32 *pcreate_options)
-{
-	uint32 access_mask;
-	uint32 share_mode;
-	uint32 create_disposition;
-	uint32 create_options = FILE_NON_DIRECTORY_FILE;
-
-	DEBUG(10,("map_open_params_to_ntcreate: fname = %s, deny_mode = 0x%x, "
-		  "open_func = 0x%x\n",
-		  smb_fname_str_dbg(smb_fname), (unsigned int)deny_mode,
-		  (unsigned int)open_func ));
-
-	/* Create the NT compatible access_mask. */
-	switch (GET_OPENX_MODE(deny_mode)) {
-		case DOS_OPEN_EXEC: /* Implies read-only - used to be FILE_READ_DATA */
-		case DOS_OPEN_RDONLY:
-			access_mask = FILE_GENERIC_READ;
-			break;
-		case DOS_OPEN_WRONLY:
-			access_mask = FILE_GENERIC_WRITE;
-			break;
-		case DOS_OPEN_RDWR:
-		case DOS_OPEN_FCB:
-			access_mask = FILE_GENERIC_READ|FILE_GENERIC_WRITE;
-			break;
-		default:
-			DEBUG(10,("map_open_params_to_ntcreate: bad open mode = 0x%x\n",
-				  (unsigned int)GET_OPENX_MODE(deny_mode)));
-			return False;
-	}
-
-	/* Create the NT compatible create_disposition. */
-	switch (open_func) {
-		case OPENX_FILE_EXISTS_FAIL|OPENX_FILE_CREATE_IF_NOT_EXIST:
-			create_disposition = FILE_CREATE;
-			break;
-
-		case OPENX_FILE_EXISTS_OPEN:
-			create_disposition = FILE_OPEN;
-			break;
-
-		case OPENX_FILE_EXISTS_OPEN|OPENX_FILE_CREATE_IF_NOT_EXIST:
-			create_disposition = FILE_OPEN_IF;
-			break;
-       
-		case OPENX_FILE_EXISTS_TRUNCATE:
-			create_disposition = FILE_OVERWRITE;
-			break;
-
-		case OPENX_FILE_EXISTS_TRUNCATE|OPENX_FILE_CREATE_IF_NOT_EXIST:
-			create_disposition = FILE_OVERWRITE_IF;
-			break;
-
-		default:
-			/* From samba4 - to be confirmed. */
-			if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_EXEC) {
-				create_disposition = FILE_CREATE;
-				break;
-			}
-			DEBUG(10,("map_open_params_to_ntcreate: bad "
-				  "open_func 0x%x\n", (unsigned int)open_func));
-			return False;
-	}
- 
-	/* Create the NT compatible share modes. */
-	switch (GET_DENY_MODE(deny_mode)) {
-		case DENY_ALL:
-			share_mode = FILE_SHARE_NONE;
-			break;
-
-		case DENY_WRITE:
-			share_mode = FILE_SHARE_READ;
-			break;
-
-		case DENY_READ:
-			share_mode = FILE_SHARE_WRITE;
-			break;
-
-		case DENY_NONE:
-			share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-			break;
-
-		case DENY_DOS:
-			create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_DOS;
-	                if (is_executable(smb_fname->base_name)) {
-				share_mode = FILE_SHARE_READ|FILE_SHARE_WRITE;
-			} else {
-				if (GET_OPENX_MODE(deny_mode) == DOS_OPEN_RDONLY) {
-					share_mode = FILE_SHARE_READ;
-				} else {
-					share_mode = FILE_SHARE_NONE;
-				}
-			}
-			break;
-
-		case DENY_FCB:
-			create_options |= NTCREATEX_OPTIONS_PRIVATE_DENY_FCB;
-			share_mode = FILE_SHARE_NONE;
-			break;
-
-		default:
-			DEBUG(10,("map_open_params_to_ntcreate: bad deny_mode 0x%x\n",
-				(unsigned int)GET_DENY_MODE(deny_mode) ));
-			return False;
-	}
-
-	DEBUG(10,("map_open_params_to_ntcreate: file %s, access_mask = 0x%x, "
-		  "share_mode = 0x%x, create_disposition = 0x%x, "
-		  "create_options = 0x%x\n",
-		  smb_fname_str_dbg(smb_fname),
-		  (unsigned int)access_mask,
-		  (unsigned int)share_mode,
-		  (unsigned int)create_disposition,
-		  (unsigned int)create_options ));
-
-	if (paccess_mask) {
-		*paccess_mask = access_mask;
-	}
-	if (pshare_mode) {
-		*pshare_mode = share_mode;
-	}
-	if (pcreate_disposition) {
-		*pcreate_disposition = create_disposition;
-	}
-	if (pcreate_options) {
-		*pcreate_options = create_options;
-	}
-
-	return True;
-
 }
 
@@ -1503,10 +1345,4 @@
 	ZERO_STRUCT(id);
 
-	/* Windows allows a new file to be created and
-	   silently removes a FILE_ATTRIBUTE_DIRECTORY
-	   sent by the client. Do the same. */
-
-	new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
-
 	if (conn->printer) {
 		/*
@@ -1542,4 +1378,10 @@
 		new_dos_attributes = 0;
 	} else {
+		/* Windows allows a new file to be created and
+		   silently removes a FILE_ATTRIBUTE_DIRECTORY
+		   sent by the client. Do the same. */
+
+		new_dos_attributes &= ~FILE_ATTRIBUTE_DIRECTORY;
+
 		/* We add aARCH to this as this mode is only used if the file is
 		 * created new. */
Index: /branches/samba-3.5.x/source3/smbd/posix_acls.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/posix_acls.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/posix_acls.c	(revision 732)
@@ -1398,27 +1398,30 @@
 		pace->trustee = *pfile_owner_sid;
 		pace->attr = ALLOW_ACE;
+		/* Start with existing permissions, principle of least
+		   surprises for the user. */
+		pace->perms = pst->st_ex_mode;
 
 		if (setting_acl) {
 			/* See if the owning user is in any of the other groups in
-			   the ACE. If so, OR in the permissions from that group. */
-
-			bool group_matched = False;
+			   the ACE, or if there's a matching user entry.
+			   If so, OR in the permissions from that entry. */
+
 			canon_ace *pace_iter;
 
 			for (pace_iter = *pp_ace; pace_iter; pace_iter = pace_iter->next) {
-				if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
+				if (pace_iter->type == SMB_ACL_USER &&
+						pace_iter->unix_ug.uid == pace->unix_ug.uid) {
+					pace->perms |= pace_iter->perms;
+				} else if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
 					if (uid_entry_in_group(pace, pace_iter)) {
 						pace->perms |= pace_iter->perms;
-						group_matched = True;
 					}
 				}
 			}
 
-			/* If we only got an "everyone" perm, just use that. */
-			if (!group_matched) {
+			if (pace->perms == 0) {
+				/* If we only got an "everyone" perm, just use that. */
 				if (got_other)
 					pace->perms = pace_other->perms;
-				else
-					pace->perms = 0;
 			}
 
@@ -1485,4 +1488,5 @@
  If it does not have them, check if there are any entries where the trustee is the
  file owner or the owning group, and map these to SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ.
+ Note we must not do this to default directory ACLs.
 ****************************************************************************/
 
@@ -1524,48 +1528,4 @@
 	if (!got_group_obj)
 		DEBUG(10,("check_owning_objs: ACL is missing an owning group entry.\n"));
-}
-
-/****************************************************************************
- If an ACE entry is SMB_ACL_USER_OBJ and not CREATOR_OWNER, map to SMB_ACL_USER.
- If an ACE entry is SMB_ACL_GROUP_OBJ and not CREATOR_GROUP, map to SMB_ACL_GROUP
-****************************************************************************/
-
-static bool dup_owning_ace(canon_ace *dir_ace, canon_ace *ace)
-{
-	/* dir ace must be followings.
-	   SMB_ACL_USER_OBJ : trustee(CREATOR_OWNER) -> Posix ACL d:u::perm
-	   SMB_ACL_USER     : not trustee    -> Posix ACL u:user:perm
-	   SMB_ACL_USER_OBJ : trustee -> convert to SMB_ACL_USER : trustee
-	   Posix ACL u:trustee:perm
-
-	   SMB_ACL_GROUP_OBJ: trustee(CREATOR_GROUP) -> Posix ACL d:g::perm
-	   SMB_ACL_GROUP    : not trustee   -> Posix ACL g:group:perm
-	   SMB_ACL_GROUP_OBJ: trustee -> convert to SMB_ACL_GROUP : trustee
-	   Posix ACL g:trustee:perm
-	*/
-
-	if (ace->type == SMB_ACL_USER_OBJ &&
-			!(sid_equal(&ace->trustee, &global_sid_Creator_Owner))) {
-		canon_ace *dup_ace = dup_canon_ace(ace);
-
-		if (dup_ace == NULL) {
-			return false;
-		}
-		dup_ace->type = SMB_ACL_USER;
-		DLIST_ADD_END(dir_ace, dup_ace, canon_ace *);
-	}
-
-	if (ace->type == SMB_ACL_GROUP_OBJ &&
-			!(sid_equal(&ace->trustee, &global_sid_Creator_Group))) {
-		canon_ace *dup_ace = dup_canon_ace(ace);
-
-		if (dup_ace == NULL) {
-			return false;
-		}
-		dup_ace->type = SMB_ACL_GROUP;
-		DLIST_ADD_END(dir_ace, dup_ace, canon_ace *);
-	}
-
-	return true;
 }
 
@@ -1793,4 +1753,5 @@
 				(SEC_ACE_FLAG_OBJECT_INHERIT|SEC_ACE_FLAG_CONTAINER_INHERIT)) {
 
+				canon_ace *current_dir_ace = current_ace;
 				DLIST_ADD_END(dir_ace, current_ace, canon_ace *);
 
@@ -1818,32 +1779,4 @@
 					dbgtext("create_canon_ace_lists: adding dir ACL:\n");
 					print_canon_ace( current_ace, 0);
-				}
-
-				/*
-				 * We have a lossy mapping: directory ACE entries
-				 * CREATOR_OWNER ------\
-				 *     (map to)         +---> SMB_ACL_USER_OBJ
-				 * owning sid    ------/
-				 *
-				 * CREATOR_GROUP ------\
-				 *     (map to)         +---> SMB_ACL_GROUP_OBJ
-				 * primary group sid --/
-				 *
-				 * on set. And on read of a directory ACL
-				 *
-				 * SMB_ACL_USER_OBJ ----> CREATOR_OWNER
-				 * SMB_ACL_GROUP_OBJ ---> CREATOR_GROUP.
-				 *
-				 * Deal with this on set by duplicating
-				 * owning sid and primary group sid ACE
-				 * entries into the directory ACL.
-				 * Fix from Tsukasa Hamano <hamano@osstech.co.jp>.
-				 */
-
-				if (!dup_owning_ace(dir_ace, current_ace)) {
-					DEBUG(0,("create_canon_ace_lists: malloc fail !\n"));
-					free_canon_ace_list(file_ace);
-					free_canon_ace_list(dir_ace);
-					return false;
 				}
 
@@ -1882,4 +1815,41 @@
 					current_ace = NULL;
 				}
+
+				/*
+				 * current_ace is now either owned by file_ace
+				 * or is NULL. We can safely operate on current_dir_ace
+				 * to treat mapping for default acl entries differently
+				 * than access acl entries.
+				 */
+
+				if (current_dir_ace->owner_type == UID_ACE) {
+					/*
+					 * We already decided above this is a uid,
+					 * for default acls ace's only CREATOR_OWNER
+					 * maps to ACL_USER_OBJ. All other uid
+					 * ace's are ACL_USER.
+					 */
+					if (sid_equal(&current_dir_ace->trustee,
+							&global_sid_Creator_Owner)) {
+						current_dir_ace->type = SMB_ACL_USER_OBJ;
+					} else {
+						current_dir_ace->type = SMB_ACL_USER;
+					}
+				}
+
+				if (current_dir_ace->owner_type == GID_ACE) {
+					/*
+					 * We already decided above this is a gid,
+					 * for default acls ace's only CREATOR_GROUP
+					 * maps to ACL_GROUP_OBJ. All other uid
+					 * ace's are ACL_GROUP.
+					 */
+					if (sid_equal(&current_dir_ace->trustee,
+							&global_sid_Creator_Group)) {
+						current_dir_ace->type = SMB_ACL_GROUP_OBJ;
+					} else {
+						current_dir_ace->type = SMB_ACL_GROUP;
+					}
+				}
 			}
 		}
@@ -1943,14 +1913,12 @@
 	} else {
 		/*
-		 * Check if we have SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries in each
-		 * ACL. If we don't have them, check if any SMB_ACL_USER/SMB_ACL_GROUP
-		 * entries can be converted to *_OBJ. Usually we will already have these
-		 * entries in the Default ACL, and the Access ACL will not have them.
+		 * Check if we have SMB_ACL_USER_OBJ and SMB_ACL_GROUP_OBJ entries in
+		 * the file ACL. If we don't have them, check if any SMB_ACL_USER/SMB_ACL_GROUP
+		 * entries can be converted to *_OBJ. Don't do this for the default
+		 * ACL, we will create them separately for this if needed inside
+		 * ensure_canon_entry_valid().
 		 */
 		if (file_ace) {
 			check_owning_objs(file_ace, pfile_owner_sid, pfile_grp_sid);
-		}
-		if (dir_ace) {
-			check_owning_objs(dir_ace, pfile_owner_sid, pfile_grp_sid);
 		}
 	}
@@ -2275,42 +2243,4 @@
 
 /****************************************************************************
- Create a default mode that will be used if a security descriptor entry has
- no user/group/world entries.
-****************************************************************************/
-
-static mode_t create_default_mode(files_struct *fsp, bool interitable_mode)
-{
-	int snum = SNUM(fsp->conn);
-	mode_t and_bits = (mode_t)0;
-	mode_t or_bits = (mode_t)0;
-	mode_t mode;
-
-	if (interitable_mode) {
-		mode = unix_mode(fsp->conn, FILE_ATTRIBUTE_ARCHIVE,
-				 fsp->fsp_name, NULL);
-	} else {
-		mode = S_IRUSR;
-	}
-
-	if (fsp->is_directory)
-		mode |= (S_IWUSR|S_IXUSR);
-
-	/*
-	 * Now AND with the create mode/directory mode bits then OR with the
-	 * force create mode/force directory mode bits.
-	 */
-
-	if (fsp->is_directory) {
-		and_bits = lp_dir_security_mask(snum);
-		or_bits = lp_force_dir_security_mode(snum);
-	} else {
-		and_bits = lp_security_mask(snum);
-		or_bits = lp_force_security_mode(snum);
-	}
-
-	return ((mode & and_bits)|or_bits);
-}
-
-/****************************************************************************
  Unpack a SEC_DESC into two canonical ace lists. We don't depend on this
  succeeding.
@@ -2326,5 +2256,4 @@
 				const SEC_DESC *psd)
 {
-	SMB_STRUCT_STAT st;
 	canon_ace *file_ace = NULL;
 	canon_ace *dir_ace = NULL;
@@ -2390,15 +2319,6 @@
 	print_canon_ace_list( "file ace - before valid", file_ace);
 
-	st = *pst;
-
-	/*
-	 * A default 3 element mode entry for a file should be r-- --- ---.
-	 * A default 3 element mode entry for a directory should be rwx --- ---.
-	 */
-
-	st.st_ex_mode = create_default_mode(fsp, False);
-
 	if (!ensure_canon_entry_valid(&file_ace, fsp->conn->params,
-			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, &st, True)) {
+			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
 		free_canon_ace_list(file_ace);
 		free_canon_ace_list(dir_ace);
@@ -2408,14 +2328,6 @@
 	print_canon_ace_list( "dir ace - before valid", dir_ace);
 
-	/*
-	 * A default inheritable 3 element mode entry for a directory should be the
-	 * mode Samba will use to create a file within. Ensure user rwx bits are set if
-	 * it's a directory.
-	 */
-
-	st.st_ex_mode = create_default_mode(fsp, True);
-
 	if (dir_ace && !ensure_canon_entry_valid(&dir_ace, fsp->conn->params,
-			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, &st, True)) {
+			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
 		free_canon_ace_list(file_ace);
 		free_canon_ace_list(dir_ace);
Index: /branches/samba-3.5.x/source3/smbd/process.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/process.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/process.c	(revision 732)
@@ -1910,13 +1910,22 @@
 
 	/*
-	 * Check if the client tries to fool us. The request so far uses the
-	 * space to the end of the byte buffer in the request just
-	 * processed. The chain_offset can't point into that area. If that was
-	 * the case, we could end up with an endless processing of the chain,
-	 * we would always handle the same request.
-	 */
-
-	already_used = PTR_DIFF(req->buf+req->buflen, smb_base(req->inbuf));
-	if (chain_offset < already_used) {
+	 * Check if the client tries to fool us. The chain offset
+	 * needs to point beyond the current request in the chain, it
+	 * needs to strictly grow. Otherwise we might be tricked into
+	 * an endless loop always processing the same request over and
+	 * over again. We used to assume that vwv and the byte buffer
+	 * array in a chain are always attached, but OS/2 the
+	 * Write&X/Read&X chain puts the Read&X vwv array right behind
+	 * the Write&X vwv chain. The Write&X bcc array is put behind
+	 * the Read&X vwv array. So now we check whether the chain
+	 * offset points strictly behind the previous vwv
+	 * array. req->buf points right after the vwv array of the
+	 * previous request. See
+	 * https://bugzilla.samba.org/show_bug.cgi?id=8360 for more
+	 * information.
+	 */
+
+	already_used = PTR_DIFF(req->buf, smb_base(req->inbuf));
+	if (chain_offset <= already_used) {
 		goto error;
 	}
Index: /branches/samba-3.5.x/source3/smbd/reply.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/reply.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/reply.c	(revision 732)
@@ -1754,5 +1754,5 @@
 	}
 
-	if (!map_open_params_to_ntcreate(smb_fname, deny_mode,
+	if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
 					 OPENX_FILE_EXISTS_OPEN, &access_mask,
 					 &share_mode, &create_disposition,
@@ -1927,5 +1927,6 @@
 	}
 
-	if (!map_open_params_to_ntcreate(smb_fname, deny_mode, smb_ofun,
+	if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+					 smb_ofun,
 					 &access_mask, &share_mode,
 					 &create_disposition,
@@ -6436,5 +6437,6 @@
 		new_create_disposition = FILE_OPEN;
 	} else {
-		if (!map_open_params_to_ntcreate(smb_fname_dst_tmp, 0, ofun,
+		if (!map_open_params_to_ntcreate(smb_fname_dst_tmp->base_name,
+						 0, ofun,
 						 NULL, NULL,
 						 &new_create_disposition,
Index: /branches/samba-3.5.x/source3/smbd/statcache.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/statcache.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/statcache.c	(revision 732)
@@ -146,4 +146,5 @@
  *
  * @param conn    A connection struct to do the stat() with.
+ * @param posix_paths Whether to lookup using stat() or lstat()
  * @param name    The path we are attempting to cache, modified by this routine
  *                to be correct as far as the cache can tell us. We assume that
@@ -162,4 +163,5 @@
 
 bool stat_cache_lookup(connection_struct *conn,
+			bool posix_paths,
 			char **pp_name,
 			char **pp_dirpath,
@@ -177,4 +179,5 @@
 	TALLOC_CTX *ctx = talloc_tos();
 	struct smb_filename smb_fname;
+	int ret;
 
 	*pp_dirpath = NULL;
@@ -279,5 +282,11 @@
 	smb_fname.base_name = translated_path;
 
-	if (SMB_VFS_STAT(conn, &smb_fname) != 0) {
+	if (posix_paths) {
+		ret = SMB_VFS_LSTAT(conn, &smb_fname);
+	} else {
+		ret = SMB_VFS_STAT(conn, &smb_fname);
+	}
+
+	if (ret != 0) {
 		/* Discard this entry - it doesn't exist in the filesystem. */
 		memcache_delete(smbd_memcache(), STAT_CACHE,
Index: /branches/samba-3.5.x/source3/smbd/trans2.c
===================================================================
--- /branches/samba-3.5.x/source3/smbd/trans2.c	(revision 731)
+++ /branches/samba-3.5.x/source3/smbd/trans2.c	(revision 732)
@@ -1082,5 +1082,6 @@
 	}
 
-	if (!map_open_params_to_ntcreate(smb_fname, deny_mode, open_ofun,
+	if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
+					 open_ofun,
 					 &access_mask, &share_mode,
 					 &create_disposition,
@@ -2246,4 +2247,5 @@
 	struct dptr_struct *dirptr = NULL;
 	struct smbd_server_connection *sconn = smbd_server_conn;
+	uint32_t ucf_flags = (UCF_SAVE_LCOMP | UCF_ALWAYS_ALLOW_WCARD_LCOMP);
 
 	if (total_params < 13) {
@@ -2289,4 +2291,5 @@
 				goto out;
 			}
+			ucf_flags |= UCF_UNIX_NAME_LOOKUP;
 			break;
 		default:
@@ -2306,6 +2309,5 @@
 				    req->flags2 & FLAGS2_DFS_PATHNAMES,
 				    directory,
-				    (UCF_SAVE_LCOMP |
-					UCF_ALWAYS_ALLOW_WCARD_LCOMP),
+				    ucf_flags,
 				    &mask_contains_wcard,
 				    &smb_dname);
@@ -5102,4 +5104,5 @@
 	} else {
 		char *fname = NULL;
+		uint32_t ucf_flags = 0;
 
 		/* qpathinfo */
@@ -5113,7 +5116,14 @@
 		DEBUG(3,("call_trans2qfilepathinfo: TRANSACT2_QPATHINFO: level = %d\n", info_level));
 
-		if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
-			reply_nterror(req, NT_STATUS_INVALID_LEVEL);
-			return;
+		if (INFO_LEVEL_IS_UNIX(info_level)) {
+			if (!lp_unix_extensions()) {
+				reply_nterror(req, NT_STATUS_INVALID_LEVEL);
+				return;
+			}
+			if (info_level == SMB_QUERY_FILE_UNIX_BASIC ||
+					info_level == SMB_QUERY_FILE_UNIX_INFO2 ||
+					info_level == SMB_QUERY_FILE_UNIX_LINK) {
+				ucf_flags |= UCF_UNIX_NAME_LOOKUP;
+			}
 		}
 
@@ -5130,5 +5140,5 @@
 					req->flags2 & FLAGS2_DFS_PATHNAMES,
 					fname,
-					0,
+					ucf_flags,
 					NULL,
 					&smb_fname);
Index: /branches/samba-3.5.x/source3/web/swat.c
===================================================================
--- /branches/samba-3.5.x/source3/web/swat.c	(revision 731)
+++ /branches/samba-3.5.x/source3/web/swat.c	(revision 732)
@@ -169,5 +169,5 @@
 
 		snprintf(tmp, sizeof(tmp), "%02x", token[i]);
-		strncat(token_str, tmp, sizeof(tmp));
+		strlcat(token_str, tmp, sizeof(tmp));
 	}
 }
@@ -193,14 +193,27 @@
 	const char *token = cgi_variable_nonull(XSRF_TOKEN);
 	const char *time_str = cgi_variable_nonull(XSRF_TIME);
+	char *p = NULL;
+	long long xsrf_time_ll = 0;
 	time_t xsrf_time = 0;
 	time_t now = time(NULL);
 
-	if (sizeof(time_t) == sizeof(int)) {
-		xsrf_time = atoi(time_str);
-	} else if (sizeof(time_t) == sizeof(long)) {
-		xsrf_time = atol(time_str);
-	} else if (sizeof(time_t) == sizeof(long long)) {
-		xsrf_time = atoll(time_str);
-	}
+	errno = 0;
+	xsrf_time_ll = strtoll(time_str, &p, 10);
+	if (errno != 0) {
+		return false;
+	}
+	if (p == NULL) {
+		return false;
+	}
+	if (PTR_DIFF(p, time_str) > strlen(time_str)) {
+		return false;
+	}
+	if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
+		return false;
+	}
+	if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
+		return false;
+	}
+	xsrf_time = xsrf_time_ll;
 
 	if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
Index: /branches/samba-3.5.x/source3/winbindd/wb_group_members.c
===================================================================
--- /branches/samba-3.5.x/source3/winbindd/wb_group_members.c	(revision 731)
+++ /branches/samba-3.5.x/source3/winbindd/wb_group_members.c	(revision 732)
@@ -214,6 +214,10 @@
 
 	if (!NT_STATUS_IS_OK(status)) {
-		tevent_req_nterror(req, status);
-		return;
+		if (!NT_STATUS_EQUAL(
+			    status, NT_STATUS_TRUSTED_DOMAIN_FAILURE)) {
+			tevent_req_nterror(req, status);
+			return;
+		}
+		num_members = 0;
 	}
 
Index: /branches/samba-3.5.x/source3/winbindd/winbindd.c
===================================================================
--- /branches/samba-3.5.x/source3/winbindd/winbindd.c	(revision 731)
+++ /branches/samba-3.5.x/source3/winbindd/winbindd.c	(revision 732)
@@ -904,15 +904,13 @@
 					  struct winbindd_listen_state);
 
-	while (winbindd_num_clients() >
-	       WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+	while (winbindd_num_clients() > lp_winbind_max_clients() - 1) {
 		DEBUG(5,("winbindd: Exceeding %d client "
 			 "connections, removing idle "
-			 "connection.\n",
-			 WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+			 "connection.\n", lp_winbind_max_clients()));
 		if (!remove_idle_client()) {
 			DEBUG(0,("winbindd: Exceeding %d "
 				 "client connections, no idle "
 				 "connection found\n",
-				 WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+				 lp_winbind_max_clients()));
 			break;
 		}
Index: /branches/samba-3.5.x/source3/winbindd/winbindd_dual.c
===================================================================
--- /branches/samba-3.5.x/source3/winbindd/winbindd_dual.c	(revision 731)
+++ /branches/samba-3.5.x/source3/winbindd/winbindd_dual.c	(revision 732)
@@ -135,5 +135,5 @@
 	struct tevent_req *subreq;
 
-	if ((state->child->pid == 0) && (!fork_domain_child(state->child))) {
+	if ((state->child->sock == -1) && (!fork_domain_child(state->child))) {
 		tevent_req_error(req, errno);
 		return;
@@ -165,4 +165,10 @@
 	TALLOC_FREE(subreq);
 	if (ret == -1) {
+		/*
+		 * The basic parent/child communication broke, close
+		 * our socket
+		 */
+		close(state->child->sock);
+		state->child->sock = -1;
 		tevent_req_error(req, err);
 		return;
@@ -503,4 +509,5 @@
 	}
 
+	child->sock = -1;
 	child->domain = domain;
 	child->table = table;
@@ -531,7 +538,4 @@
 
 	DLIST_REMOVE(children, child);
-
-	close(child->sock);
-	child->sock = -1;
 	child->pid = 0;
 }
Index: /branches/samba-3.5.x/source3/winbindd/winbindd_pam.c
===================================================================
--- /branches/samba-3.5.x/source3/winbindd/winbindd_pam.c	(revision 731)
+++ /branches/samba-3.5.x/source3/winbindd/winbindd_pam.c	(revision 732)
@@ -1383,9 +1383,6 @@
 				  &my_info3);
 
-		if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-		    && contact_domain->can_do_samlogon_ex) {
-			DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-				  "retrying with NetSamLogon\n"));
-			contact_domain->can_do_samlogon_ex = false;
+		if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
 			/*
 			 * It's likely that the server also does not support
@@ -1393,6 +1390,20 @@
 			 */
 			domain->can_do_validation6 = false;
-			retry = true;
-			continue;
+
+			if (contact_domain->can_do_samlogon_ex) {
+				DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+					  "retrying with NetSamLogon\n"));
+				contact_domain->can_do_samlogon_ex = false;
+				retry = true;
+				continue;
+			}
+
+			/* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+			 * (no Ex). This happens against old Samba
+			 * DCs. Drop the connection.
+			 */
+			invalidate_cm_connection(&contact_domain->conn);
+			result = NT_STATUS_LOGON_FAILURE;
+			break;
 		}
 
@@ -1997,9 +2008,6 @@
 				  &info3);
 
-		if ((NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR)
-		    && contact_domain->can_do_samlogon_ex) {
-			DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
-				  "retrying with NetSamLogon\n"));
-			contact_domain->can_do_samlogon_ex = false;
+		if (NT_STATUS_V(result) == DCERPC_FAULT_OP_RNG_ERROR) {
+
 			/*
 			 * It's likely that the server also does not support
@@ -2007,6 +2015,20 @@
 			 */
 			domain->can_do_validation6 = false;
-			retry = true;
-			continue;
+
+			if (contact_domain->can_do_samlogon_ex) {
+				DEBUG(3, ("Got a DC that can not do NetSamLogonEx, "
+					  "retrying with NetSamLogon\n"));
+				contact_domain->can_do_samlogon_ex = false;
+				retry = true;
+				continue;
+			}
+
+			/* Got DCERPC_FAULT_OP_RNG_ERROR for SamLogon
+			 * (no Ex). This happens against old Samba
+			 * DCs. Drop the connection.
+			 */
+			invalidate_cm_connection(&contact_domain->conn);
+			result = NT_STATUS_LOGON_FAILURE;
+			break;
 		}
 
