[Pkg-samba-maint] r3888 - in branches/samba/backports.org/squeeze: . debian docs/manpages docs-xml docs-xml/smbdotconf/security lib/replace/system lib/tevent packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/lib source3/librpc/gen_ndr source3/librpc/idl source3/nmbd source3/smbd source3/winbindd

bubulle at alioth.debian.org bubulle at alioth.debian.org
Thu Aug 18 04:33:09 UTC 2011


Author: bubulle
Date: 2011-08-18 04:33:07 +0000 (Thu, 18 Aug 2011)
New Revision: 3888

Added:
   branches/samba/backports.org/squeeze/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml
Modified:
   branches/samba/backports.org/squeeze/WHATSNEW.txt
   branches/samba/backports.org/squeeze/debian/changelog
   branches/samba/backports.org/squeeze/docs-xml/Makefile
   branches/samba/backports.org/squeeze/docs/manpages/cifs.upcall.8
   branches/samba/backports.org/squeeze/docs/manpages/eventlogadm.8
   branches/samba/backports.org/squeeze/docs/manpages/findsmb.1
   branches/samba/backports.org/squeeze/docs/manpages/idmap_ad.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_adex.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_hash.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_ldap.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_nss.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_rid.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb.8
   branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb2.8
   branches/samba/backports.org/squeeze/docs/manpages/ldb.3
   branches/samba/backports.org/squeeze/docs/manpages/ldbadd.1
   branches/samba/backports.org/squeeze/docs/manpages/ldbdel.1
   branches/samba/backports.org/squeeze/docs/manpages/ldbedit.1
   branches/samba/backports.org/squeeze/docs/manpages/ldbmodify.1
   branches/samba/backports.org/squeeze/docs/manpages/ldbrename.1
   branches/samba/backports.org/squeeze/docs/manpages/ldbsearch.1
   branches/samba/backports.org/squeeze/docs/manpages/libsmbclient.7
   branches/samba/backports.org/squeeze/docs/manpages/lmhosts.5
   branches/samba/backports.org/squeeze/docs/manpages/log2pcap.1
   branches/samba/backports.org/squeeze/docs/manpages/mount.cifs.8
   branches/samba/backports.org/squeeze/docs/manpages/net.8
   branches/samba/backports.org/squeeze/docs/manpages/nmbd.8
   branches/samba/backports.org/squeeze/docs/manpages/nmblookup.1
   branches/samba/backports.org/squeeze/docs/manpages/ntlm_auth.1
   branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.8
   branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.conf.5
   branches/samba/backports.org/squeeze/docs/manpages/pdbedit.8
   branches/samba/backports.org/squeeze/docs/manpages/profiles.1
   branches/samba/backports.org/squeeze/docs/manpages/rpcclient.1
   branches/samba/backports.org/squeeze/docs/manpages/samba.7
   branches/samba/backports.org/squeeze/docs/manpages/sharesec.1
   branches/samba/backports.org/squeeze/docs/manpages/smb.conf.5
   branches/samba/backports.org/squeeze/docs/manpages/smbcacls.1
   branches/samba/backports.org/squeeze/docs/manpages/smbclient.1
   branches/samba/backports.org/squeeze/docs/manpages/smbcontrol.1
   branches/samba/backports.org/squeeze/docs/manpages/smbcquotas.1
   branches/samba/backports.org/squeeze/docs/manpages/smbd.8
   branches/samba/backports.org/squeeze/docs/manpages/smbget.1
   branches/samba/backports.org/squeeze/docs/manpages/smbgetrc.5
   branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.5
   branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.8
   branches/samba/backports.org/squeeze/docs/manpages/smbspool.8
   branches/samba/backports.org/squeeze/docs/manpages/smbstatus.1
   branches/samba/backports.org/squeeze/docs/manpages/smbtar.1
   branches/samba/backports.org/squeeze/docs/manpages/smbtree.1
   branches/samba/backports.org/squeeze/docs/manpages/swat.8
   branches/samba/backports.org/squeeze/docs/manpages/tdbbackup.8
   branches/samba/backports.org/squeeze/docs/manpages/tdbdump.8
   branches/samba/backports.org/squeeze/docs/manpages/tdbtool.8
   branches/samba/backports.org/squeeze/docs/manpages/testparm.1
   branches/samba/backports.org/squeeze/docs/manpages/umount.cifs.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_tdb.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_xattr.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_audit.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_cacheprime.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_cap.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_catia.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_commit.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_default_quota.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_dirsort.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_extd_audit.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_fake_perms.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_fileid.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_full_audit.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_gpfs.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_netatalk.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_notify_fam.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_prealloc.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_preopen.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_readahead.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_readonly.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_recycle.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_scannedonly.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy2.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_smb_traffic_analyzer.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_depot.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_xattr.8
   branches/samba/backports.org/squeeze/docs/manpages/vfs_xattr_tdb.8
   branches/samba/backports.org/squeeze/docs/manpages/vfstest.1
   branches/samba/backports.org/squeeze/docs/manpages/wbinfo.1
   branches/samba/backports.org/squeeze/docs/manpages/winbind_krb5_locator.7
   branches/samba/backports.org/squeeze/docs/manpages/winbindd.8
   branches/samba/backports.org/squeeze/lib/replace/system/config.m4
   branches/samba/backports.org/squeeze/lib/replace/system/filesys.h
   branches/samba/backports.org/squeeze/lib/replace/system/wait.h
   branches/samba/backports.org/squeeze/lib/tevent/testsuite.c
   branches/samba/backports.org/squeeze/lib/tevent/tevent_signal.c
   branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec
   branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh
   branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec
   branches/samba/backports.org/squeeze/source3/VERSION
   branches/samba/backports.org/squeeze/source3/configure
   branches/samba/backports.org/squeeze/source3/configure.in
   branches/samba/backports.org/squeeze/source3/include/config.h.in
   branches/samba/backports.org/squeeze/source3/include/version.h
   branches/samba/backports.org/squeeze/source3/lib/smbldap.c
   branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.c
   branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.h
   branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/ndr_wbint.c
   branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/wbint.h
   branches/samba/backports.org/squeeze/source3/librpc/idl/wbint.idl
   branches/samba/backports.org/squeeze/source3/nmbd/nmbd_packets.c
   branches/samba/backports.org/squeeze/source3/nmbd/nmbd_subnetdb.c
   branches/samba/backports.org/squeeze/source3/smbd/file_access.c
   branches/samba/backports.org/squeeze/source3/smbd/negprot.c
   branches/samba/backports.org/squeeze/source3/smbd/open.c
   branches/samba/backports.org/squeeze/source3/smbd/server.c
   branches/samba/backports.org/squeeze/source3/winbindd/winbindd_dual_srv.c
   branches/samba/backports.org/squeeze/source3/winbindd/winbindd_lookuprids.c
Log:
New upstream release entered testing and is backported to Squeeze

Modified: branches/samba/backports.org/squeeze/WHATSNEW.txt
===================================================================
--- branches/samba/backports.org/squeeze/WHATSNEW.txt	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/WHATSNEW.txt	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1,4 +1,78 @@
                    ==============================
+                   Release Notes for Samba 3.5.11
+			   August 4, 2011
+                   ==============================
+
+
+This is the latest stable release of Samba 3.5.
+
+Major enhancements in Samba 3.5.11 include:
+
+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).
+o  Fix Winbind panics if verify_idpool() fails (bug #8253).
+
+
+Changes since 3.5.10:
+--------------------
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 7462: Make SA_RESETHAND conditional on its existance.
+    * BUG 8254: Make "acl check permissions = no" working in all cases.
+
+
+o   Gregor Beck <gbeck at sernet.de>
+    * BUG 8253: Fix Winbind panics if verify_idpool() fails.
+
+
+o   David Disseldorp <ddiss at suse.de>
+    * BUG 8269: Stop spamming log with "Could not find child X -- ignoring"
+      messages in smbd.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 7460: Include sys/file.h only when available.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 7841: Explicitly pass domain_sid to wbint_LookupRids().
+    * BUG 8238: Fix access to Samba shares when Windows security patch
+      KB2536276 is installed.
+    * BUG 8322: Add HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR.
+
+
+o   Stefan Metzmacher <metze at 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().
+
+
+######################################################################
+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.10
 			   July 26, 2011
                    ==============================
@@ -53,9 +127,9 @@
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
 
+
                    =============================
                    Release Notes for Samba 3.5.9
 			   June 14, 2011
@@ -69,8 +143,22 @@
 o  Sgid bit lost on folder rename (bug #7996).
 o  ACL can get lost when files are being renamed (bug #7987).
 o  Respect "allow trusted domains = no" in Winbind (bug #6966).
+o  Samba now follows Windows behaviour as a Kerberos client,
+   requesting a CIFS/ ticket (bug #7893).
 
+New Kerberos behaviour
+----------------------
 
+A new parameter 'client use spnego principal' defaults to 'no' and
+mean Samba will use CIFS/hostname to obtain a kerberos ticket, acting
+more like Windows when using Kerberos against a CIFS server in
+smbclient, winbind and other Samba client tools.  This will change
+which servers we will successfully negotiate kerberos connections to.
+This is due to Samba no longer trusting a server-provided hint which
+is not available from Windows 2008 or later.  For correct operation
+with all clients, all aliases for a server should be recorded as a as
+a servicePrincipalName on the server's record in AD.
+
 Changes since 3.5.8:
 --------------------
 

Modified: branches/samba/backports.org/squeeze/debian/changelog
===================================================================
--- branches/samba/backports.org/squeeze/debian/changelog	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/debian/changelog	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1,3 +1,15 @@
+samba (2:3.5.11~dfsg-1~bpo60+1) squeeze-backports; urgency=low
+
+  * Backport to squeeze
+
+ -- Christian Perrier <bubulle at debian.org>  Wed, 17 Aug 2011 20:10:02 +0200
+
+samba (2:3.5.11~dfsg-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Christian Perrier <bubulle at debian.org>  Fri, 05 Aug 2011 20:12:01 +0200
+
 samba (2:3.5.10~dfsg-1~bpo60+1) squeeze-backports; urgency=low
 
   * Backport to squeeze

Modified: branches/samba/backports.org/squeeze/docs/manpages/cifs.upcall.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/cifs.upcall.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/cifs.upcall.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: cifs.upcall
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "CIFS\&.UPCALL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "CIFS\&.UPCALL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/eventlogadm.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/eventlogadm.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "EVENTLOGADM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/findsmb.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/findsmb.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/findsmb.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "FINDSMB" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_ad.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_ad.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_ad.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_AD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_adex.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_adex.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_adex.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_hash.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_hash.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_hash.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_HASH" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_ldap.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_ldap.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_ldap.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_nss.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_nss.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_nss.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_NSS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_rid.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_rid.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_rid.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_RID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb2.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb2.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/idmap_tdb2.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldb.3
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldb.3	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldb.3	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldb
 .\"    Author: [see the "Author" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: C Library Functions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDB" "3" "06/14/2011" "Samba 3\&.5" "C Library Functions"
+.TH "LDB" "3" "08/02/2011" "Samba 3\&.5" "C Library Functions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbadd.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbadd.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbadd.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbadd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBADD" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBADD" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbdel.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbdel.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbdel.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbdel
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBDEL" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBDEL" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbedit.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbedit.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbedit.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBEDIT" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBEDIT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbmodify.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbmodify.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbmodify.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbmodify
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBMODIFY" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBMODIFY" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbrename.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbrename.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbrename.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBRENAME" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBRENAME" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ldbsearch.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ldbsearch.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ldbsearch.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ldbsearch
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LDBSEARCH" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LDBSEARCH" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/libsmbclient.7	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/libsmbclient.7	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: 7
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "06/14/2011" "Samba 3\&.5" "7"
+.TH "LIBSMBCLIENT" "7" "08/02/2011" "Samba 3\&.5" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/lmhosts.5	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/lmhosts.5	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/log2pcap.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/log2pcap.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/log2pcap.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "LOG2PCAP" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/mount.cifs.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/mount.cifs.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/mount.cifs.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: mount.cifs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "MOUNT\&.CIFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "MOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/net.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/net.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/net.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NET" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "NET" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/nmbd.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/nmbd.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/nmbd.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "NMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/nmblookup.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/nmblookup.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "NMBLOOKUP" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/ntlm_auth.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/ntlm_auth.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "NTLM_AUTH" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: 8
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "06/14/2011" "Samba 3\&.5" "8"
+.TH "PAM_WINBIND" "8" "08/02/2011" "Samba 3\&.5" "8"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.conf.5
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.conf.5	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/pam_winbind.conf.5	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "06/14/2011" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "08/02/2011" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/pdbedit.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/pdbedit.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "PDBEDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/profiles.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/profiles.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/profiles.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "PROFILES" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/rpcclient.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/rpcclient.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/rpcclient.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "RPCCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/samba.7
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/samba.7	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/samba.7	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "06/14/2011" "Samba 3\&.5" "Miscellanea"
+.TH "SAMBA" "7" "08/02/2011" "Samba 3\&.5" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/sharesec.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/sharesec.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/sharesec.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SHARESEC" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smb.conf.5	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smb.conf.5	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -1900,6 +1900,24 @@
 \fI\fIclient signing\fR\fR\fI = \fR\fIauto\fR\fI \fR
 .RE
 
+client use spnego principal (G)
+.\" client use spnego principal
+.PP
+.RS 4
+This parameter determines whether or not
+\fBsmbclient\fR(8)
+and other samba components acting as a client will attempt to use the server\-supplied principal sometimes given in the SPNEGO exchange\&.
+.sp
+If enabled, Samba can attempt to use Kerberos to contact servers known only by IP address\&. Kerberos relies on names, so ordinarily cannot function in this situation\&.
+.sp
+If disabled, Samba will use the name used to look up the server when asking the KDC for a ticket\&. This avoids situations where a server may impersonate another, soliciting authentication as one principal while being known on the network as another\&.
+.sp
+Note that Windows XP SP2 and later versions already follow this behaviour, and Windows Vista and later servers no longer supply this \'rfc4178 hint\' principal on the server side\&.
+.sp
+Default:
+\fI\fIclient use spnego principal\fR\fR\fI = \fR\fIno\fR\fI \fR
+.RE
+
 client use spnego (G)
 .\" client use spnego
 .PP

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbcacls.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbcacls.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbcacls.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCACLS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbclient.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbclient.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbclient.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbcontrol.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbcontrol.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCONTROL" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbcquotas.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbcquotas.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBCQUOTAS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbd.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbd.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbd.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbget.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbget.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbget.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBGET" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbgetrc.5	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbgetrc.5	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.5
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.5	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.5	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbpasswd.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBPASSWD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbspool.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbspool.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbspool.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMBSPOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbstatus.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbstatus.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbstatus.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBSTATUS" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbtar.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbtar.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbtar.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBTAR" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/smbtree.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/smbtree.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/smbtree.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "SMBTREE" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/swat.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/swat.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/swat.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SWAT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/tdbbackup.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/tdbbackup.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBBACKUP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/tdbdump.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/tdbdump.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/tdbdump.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBDUMP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/tdbtool.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/tdbtool.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/tdbtool.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "TDBTOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/testparm.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/testparm.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/testparm.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "TESTPARM" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/umount.cifs.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/umount.cifs.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/umount.cifs.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: umount.cifs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "UMOUNT\&.CIFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "UMOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_tdb.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_tdb.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_tdb.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_xattr.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_xattr.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_acl_xattr.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_acl_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_audit.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_audit.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_audit.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_cacheprime.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_cacheprime.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_cacheprime.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_cap.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_cap.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_cap.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_catia.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_catia.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_catia.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_CATIA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_commit.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_commit.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_commit.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_COMMIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_default_quota.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_default_quota.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_default_quota.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_default_quota
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_dirsort.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_dirsort.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_dirsort.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_extd_audit.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_extd_audit.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_extd_audit.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_extd_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_fake_perms.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_fake_perms.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_fake_perms.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fake_perms
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_fileid.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_fileid.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_fileid.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FILEID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_full_audit.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_full_audit.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_full_audit.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_full_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_gpfs.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_gpfs.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_gpfs.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_GPFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_netatalk.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_netatalk.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_netatalk.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_NETATALK" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_notify_fam.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_notify_fam.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_notify_fam.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_notify_fam
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_prealloc.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_prealloc.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_prealloc.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_preopen.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_preopen.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_preopen.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_readahead.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_readahead.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_readahead.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_readonly.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_readonly.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_readonly.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_READONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_recycle.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_recycle.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_recycle.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_scannedonly.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_scannedonly.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_scannedonly.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy2.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_shadow_copy2.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_shadow_copy2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_smb_traffic_analyzer.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_smb_traffic_analyzer.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: smb_traffic_analyzer
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_depot.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_depot.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_depot.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_depot
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_xattr.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_xattr.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_streams_xattr.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_streams_xattr
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfs_xattr_tdb.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfs_xattr_tdb.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_xattr_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/vfstest.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/vfstest.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/vfstest.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "VFSTEST" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/wbinfo.1	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/wbinfo.1	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: User Commands
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "06/14/2011" "Samba 3\&.5" "User Commands"
+.TH "WBINFO" "1" "08/02/2011" "Samba 3\&.5" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/winbind_krb5_locator.7
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/winbind_krb5_locator.7	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/winbind_krb5_locator.7	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: winbind_krb5_locator
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: 7
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "06/14/2011" "Samba 3\&.5" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "08/02/2011" "Samba 3\&.5" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs/manpages/winbindd.8
===================================================================
--- branches/samba/backports.org/squeeze/docs/manpages/winbindd.8	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs/manpages/winbindd.8	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 06/14/2011
+.\"      Date: 08/02/2011
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.5
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools"
+.TH "WINBINDD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/backports.org/squeeze/docs-xml/Makefile
===================================================================
--- branches/samba/backports.org/squeeze/docs-xml/Makefile	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/docs-xml/Makefile	2011-08-18 04:33:07 UTC (rev 3888)
@@ -181,8 +181,16 @@
 	$(MAKEINFO) --no-validate --force -o $@ "$<"
 
 # Manpages
-$(MANPAGEDIR3)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
+$(MANPAGEDIR3)/smb.conf.5.xml: parameters
 
+# The phony parameters target exists in order to always create the
+# the parameters xml files. Otherwise, when parameters.*.xml does not exist
+# yet, the parameters are not generated when smb.conf.5.xml is newer than
+# any smbdotconf/*/*.xml file ...
+.PHONY: parameters
+
+parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml
+
 $(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh
 	$(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@
 

Copied: branches/samba/backports.org/squeeze/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml (from rev 3887, tags/samba/upstream_3.5.11~dfsg/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml)
===================================================================
--- branches/samba/backports.org/squeeze/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml	                        (rev 0)
+++ branches/samba/backports.org/squeeze/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml	2011-08-18 04:33:07 UTC (rev 3888)
@@ -0,0 +1,28 @@
+<samba:parameter name="client use spnego principal"
+                 context="G"
+				 type="boolean"
+                 advanced="1" developer="1"
+                 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
+<description>
+    <para>This parameter determines whether or not
+    <citerefentry><refentrytitle>smbclient</refentrytitle>
+    <manvolnum>8</manvolnum></citerefentry> and other samba components
+    acting as a client will attempt to use the server-supplied
+    principal sometimes given in the SPNEGO exchange.</para>
+
+    <para>If enabled, Samba can attempt to use Kerberos to contact
+    servers known only by IP address.  Kerberos relies on names, so
+    ordinarily cannot function in this situation. </para>
+
+    <para>If disabled, Samba will use the name used to look up the
+    server when asking the KDC for a ticket.  This avoids situations
+    where a server may impersonate another, soliciting authentication
+    as one principal while being known on the network as another.
+    </para>
+
+    <para>Note that Windows XP SP2 and later versions already follow
+    this behaviour, and Windows Vista and later servers no longer
+    supply this 'rfc4178 hint' principal on the server side.</para>
+</description>
+<value type="default">no</value>
+</samba:parameter>

Modified: branches/samba/backports.org/squeeze/lib/replace/system/config.m4
===================================================================
--- branches/samba/backports.org/squeeze/lib/replace/system/config.m4	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/lib/replace/system/config.m4	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1,7 +1,7 @@
 # filesys
 AC_HEADER_DIRENT 
 AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h)
-AC_CHECK_HEADERS(sys/acl.h acl/libacl.h)
+AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h)
 
 # select
 AC_CHECK_HEADERS(sys/select.h)

Modified: branches/samba/backports.org/squeeze/lib/replace/system/filesys.h
===================================================================
--- branches/samba/backports.org/squeeze/lib/replace/system/filesys.h	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/lib/replace/system/filesys.h	2011-08-18 04:33:07 UTC (rev 3888)
@@ -77,7 +77,9 @@
 #include <sys/filio.h>
 #endif
 
+#ifdef HAVE_SYS_FILE_H
 #include <sys/file.h>
+#endif
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>

Modified: branches/samba/backports.org/squeeze/lib/replace/system/wait.h
===================================================================
--- branches/samba/backports.org/squeeze/lib/replace/system/wait.h	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/lib/replace/system/wait.h	2011-08-18 04:33:07 UTC (rev 3888)
@@ -44,10 +44,6 @@
 #include <setjmp.h>
 #endif
 
-#ifndef SA_RESETHAND
-#define SA_RESETHAND SA_ONESHOT
-#endif
-
 #if !defined(HAVE_SIG_ATOMIC_T_TYPE)
 typedef int sig_atomic_t;
 #endif

Modified: branches/samba/backports.org/squeeze/lib/tevent/testsuite.c
===================================================================
--- branches/samba/backports.org/squeeze/lib/tevent/testsuite.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/lib/tevent/testsuite.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -101,7 +101,9 @@
 #ifdef SA_RESTART
 	se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART, count_handler, &alarm_count);
 #endif
+#ifdef SA_RESETHAND
 	se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND, count_handler, &alarm_count);
+#endif
 #ifdef SA_SIGINFO
 	se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO, count_handler, &info_count);
 #endif

Modified: branches/samba/backports.org/squeeze/lib/tevent/tevent_signal.c
===================================================================
--- branches/samba/backports.org/squeeze/lib/tevent/tevent_signal.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/lib/tevent/tevent_signal.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -355,16 +355,20 @@
 						    (void*)&sig_state->sig_info[i][ofs], 
 						    se->private_data);
 				}
+#ifdef SA_RESETHAND
 				if (se->sa_flags & SA_RESETHAND) {
 					talloc_free(se);
 				}
+#endif
 				continue;
 			}
 #endif
 			se->handler(ev, se, i, count, NULL, se->private_data);
+#ifdef SA_RESETHAND
 			if (se->sa_flags & SA_RESETHAND) {
 				talloc_free(se);
 			}
+#endif
 		}
 
 #ifdef SA_SIGINFO

Modified: branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/packaging/RHEL/makerpms.sh	2011-08-18 04:33:07 UTC (rev 3888)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.5.10'
+VERSION='3.5.11'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/packaging/RHEL/samba.spec	2011-08-18 04:33:07 UTC (rev 3888)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.5.10
+Version:      3.5.11
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/packaging/RHEL-CTDB/samba.spec	2011-08-18 04:33:07 UTC (rev 3888)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.5.10
+Version:      3.5.11
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/backports.org/squeeze/source3/VERSION
===================================================================
--- branches/samba/backports.org/squeeze/source3/VERSION	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/VERSION	2011-08-18 04:33:07 UTC (rev 3888)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=10
+SAMBA_VERSION_RELEASE=11
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: branches/samba/backports.org/squeeze/source3/configure
===================================================================
--- branches/samba/backports.org/squeeze/source3/configure	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/configure	2011-08-18 04:33:07 UTC (rev 3888)
@@ -9621,7 +9621,7 @@
 
 done
 
-for ac_header in sys/acl.h acl/libacl.h
+for ac_header in sys/acl.h acl/libacl.h sys/file.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -16332,6 +16332,34 @@
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile with __attribute__((destructor))" >&5
+$as_echo_n "checking whether we can compile with __attribute__((destructor))... " >&6; }
+if test "${samba_cv_function_attribute_destructor+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+
+	         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+				__attribute__((destructor))
+				static void cleanup(void) { }
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  samba_cv_function_attribute_destructor=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_function_attribute_destructor" >&5
+$as_echo "$samba_cv_function_attribute_destructor" >&6; }
+
+if test x"$samba_cv_function_attribute_destructor" = xyes ; then
+
+$as_echo "#define HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR 1" >>confdefs.h
+
+fi
+
 #####################################
 # needed for SRV lookups
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5

Modified: branches/samba/backports.org/squeeze/source3/configure.in
===================================================================
--- branches/samba/backports.org/squeeze/source3/configure.in	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/configure.in	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1331,6 +1331,22 @@
     AC_DEFINE(HAVE_STAT_DOS_FLAGS, 1, [whether there is DOS flags support in the stat struct])
 fi
 
+AC_CACHE_CHECK([whether we can compile with __attribute__((destructor))],
+	       samba_cv_function_attribute_destructor,
+	       [
+	         AC_COMPILE_IFELSE(
+			[
+				__attribute__((destructor))
+				static void cleanup(void) { }
+			],
+			samba_cv_function_attribute_destructor=yes)
+		])
+
+if test x"$samba_cv_function_attribute_destructor" = xyes ; then
+   AC_DEFINE(HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR, 1,
+	     [whether we can compile with __attribute__((destructor))])
+fi
+
 #####################################
 # needed for SRV lookups
 AC_CHECK_LIB(resolv, dn_expand)

Modified: branches/samba/backports.org/squeeze/source3/include/config.h.in
===================================================================
--- branches/samba/backports.org/squeeze/source3/include/config.h.in	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/include/config.h.in	2011-08-18 04:33:07 UTC (rev 3888)
@@ -707,6 +707,9 @@
 /* Truncate extend */
 #undef HAVE_FTRUNCATE_EXTEND
 
+/* whether we can compile with __attribute__((destructor)) */
+#undef HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR
+
 /* Whether there is a __FUNCTION__ macro */
 #undef HAVE_FUNCTION_MACRO
 

Modified: branches/samba/backports.org/squeeze/source3/include/version.h
===================================================================
--- branches/samba/backports.org/squeeze/source3/include/version.h	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/include/version.h	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 5
-#define SAMBA_VERSION_RELEASE 10
-#define SAMBA_VERSION_OFFICIAL_STRING "3.5.10"
+#define SAMBA_VERSION_RELEASE 11
+#define SAMBA_VERSION_OFFICIAL_STRING "3.5.11"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/backports.org/squeeze/source3/lib/smbldap.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/lib/smbldap.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/lib/smbldap.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1093,8 +1093,9 @@
 /*******************************************************************
  connect to the ldap server under system privilege.
 ******************************************************************/
-static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_struct)
+static int smbldap_connect_system(struct smbldap_state *ldap_state)
 {
+	LDAP *ldap_struct = ldap_state->ldap_struct;
 	int rc;
 	int version;
 
@@ -1105,7 +1106,8 @@
 		/* get the default dn and password only if they are not set already */
 		if (!fetch_ldap_pw(&bind_dn, &bind_secret)) {
 			DEBUG(0, ("ldap_connect_system: Failed to retrieve password from secrets.tdb\n"));
-			return LDAP_INVALID_CREDENTIALS;
+			rc = LDAP_INVALID_CREDENTIALS;
+			goto done;
 		}
 		smbldap_set_creds(ldap_state, false, bind_dn, bind_secret);
 		SAFE_FREE(bind_dn);
@@ -1151,7 +1153,7 @@
 			       ld_error ? ld_error : "(unknown)"));
 		SAFE_FREE(ld_error);
 		ldap_state->num_failures++;
-		return rc;
+		goto done;
 	}
 
 	ldap_state->num_failures = 0;
@@ -1166,6 +1168,11 @@
 	DEBUG(3, ("ldap_connect_system: successful connection to the LDAP server\n"));
 	DEBUGADD(10, ("ldap_connect_system: LDAP server %s support paged results\n", 
 		ldap_state->paged_results ? "does" : "does not"));
+done:
+	if (rc != 0) {
+		ldap_unbind(ldap_struct);
+		ldap_state->ldap_struct = NULL;
+	}
 	return rc;
 }
 
@@ -1220,9 +1227,7 @@
 		return rc;
 	}
 
-	if ((rc = smbldap_connect_system(ldap_state, ldap_state->ldap_struct))) {
-		ldap_unbind(ldap_state->ldap_struct);
-		ldap_state->ldap_struct = NULL;
+	if ((rc = smbldap_connect_system(ldap_state))) {
 		return rc;
 	}
 
@@ -1234,7 +1239,7 @@
 
 	if (ldap_state->event_context != NULL) {
 		ldap_state->idle_event = event_add_timed(
-			ldap_state->event_context, NULL,
+			ldap_state->event_context, ldap_state,
 			timeval_current_ofs(SMBLDAP_IDLE_TIME, 0),
 			smbldap_idle_fn, ldap_state);
 	}
@@ -1259,6 +1264,8 @@
 
 	smbldap_delete_state(ldap_state);
 
+	TALLOC_FREE(ldap_state->idle_event);
+
 	DEBUG(5,("The connection to the LDAP server was closed\n"));
 	/* maybe free the results here --metze */
 
@@ -1745,7 +1752,7 @@
 		DEBUG(10,("ldap connection not idle...\n"));
 
 		state->idle_event = event_add_timed(
-			event_ctx, NULL,
+			event_ctx, state,
 			timeval_add(&now, SMBLDAP_IDLE_TIME, 0),
 			smbldap_idle_fn,
 			private_data);
@@ -1771,14 +1778,18 @@
 	SAFE_FREE((*ldap_state)->bind_dn);
 	SAFE_FREE((*ldap_state)->bind_secret);
 
-	TALLOC_FREE((*ldap_state)->idle_event);
+	TALLOC_FREE(*ldap_state);
 
-	*ldap_state = NULL;
-
 	/* No need to free any further, as it is talloc()ed */
 }
 
+static int smbldap_state_destructor(struct smbldap_state *state)
+{
+	smbldap_free_struct(&state);
+	return 0;
+}
 
+
 /**********************************************************************
  Intitalise the 'general' ldap structures, on which ldap operations may be conducted
  *********************************************************************/
@@ -1801,6 +1812,7 @@
 
 	(*smbldap_state)->event_context = event_ctx;
 
+	talloc_set_destructor(*smbldap_state, smbldap_state_destructor);
 	return NT_STATUS_OK;
 }
 

Modified: branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2508,6 +2508,7 @@
 struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
 						struct tevent_context *ev,
 						struct rpc_pipe_client *cli,
+						struct dom_sid *_domain_sid /* [in] [ref] */,
 						struct wbint_RidArray *_rids /* [in] [ref] */,
 						const char **_domain_name /* [out] [ref,charset(UTF8)] */,
 						struct wbint_Principals *_names /* [out] [ref] */)
@@ -2525,6 +2526,7 @@
 	state->dispatch_recv = cli->dispatch_recv;
 
 	/* In parameters */
+	state->orig.in.domain_sid = _domain_sid;
 	state->orig.in.rids = _rids;
 
 	/* Out parameters */
@@ -2614,6 +2616,7 @@
 
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
+				 struct dom_sid *domain_sid /* [in] [ref] */,
 				 struct wbint_RidArray *rids /* [in] [ref] */,
 				 const char **domain_name /* [out] [ref,charset(UTF8)] */,
 				 struct wbint_Principals *names /* [out] [ref] */)
@@ -2622,6 +2625,7 @@
 	NTSTATUS status;
 
 	/* In parameters */
+	r.in.domain_sid = domain_sid;
 	r.in.rids = rids;
 
 	status = cli->dispatch(cli,

Modified: branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.h
===================================================================
--- branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.h	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/cli_wbint.h	2011-08-18 04:33:07 UTC (rev 3888)
@@ -223,6 +223,7 @@
 struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx,
 						struct tevent_context *ev,
 						struct rpc_pipe_client *cli,
+						struct dom_sid *_domain_sid /* [in] [ref] */,
 						struct wbint_RidArray *_rids /* [in] [ref] */,
 						const char **_domain_name /* [out] [ref,charset(UTF8)] */,
 						struct wbint_Principals *_names /* [out] [ref] */);
@@ -231,6 +232,7 @@
 				      NTSTATUS *result);
 NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli,
 				 TALLOC_CTX *mem_ctx,
+				 struct dom_sid *domain_sid /* [in] [ref] */,
 				 struct wbint_RidArray *rids /* [in] [ref] */,
 				 const char **domain_name /* [out] [ref,charset(UTF8)] */,
 				 struct wbint_Principals *names /* [out] [ref] */);

Modified: branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/ndr_wbint.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/ndr_wbint.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/ndr_wbint.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -2076,6 +2076,10 @@
 static enum ndr_err_code ndr_push_wbint_LookupRids(struct ndr_push *ndr, int flags, const struct wbint_LookupRids *r)
 {
 	if (flags & NDR_IN) {
+		if (r->in.domain_sid == NULL) {
+			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+		}
+		NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->in.domain_sid));
 		if (r->in.rids == NULL) {
 			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
 		}
@@ -2104,6 +2108,7 @@
 static enum ndr_err_code ndr_pull_wbint_LookupRids(struct ndr_pull *ndr, int flags, struct wbint_LookupRids *r)
 {
 	uint32_t _ptr_domain_name;
+	TALLOC_CTX *_mem_save_domain_sid_0;
 	TALLOC_CTX *_mem_save_rids_0;
 	TALLOC_CTX *_mem_save_domain_name_0;
 	TALLOC_CTX *_mem_save_domain_name_1;
@@ -2112,6 +2117,13 @@
 		ZERO_STRUCT(r->out);
 
 		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, r->in.domain_sid);
+		}
+		_mem_save_domain_sid_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->in.domain_sid, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, r->in.domain_sid));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_sid_0, LIBNDR_FLAG_REF_ALLOC);
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
 			NDR_PULL_ALLOC(ndr, r->in.rids);
 		}
 		_mem_save_rids_0 = NDR_PULL_GET_MEM_CTX(ndr);
@@ -2170,6 +2182,10 @@
 	if (flags & NDR_IN) {
 		ndr_print_struct(ndr, "in", "wbint_LookupRids");
 		ndr->depth++;
+		ndr_print_ptr(ndr, "domain_sid", r->in.domain_sid);
+		ndr->depth++;
+		ndr_print_dom_sid(ndr, "domain_sid", r->in.domain_sid);
+		ndr->depth--;
 		ndr_print_ptr(ndr, "rids", r->in.rids);
 		ndr->depth++;
 		ndr_print_wbint_RidArray(ndr, "rids", r->in.rids);

Modified: branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/wbint.h
===================================================================
--- branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/wbint.h	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/librpc/gen_ndr/wbint.h	2011-08-18 04:33:07 UTC (rev 3888)
@@ -276,6 +276,7 @@
 
 struct wbint_LookupRids {
 	struct {
+		struct dom_sid *domain_sid;/* [ref] */
 		struct wbint_RidArray *rids;/* [ref] */
 	} in;
 

Modified: branches/samba/backports.org/squeeze/source3/librpc/idl/wbint.idl
===================================================================
--- branches/samba/backports.org/squeeze/source3/librpc/idl/wbint.idl	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/librpc/idl/wbint.idl	2011-08-18 04:33:07 UTC (rev 3888)
@@ -140,6 +140,7 @@
 	);
 
     NTSTATUS wbint_LookupRids(
+	[in] dom_sid *domain_sid,
 	[in] wbint_RidArray *rids,
 	[out,string,charset(UTF8)] char **domain_name,
 	[out] wbint_Principals *names

Modified: branches/samba/backports.org/squeeze/source3/nmbd/nmbd_packets.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/nmbd/nmbd_packets.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/nmbd/nmbd_packets.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -1729,19 +1729,23 @@
 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
 		if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) {
 			/* We have to ignore sockets outside FD_SETSIZE. */
-			continue;
+			sock_array[num++] = -1;
+		} else {
+			FD_SET(subrec->nmb_sock,pset);
+			sock_array[num++] = subrec->nmb_sock;
+			*maxfd = MAX( *maxfd, subrec->nmb_sock);
 		}
-		FD_SET(subrec->nmb_sock,pset);
-		sock_array[num++] = subrec->nmb_sock;
-		*maxfd = MAX( *maxfd, subrec->nmb_sock);
 
 		if (subrec->nmb_bcast < 0 || subrec->nmb_bcast >= FD_SETSIZE) {
 			/* We have to ignore sockets outside FD_SETSIZE. */
-			continue;
+			sock_array[num++] = -1;
+		} else {
+			sock_array[num++] = subrec->nmb_bcast;
+			if (subrec->nmb_bcast != -1) {
+				FD_SET(subrec->nmb_bcast,pset);
+				*maxfd = MAX( *maxfd, subrec->nmb_bcast);
+			}
 		}
-		sock_array[num++] = subrec->nmb_bcast;
-		FD_SET(subrec->nmb_bcast,pset);
-		*maxfd = MAX( *maxfd, subrec->nmb_bcast);
 	}
 
 	/* Add in the lp_socket_address() interface on 138. */
@@ -1761,23 +1765,27 @@
 	for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) {
 		if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) {
 			/* We have to ignore sockets outside FD_SETSIZE. */
-			continue;
+			sock_array[num++] = -1;
+		} else {
+			FD_SET(subrec->dgram_sock,pset);
+			sock_array[num++] = subrec->dgram_sock;
+			*maxfd = MAX( *maxfd, subrec->dgram_sock);
 		}
-		FD_SET(subrec->dgram_sock,pset);
-		sock_array[num++] = subrec->dgram_sock;
-		*maxfd = MAX( *maxfd, subrec->dgram_sock);
 
 		if (subrec->dgram_bcast < 0 || subrec->dgram_bcast >= FD_SETSIZE) {
 			/* We have to ignore sockets outside FD_SETSIZE. */
-			continue;
+			sock_array[num++] = -1;
+		} else {
+			sock_array[num++] = subrec->dgram_bcast;
+			if (subrec->dgram_bcast != -1) {
+				FD_SET(subrec->dgram_bcast,pset);
+				*maxfd = MAX( *maxfd, subrec->dgram_bcast);
+			}
 		}
-		sock_array[num++] = subrec->dgram_bcast;
-		if (subrec->dgram_bcast != -1) {
-			FD_SET(subrec->dgram_bcast,pset);
-			*maxfd = MAX( *maxfd, subrec->dgram_bcast);
-		}
 	}
 
+	SMB_ASSERT(count == num);
+
 	*listen_number = count;
 
 	SAFE_FREE(*ppset);

Modified: branches/samba/backports.org/squeeze/source3/nmbd/nmbd_subnetdb.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/nmbd/nmbd_subnetdb.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/nmbd/nmbd_subnetdb.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -55,13 +55,21 @@
 
 void close_subnet(struct subnet_record *subrec)
 {
+	if (subrec->nmb_sock != -1) {
+		close(subrec->nmb_sock);
+		subrec->nmb_sock = -1;
+	}
+	if (subrec->nmb_bcast != -1) {
+		close(subrec->nmb_bcast);
+		subrec->nmb_bcast = -1;
+	}
 	if (subrec->dgram_sock != -1) {
 		close(subrec->dgram_sock);
 		subrec->dgram_sock = -1;
 	}
-	if (subrec->nmb_sock != -1) {
-		close(subrec->nmb_sock);
-		subrec->nmb_sock = -1;
+	if (subrec->dgram_bcast != -1) {
+		close(subrec->dgram_bcast);
+		subrec->dgram_bcast = -1;
 	}
 
 	DLIST_REMOVE(subnetlist, subrec);

Modified: branches/samba/backports.org/squeeze/source3/smbd/file_access.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/smbd/file_access.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/smbd/file_access.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -77,6 +77,11 @@
 		return False;
 	}
 
+	if (!lp_acl_check_permissions(SNUM(conn))) {
+		/* This option means don't check. */
+		return true;
+	}
+
 	/* Get the parent directory permission mask and owners. */
 	if (!parent_dirname(ctx, smb_fname->base_name, &dname, NULL)) {
 		return False;

Modified: branches/samba/backports.org/squeeze/source3/smbd/negprot.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/smbd/negprot.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/smbd/negprot.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -382,6 +382,7 @@
 			reply_nterror(req, NT_STATUS_NO_MEMORY);
 			return;
 		}
+		p += ret;
 		DEBUG(3,("not using SPNEGO\n"));
 	} else {
 		DATA_BLOB spnego_blob = negprot_spnego();

Modified: branches/samba/backports.org/squeeze/source3/smbd/open.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/smbd/open.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/smbd/open.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -86,6 +86,16 @@
 	NTSTATUS status;
 	struct security_descriptor *sd = NULL;
 
+	if ((access_mask & DELETE_ACCESS) && !lp_acl_check_permissions(SNUM(conn))) {
+		*access_granted = access_mask;
+
+		DEBUG(10,("smbd_check_open_rights: not checking ACL "
+			"on DELETE_ACCESS on file %s. Granting 0x%x\n",
+			smb_fname_str_dbg(smb_fname),
+			(unsigned int)*access_granted ));
+		return NT_STATUS_OK;
+	}
+
 	status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
 			(OWNER_SECURITY_INFORMATION |
 			GROUP_SECURITY_INFORMATION |
@@ -2967,8 +2977,7 @@
 
 	/* Setting FILE_SHARE_DELETE is the hint. */
 
-	if (lp_acl_check_permissions(SNUM(conn))
-	    && (create_disposition != FILE_CREATE)
+	if ((create_disposition != FILE_CREATE)
 	    && (access_mask & DELETE_ACCESS)
 	    && (!(can_delete_file_in_directory(conn, smb_fname) ||
 		 can_access_file_acl(conn, smb_fname, DELETE_ACCESS)))) {

Modified: branches/samba/backports.org/squeeze/source3/smbd/server.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/smbd/server.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/smbd/server.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -278,7 +278,8 @@
 		}
 	}
 
-	DEBUG(0, ("Could not find child %d -- ignoring\n", (int)pid));
+	/* not all forked child processes are added to the children list */
+	DEBUG(1, ("Could not find child %d -- ignoring\n", (int)pid));
 }
 
 /****************************************************************************

Modified: branches/samba/backports.org/squeeze/source3/winbindd/winbindd_dual_srv.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/winbindd/winbindd_dual_srv.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/winbindd/winbindd_dual_srv.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -373,7 +373,7 @@
 	}
 
 	status = domain->methods->rids_to_names(
-		domain, talloc_tos(), &domain->sid, r->in.rids->rids,
+		domain, talloc_tos(), r->in.domain_sid, r->in.rids->rids,
 		r->in.rids->num_rids, &domain_name, &names, &types);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
@@ -388,7 +388,8 @@
 	}
 
 	for (i=0; i<r->in.rids->num_rids; i++) {
-		sid_compose(&result[i].sid, &domain->sid, r->in.rids->rids[i]);
+		sid_compose(&result[i].sid, r->in.domain_sid,
+			    r->in.rids->rids[i]);
 		result[i].type = types[i];
 		result[i].name = talloc_move(result, &names[i]);
 	}

Modified: branches/samba/backports.org/squeeze/source3/winbindd/winbindd_lookuprids.c
===================================================================
--- branches/samba/backports.org/squeeze/source3/winbindd/winbindd_lookuprids.c	2011-08-12 06:27:03 UTC (rev 3887)
+++ branches/samba/backports.org/squeeze/source3/winbindd/winbindd_lookuprids.c	2011-08-18 04:33:07 UTC (rev 3888)
@@ -23,6 +23,7 @@
 
 struct winbindd_lookuprids_state {
 	struct tevent_context *ev;
+	struct dom_sid domain_sid;
 	const char *domain_name;
 	struct wbint_RidArray rids;
 	struct wbint_Principals names;
@@ -41,7 +42,6 @@
 	struct tevent_req *req, *subreq;
 	struct winbindd_lookuprids_state *state;
 	struct winbindd_domain *domain;
-	struct dom_sid sid;
 
 	req = tevent_req_create(mem_ctx, &state,
 				struct winbindd_lookuprids_state);
@@ -55,16 +55,16 @@
 
 	DEBUG(3, ("lookuprids (%s)\n", request->data.sid));
 
-	if (!string_to_sid(&sid, request->data.sid)) {
+	if (!string_to_sid(&state->domain_sid, request->data.sid)) {
 		DEBUG(5, ("%s not a SID\n", request->data.sid));
 		tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER);
 		return tevent_req_post(req, ev);
 	}
 
-	domain = find_lookup_domain_from_sid(&sid);
+	domain = find_lookup_domain_from_sid(&state->domain_sid);
 	if (domain == NULL) {
 		DEBUG(5, ("Domain for sid %s not found\n",
-			  sid_string_dbg(&sid)));
+			  sid_string_dbg(&state->domain_sid)));
 		tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN);
 		return tevent_req_post(req, ev);
 	}
@@ -83,8 +83,8 @@
 	}
 
 	subreq = rpccli_wbint_LookupRids_send(
-		state, ev, domain->child.rpccli, &state->rids,
-		&state->domain_name, &state->names);
+		state, ev, domain->child.rpccli, &state->domain_sid,
+		&state->rids, &state->domain_name, &state->names);
 	if (tevent_req_nomem(subreq, req)) {
 		return tevent_req_post(req, ev);
 	}





More information about the Pkg-samba-maint mailing list