Tue Oct 30 06:15:58 UTC 2012

Author: bubulle
Date: 2012-10-30 06:15:57 +0000 (Tue, 30 Oct 2012)
New Revision: 4174

Modified:
   branches/samba/upstream/WHATSNEW.txt
   branches/samba/upstream/docs-xml/htmldocs.html
   branches/samba/upstream/docs-xml/manpages-3/winbindd.8.xml
   branches/samba/upstream/docs-xml/smbdotconf/security/serversigning.xml
   branches/samba/upstream/docs/manpages/eventlogadm.8
   branches/samba/upstream/docs/manpages/findsmb.1
   branches/samba/upstream/docs/manpages/idmap_ad.8
   branches/samba/upstream/docs/manpages/idmap_adex.8
   branches/samba/upstream/docs/manpages/idmap_autorid.8
   branches/samba/upstream/docs/manpages/idmap_hash.8
   branches/samba/upstream/docs/manpages/idmap_ldap.8
   branches/samba/upstream/docs/manpages/idmap_nss.8
   branches/samba/upstream/docs/manpages/idmap_rid.8
   branches/samba/upstream/docs/manpages/idmap_tdb.8
   branches/samba/upstream/docs/manpages/idmap_tdb2.8
   branches/samba/upstream/docs/manpages/libsmbclient.7
   branches/samba/upstream/docs/manpages/lmhosts.5
   branches/samba/upstream/docs/manpages/log2pcap.1
   branches/samba/upstream/docs/manpages/net.8
   branches/samba/upstream/docs/manpages/nmbd.8
   branches/samba/upstream/docs/manpages/nmblookup.1
   branches/samba/upstream/docs/manpages/ntlm_auth.1
   branches/samba/upstream/docs/manpages/pam_winbind.8
   branches/samba/upstream/docs/manpages/pam_winbind.conf.5
   branches/samba/upstream/docs/manpages/pdbedit.8
   branches/samba/upstream/docs/manpages/profiles.1
   branches/samba/upstream/docs/manpages/rpcclient.1
   branches/samba/upstream/docs/manpages/samba.7
   branches/samba/upstream/docs/manpages/sharesec.1
   branches/samba/upstream/docs/manpages/smb.conf.5
   branches/samba/upstream/docs/manpages/smbcacls.1
   branches/samba/upstream/docs/manpages/smbclient.1
   branches/samba/upstream/docs/manpages/smbcontrol.1
   branches/samba/upstream/docs/manpages/smbcquotas.1
   branches/samba/upstream/docs/manpages/smbd.8
   branches/samba/upstream/docs/manpages/smbget.1
   branches/samba/upstream/docs/manpages/smbgetrc.5
   branches/samba/upstream/docs/manpages/smbpasswd.5
   branches/samba/upstream/docs/manpages/smbpasswd.8
   branches/samba/upstream/docs/manpages/smbspool.8
   branches/samba/upstream/docs/manpages/smbstatus.1
   branches/samba/upstream/docs/manpages/smbta-util.8
   branches/samba/upstream/docs/manpages/smbtar.1
   branches/samba/upstream/docs/manpages/smbtree.1
   branches/samba/upstream/docs/manpages/swat.8
   branches/samba/upstream/docs/manpages/tdbbackup.8
   branches/samba/upstream/docs/manpages/tdbdump.8
   branches/samba/upstream/docs/manpages/tdbtool.8
   branches/samba/upstream/docs/manpages/testparm.1
   branches/samba/upstream/docs/manpages/vfs_acl_tdb.8
   branches/samba/upstream/docs/manpages/vfs_acl_xattr.8
   branches/samba/upstream/docs/manpages/vfs_aio_fork.8
   branches/samba/upstream/docs/manpages/vfs_aio_pthread.8
   branches/samba/upstream/docs/manpages/vfs_audit.8
   branches/samba/upstream/docs/manpages/vfs_cacheprime.8
   branches/samba/upstream/docs/manpages/vfs_cap.8
   branches/samba/upstream/docs/manpages/vfs_catia.8
   branches/samba/upstream/docs/manpages/vfs_commit.8
   branches/samba/upstream/docs/manpages/vfs_crossrename.8
   branches/samba/upstream/docs/manpages/vfs_default_quota.8
   branches/samba/upstream/docs/manpages/vfs_dirsort.8
   branches/samba/upstream/docs/manpages/vfs_extd_audit.8
   branches/samba/upstream/docs/manpages/vfs_fake_perms.8
   branches/samba/upstream/docs/manpages/vfs_fileid.8
   branches/samba/upstream/docs/manpages/vfs_full_audit.8
   branches/samba/upstream/docs/manpages/vfs_gpfs.8
   branches/samba/upstream/docs/manpages/vfs_netatalk.8
   branches/samba/upstream/docs/manpages/vfs_notify_fam.8
   branches/samba/upstream/docs/manpages/vfs_prealloc.8
   branches/samba/upstream/docs/manpages/vfs_preopen.8
   branches/samba/upstream/docs/manpages/vfs_readahead.8
   branches/samba/upstream/docs/manpages/vfs_readonly.8
   branches/samba/upstream/docs/manpages/vfs_recycle.8
   branches/samba/upstream/docs/manpages/vfs_scannedonly.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8
   branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8
   branches/samba/upstream/docs/manpages/vfs_streams_depot.8
   branches/samba/upstream/docs/manpages/vfs_streams_xattr.8
   branches/samba/upstream/docs/manpages/vfs_time_audit.8
   branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8
   branches/samba/upstream/docs/manpages/vfstest.1
   branches/samba/upstream/docs/manpages/wbinfo.1
   branches/samba/upstream/docs/manpages/winbind_krb5_locator.7
   branches/samba/upstream/docs/manpages/winbindd.8
   branches/samba/upstream/lib/addns/dnsmarshall.c
   branches/samba/upstream/lib/replace/poll.c
   branches/samba/upstream/lib/tdb/common/io.c
   branches/samba/upstream/lib/tdb/common/open.c
   branches/samba/upstream/libcli/auth/ntlm_check.c
   branches/samba/upstream/libcli/auth/proto.h
   branches/samba/upstream/libcli/auth/smbencrypt.c
   branches/samba/upstream/libcli/smb/smb2_create_blob.c
   branches/samba/upstream/nsswitch/pam_winbind.c
   branches/samba/upstream/packaging/RHEL-CTDB/samba.spec
   branches/samba/upstream/packaging/RHEL/makerpms.sh
   branches/samba/upstream/packaging/RHEL/samba.spec
   branches/samba/upstream/packaging/RHEL/samba.spec.tmpl
   branches/samba/upstream/packaging/systemd/nmb.service
   branches/samba/upstream/packaging/systemd/smb.service
   branches/samba/upstream/packaging/systemd/winbind.service
   branches/samba/upstream/source3/VERSION
   branches/samba/upstream/source3/configure
   branches/samba/upstream/source3/configure.in
   branches/samba/upstream/source3/include/version.h
   branches/samba/upstream/source3/lib/ldb_compat.c
   branches/samba/upstream/source3/lib/sysquotas.c
   branches/samba/upstream/source3/libsmb/clispnego.c
   branches/samba/upstream/source3/printing/printer_list.c
   branches/samba/upstream/source3/printing/printing.c
   branches/samba/upstream/source3/printing/printspoolss.c
   branches/samba/upstream/source3/rpc_client/cli_winreg_spoolss.c
   branches/samba/upstream/source3/rpc_server/svcctl/srv_svcctl_reg.c
   branches/samba/upstream/source3/selftest/knownfail
   branches/samba/upstream/source3/selftest/tests.py
   branches/samba/upstream/source3/smbd/file_access.c
   branches/samba/upstream/source3/smbd/globals.h
   branches/samba/upstream/source3/smbd/lanman.c
   branches/samba/upstream/source3/smbd/open.c
   branches/samba/upstream/source3/smbd/posix_acls.c
   branches/samba/upstream/source3/smbd/proto.h
   branches/samba/upstream/source3/smbd/quotas.c
   branches/samba/upstream/source3/smbd/server.c
   branches/samba/upstream/source3/smbd/server_reload.c
   branches/samba/upstream/source3/smbd/sesssetup.c
   branches/samba/upstream/source3/smbd/smb2_create.c
   branches/samba/upstream/source3/smbd/smb2_notify.c
   branches/samba/upstream/source3/smbd/smb2_server.c
   branches/samba/upstream/source3/smbd/smb2_sesssetup.c
   branches/samba/upstream/source3/smbd/smb2_tcon.c
   branches/samba/upstream/source3/torture/torture.c
   branches/samba/upstream/source3/utils/net_rpc.c
   branches/samba/upstream/source3/winbindd/idmap_hash/idmap_hash.c
   branches/samba/upstream/source3/winbindd/winbindd_cm.c
   branches/samba/upstream/source4/lib/ldb/common/ldb_parse.c
   branches/samba/upstream/source4/torture/smb2/compound.c
   branches/samba/upstream/source4/torture/smb2/oplock.c
Log:
Load samba-3.6.9 into branches/samba/upstream.

Modified: branches/samba/upstream/WHATSNEW.txt
===================================================================

--- branches/samba/upstream/WHATSNEW.txt	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/WHATSNEW.txt	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1,4 +1,134 @@
                    =============================
+                   Release Notes for Samba 3.6.9
+                         October 29, 2012
+                   =============================
+
+
+This is is the latest stable release of Samba 3.6.
+
+Major enhancements in Samba 3.6.9 include:
+
+o  When setting a non-default ACL, don't forget to apply masks to
+   SMB_ACL_USER and SMB_ACL_GROUP entries (bug #9236).
+o  Winbind can't fetch user or group info from AD via LDAP (bug #9147).
+o  Fix segfault in smbd if user specified ports out for range (bug #9218).
+
+
+Changes since 3.6.8:
+--------------------
+
+o   Michael Adam <obnox at samba.org>
+    * BUG 9173: Make SMB2 compound request create/delete_on_close/close work as
+      Windows.
+
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 8966: Fix 'net rpc share allowedusers' to work with 2008r2.
+    * BUG 9016: Connection to outbound trusted domain goes offline.
+    * BUG 9117: 'smbclient' can't connect to a Windows 7 server using NTLMv2.
+    * BUG 9147: Winbind can't fetch user or group info from AD via LDAP.
+    * BUG 9174: Empty SPNEGO packet can cause smbd to crash.
+    * BUG 9189: SMB2 Create doesn't return correct MAX ACCESS access mask in
+      blob.
+    * BUG 9209: Parse of invalid SMB2 create blob can cause smbd crash.
+    * BUG 9213: Bad ASN.1 NegTokenInit packet can cause invalid free.
+    * BUG 9222: Signing cannot be disabled for SMB2 by design, so fix the
+      documentation instead.
+    * BUG 9236: When setting a non-default ACL, don't forget to apply masks to
+      SMB_ACL_USER and SMB_ACL_GROUP entries.
+
+
+o   Andrew Bartlett <abartlet at samba.org>
+    * BUG 8788: Initialise ticket to ensure we do not invalid memory.
+
+
+o   Ira Cooper <ira at samba.org>
+    * BUG 9173: Compound requests should continue processing.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 9177: pam_winbind: Match more return codes when wbcGetPwnam has failed.
+
+
+o   Björn Jacke <bj at sernet.de>
+    * BUG 3272: quota: Don't force the block size to 512.
+    * BUG 8107: Add some includes for poll.h.
+    * BUG 8146: Fix wrong test == syntax in configure.
+    * BUG 8344: Fix --with(out)-sendfile-support option handling in autoconf.
+    * BUG 9172: Add quota support for gfs2.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 9188: Fix crash bug in idmap_hash.
+    * BUG 9268: Make tdb robust against improper CLEAR_IF_FIRST restart.
+
+
+o   Luca Lorenzetto <lorenzetto-luca at ubuntu-it.org>
+    * BUG 9013: Fix crash on null pam change pw response.
+
+
+o   Vladimir Marek <Vladimir.Marek at Oracle.COM>
+    * BUG 9192: Fix service control for non-internal services.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 9173: Make SMB2 compound request create/delete_on_close/close work as
+      Windows.
+    * BUG 9196: Don't take 'state->te' as indication for "was_deferred".
+    * BUG 9209: Fix unitialized padding in smb2_create_blob_push_one().
+
+
+o   Matthieu Patou <mat at matws.net>
+    * BUG 9259: lib-addns: ensure that allocated buffer are pre set to 0.
+
+
+o   Rusty Russell <rusty at rustcorp.com.au>
+    * BUG 9268: Make robust against shrinking tdbs.
+
+
+o   Joachim Schmitz <schmitz at hp.com>
+    * BUG 8107: Fix poll replacement to become a msleep replacement.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 8632: Fix builtin forms order to match Windows again.
+    * BUG 8769: Fix RAW printing for normal users.
+    * BUG 9112: Increase debug level for info that the db is empty.
+    * BUG 9154: Open printers with the right access mask.
+    * BUG 9171: Remove non-existent option '-Y' from winbindd manpage.
+    * BUG 9218: Fix segfault in smbd if user specified ports out for range.
+    * BUG 9231: Fix NT_STATUS_IO_TIMEOUT during slow import of printers into
+      registry.
+    * BUG 9280: Add support for reloading systemd services.
+
+
+o   Karolin Seeger <kseeger at samba.org>
+    * BUG 9165: Fix makerpms.sh on RHEL.
+
+
+######################################################################
+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.6 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.6.8
                          September 17, 2012
                    =============================
@@ -100,9 +230,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    =============================
                    Release Notes for Samba 3.6.7
                            August 6, 2012

Modified: branches/samba/upstream/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/upstream/docs/manpages/eventlogadm.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/eventlogadm.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/findsmb.1
===================================================================
--- branches/samba/upstream/docs/manpages/findsmb.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/findsmb.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_ad.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_ad.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_ad.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_adex.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_adex.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_adex.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_autorid.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_autorid.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_autorid.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_hash.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_hash.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_hash.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_ldap.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_ldap.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_ldap.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_nss.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_nss.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_nss.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_rid.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_rid.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_rid.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_tdb.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_tdb.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/idmap_tdb2.8
===================================================================
--- branches/samba/upstream/docs/manpages/idmap_tdb2.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/idmap_tdb2.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba/upstream/docs/manpages/libsmbclient.7	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/libsmbclient.7	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "09/14/2012" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "10/29/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/upstream/docs/manpages/lmhosts.5	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/lmhosts.5	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/log2pcap.1
===================================================================
--- branches/samba/upstream/docs/manpages/log2pcap.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/log2pcap.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/net.8
===================================================================
--- branches/samba/upstream/docs/manpages/net.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/net.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NET" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/nmbd.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/nmbd.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/upstream/docs/manpages/nmblookup.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/nmblookup.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/pam_winbind.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: 8
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "09/14/2012" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "10/29/2012" "Samba 3\&.6" "8"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pam_winbind.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "09/14/2012" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "10/29/2012" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/upstream/docs/manpages/pdbedit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/pdbedit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/profiles.1
===================================================================
--- branches/samba/upstream/docs/manpages/profiles.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/profiles.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/rpcclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/rpcclient.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/rpcclient.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/samba.7
===================================================================
--- branches/samba/upstream/docs/manpages/samba.7	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/samba.7	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "09/14/2012" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "10/29/2012" "Samba 3\&.6" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/sharesec.1
===================================================================
--- branches/samba/upstream/docs/manpages/sharesec.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/sharesec.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/smb.conf.5	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smb.conf.5	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -8876,14 +8876,20 @@
 .\" server signing
 .PP
 .RS 4
-This controls whether the client is allowed or required to use SMB signing\&. Possible values are
+This controls whether the client is allowed or required to use SMB1 and SMB2 signing\&. Possible values are
 \fIauto\fR,
 \fImandatory\fR
 and
 \fIdisabled\fR\&.
 .sp
-When set to auto, SMB signing is offered, but not enforced\&. When set to mandatory, SMB signing is required and if set to disabled, SMB signing is not offered either\&.
+When set to auto, SMB1 signing is offered, but not enforced\&. When set to mandatory, SMB1 signing is required and if set to disabled, SMB signing is not offered either\&.
 .sp
+For the SMB2 protocol, by design, signing cannot be disabled\&. In the case where SMB2 is negotiated, if this parameter is set to
+\fIdisabled\fR, it will be treated as
+\fIauto\fR\&. Setting it to
+\fImandatory\fR
+will still require SMB2 clients to use signing\&.
+.sp
 Default:
 \fI\fIserver signing\fR\fR\fI = \fR\fIDisabled\fR\fI \fR
 .RE

Modified: branches/samba/upstream/docs/manpages/smbcacls.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcacls.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbcacls.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbclient.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbclient.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcontrol.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbcontrol.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcquotas.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbcquotas.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbd.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbd.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbget.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbget.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbget.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba/upstream/docs/manpages/smbgetrc.5	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbgetrc.5	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbpasswd.5
===================================================================
--- branches/samba/upstream/docs/manpages/smbpasswd.5	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbpasswd.5	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "09/14/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbpasswd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbpasswd.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbpasswd.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbspool.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbspool.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbspool.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbstatus.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbstatus.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbstatus.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbta-util.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbta-util.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbta-util.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbta-util
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTA\-UTIL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtar.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtar.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbtar.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtree.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtree.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/smbtree.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/swat.8
===================================================================
--- branches/samba/upstream/docs/manpages/swat.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/swat.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbbackup.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/tdbbackup.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbdump.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbdump.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/tdbdump.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbtool.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbtool.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/tdbtool.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/testparm.1
===================================================================
--- branches/samba/upstream/docs/manpages/testparm.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/testparm.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_acl_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_acl_xattr.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_aio_fork.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_fork
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_aio_pthread.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_aio_pthread
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_audit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_audit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_cacheprime.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_cap.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_cap.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_cap.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_catia.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_catia.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_catia.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_commit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_commit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_commit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_crossrename.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_crossrename.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_crossrename.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_default_quota.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_default_quota.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_default_quota.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_dirsort.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_dirsort.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_dirsort.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_extd_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_fake_perms.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_fileid.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_fileid.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_fileid.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_full_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_full_audit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_full_audit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_gpfs.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_gpfs.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_gpfs.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_netatalk.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_netatalk.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_netatalk.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_notify_fam.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_prealloc.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_prealloc.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_prealloc.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_preopen.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_preopen.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_preopen.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_readahead.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_readahead.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_readahead.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_readonly.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_readonly.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_readonly.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_recycle.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_recycle.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_recycle.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_scannedonly.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_shadow_copy.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_streams_depot.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_streams_xattr.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_time_audit.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_time_audit.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_time_audit.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_time_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfstest.1
===================================================================
--- branches/samba/upstream/docs/manpages/vfstest.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/vfstest.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/upstream/docs/manpages/wbinfo.1	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/wbinfo.1	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "09/14/2012" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbind_krb5_locator.7
===================================================================
--- branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2012-10-30 06:15:57 UTC (rev 4174)
@@ -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: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "09/14/2012" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "10/29/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbindd.8
===================================================================
--- branches/samba/upstream/docs/manpages/winbindd.8	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs/manpages/winbindd.8	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 09/14/2012
+.\"      Date: 10/29/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "09/14/2012" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
 winbindd \- Name Service Switch daemon for resolving names from NT servers
 .SH "SYNOPSIS"
 .HP \w'\ 'u
-winbindd [\-D] [\-F] [\-S] [\-i] [\-Y] [\-d\ <debug\ level>] [\-s\ <smb\ config\ file>] [\-n]
+winbindd [\-D] [\-F] [\-S] [\-i] [\-d\ <debug\ level>] [\-s\ <smb\ config\ file>] [\-n]
 .SH "DESCRIPTION"
 .PP
 This program is part of the
@@ -220,11 +220,6 @@
 .RS 4
 Disable caching\&. This means winbindd will always have to wait for a response from the domain controller before it can respond to a client and this thus makes things slower\&. The results will however be more accurate, since results from the cache might not be up\-to\-date\&. This might also temporarily hang winbindd if the DC doesn\'t respond\&.
 .RE
-.PP
-\-Y
-.RS 4
-Single daemon mode\&. This means winbindd will run as a single process (the mode of operation in Samba 2\&.2)\&. Winbindd\'s default behavior is to launch a child process that is responsible for updating expired cache entries\&.
-.RE
 .SH "NAME AND ID RESOLUTION"
 .PP
 Users and groups on a Windows NT server are assigned a security id (SID) which is globally unique when the user or group is created\&. To convert the Windows NT user or group into a unix user or group, a mapping between SIDs and unix user and group ids is required\&. This is one of the jobs that

Modified: branches/samba/upstream/docs-xml/htmldocs.html
===================================================================
--- branches/samba/upstream/docs-xml/htmldocs.html	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs-xml/htmldocs.html	2012-10-30 06:15:57 UTC (rev 4174)
@@ -23,10 +23,6 @@
  <td valign="top">This book provides example configurations, it documents key aspects of Microsoft Windows networking, provides in-depth insight into the important configuration of Samba-3, and helps to put all of these into a useful framework.</td>
 </tr>
 <tr>
- <td valign="top"><a href="using_samba/toc.html">Using Samba</a>, 2nd Edition</td>
- <td valign="top"><i>Using Samba</i>, Second Edition is a comprehensive guide to Samba administration. It covers all versions of Samba from 2.0 to 2.2, including selected features from an alpha version of 3.0, as well as the SWAT graphical configuration tool. Updated for Windows 2000, ME, and XP, the book also explores Samba's new role as a primary domain controller and domain member server, its support for the use of Windows NT/2000/XP authentication and filesystem security on the host Unix system, and accessing shared files and printers from Unix clients.</td>
-</tr>
-<tr>
  <td valign="top"><a href="manpages/index.html">Man pages</a></td>
  <td valign="top">The Samba man pages in HTML.</td>
 </tr>

Modified: branches/samba/upstream/docs-xml/manpages-3/winbindd.8.xml
===================================================================
--- branches/samba/upstream/docs-xml/manpages-3/winbindd.8.xml	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs-xml/manpages-3/winbindd.8.xml	2012-10-30 06:15:57 UTC (rev 4174)
@@ -24,7 +24,6 @@
 		<arg choice="opt">-F</arg>
 		<arg choice="opt">-S</arg>
 		<arg choice="opt">-i</arg>
-		<arg choice="opt">-Y</arg>
 		<arg choice="opt">-d <debug level></arg>
 		<arg choice="opt">-s <smb config file></arg>
 		<arg choice="opt">-n</arg>
@@ -193,15 +192,6 @@
 		</para></listitem>
 		</varlistentry>
 
-		<varlistentry>
-		<term>-Y</term>
-		<listitem><para>Single daemon mode. This means winbindd will run
-		as a single process (the mode of operation in Samba 2.2).  Winbindd's
-		default behavior is to launch a child process that is responsible for
-		updating expired cache entries.
-		</para></listitem>
-		</varlistentry>
-
 	</variablelist>
 </refsect1>
 

Modified: branches/samba/upstream/docs-xml/smbdotconf/security/serversigning.xml
===================================================================
--- branches/samba/upstream/docs-xml/smbdotconf/security/serversigning.xml	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/docs-xml/smbdotconf/security/serversigning.xml	2012-10-30 06:15:57 UTC (rev 4174)
@@ -5,14 +5,19 @@
 		 xmlns:samba="http://www.samba.org/samba/DTD/samba-doc">
 <description>
 
-    <para>This controls whether the client is allowed or required to use SMB signing. Possible values 
-    are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis> 
-    and <emphasis>disabled</emphasis>. 
+    <para>This controls whether the client is allowed or required to use SMB1 and SMB2 signing. Possible values
+    are <emphasis>auto</emphasis>, <emphasis>mandatory</emphasis>
+    and <emphasis>disabled</emphasis>.
     </para>
 
-    <para>When set to auto, SMB signing is offered, but not enforced. 
-    When set to mandatory, SMB signing is required and if set 
-	to disabled, SMB signing is not offered either.</para>
+    <para>When set to auto, SMB1 signing is offered, but not enforced.
+    When set to mandatory, SMB1 signing is required and if set
+    to disabled, SMB signing is not offered either.</para>
+
+    <para>For the SMB2 protocol, by design, signing cannot be disabled. In the case
+    where SMB2 is negotiated, if this parameter is set to <emphasis>disabled</emphasis>,
+    it will be treated as <emphasis>auto</emphasis>. Setting it to <emphasis>mandatory</emphasis>
+    will still require SMB2 clients to use signing.</para>
 </description>
 
 <value type="default">Disabled</value>

Modified: branches/samba/upstream/lib/addns/dnsmarshall.c
===================================================================
--- branches/samba/upstream/lib/addns/dnsmarshall.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/lib/addns/dnsmarshall.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -27,7 +27,7 @@
 {
 	struct dns_buffer *result;
 
-	if (!(result = talloc(mem_ctx, struct dns_buffer))) {
+	if (!(result = talloc_zero(mem_ctx, struct dns_buffer))) {
 		return NULL;
 	}
 
@@ -39,7 +39,7 @@
 	 */
 	result->size = 2;
 
-	if (!(result->data = TALLOC_ARRAY(result, uint8, result->size))) {
+	if (!(result->data = TALLOC_ZERO_ARRAY(result, uint8, result->size))) {
 		TALLOC_FREE(result);
 		return NULL;
 	}
@@ -216,14 +216,14 @@
 		return;
 	}
 
-	if (!(label = talloc(mem_ctx, struct dns_domain_label))) {
+	if (!(label = talloc_zero(mem_ctx, struct dns_domain_label))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
 
 	label->len = len;
 
-	if (!(label->label = TALLOC_ARRAY(label, char, len+1))) {
+	if (!(label->label = TALLOC_ZERO_ARRAY(label, char, len+1))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		goto error;
 	}
@@ -250,7 +250,7 @@
 
 	if (!ERR_DNS_IS_OK(buf->error)) return;
 
-	if (!(name = talloc(mem_ctx, struct dns_domain_name))) {
+	if (!(name = talloc_zero(mem_ctx, struct dns_domain_name))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -281,7 +281,7 @@
 
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-	if (!(q = talloc(mem_ctx, struct dns_question))) {
+	if (!(q = talloc_zero(mem_ctx, struct dns_question))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -314,7 +314,7 @@
 
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
-	if (!(r = talloc(mem_ctx, struct dns_rrec))) {
+	if (!(r = talloc_zero(mem_ctx, struct dns_rrec))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
 		return;
 	}
@@ -329,7 +329,7 @@
 	if (!(ERR_DNS_IS_OK(buf->error))) return;
 
 	if (r->data_length != 0) {
-		if (!(r->data = TALLOC_ARRAY(r, uint8, r->data_length))) {
+		if (!(r->data = TALLOC_ZERO_ARRAY(r, uint8, r->data_length))) {
 			buf->error = ERROR_DNS_NO_MEMORY;
 			return;
 		}
@@ -406,22 +406,22 @@
 	err = ERROR_DNS_NO_MEMORY;
 
 	if ((req->num_questions != 0) &&
-	    !(req->questions = TALLOC_ARRAY(req, struct dns_question *,
+	    !(req->questions = TALLOC_ZERO_ARRAY(req, struct dns_question *,
 					    req->num_questions))) {
 		goto error;
 	}
 	if ((req->num_answers != 0) &&
-	    !(req->answers = TALLOC_ARRAY(req, struct dns_rrec *,
+	    !(req->answers = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
 					  req->num_answers))) {
 		goto error;
 	}
 	if ((req->num_auths != 0) &&
-	    !(req->auths = TALLOC_ARRAY(req, struct dns_rrec *,
+	    !(req->auths = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
 					req->num_auths))) {
 		goto error;
 	}
 	if ((req->num_additionals != 0) &&
-	    !(req->additionals = TALLOC_ARRAY(req, struct dns_rrec *,
+	    !(req->additionals = TALLOC_ZERO_ARRAY(req, struct dns_rrec *,
 					      req->num_additionals))) {
 		goto error;
 	}

Modified: branches/samba/upstream/lib/replace/poll.c
===================================================================
--- branches/samba/upstream/lib/replace/poll.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/lib/replace/poll.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -30,6 +30,12 @@
 
 #include "replace.h"
 #include "system/select.h"
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
 
 
 int rep_poll(struct pollfd *fds, nfds_t nfds, int timeout)
@@ -40,7 +46,7 @@
 	int rc;
 	nfds_t i;
 
-	if (fds == NULL) {
+	if ((fds == NULL) && (nfds != 0)) {
 		errno = EFAULT;
 		return -1;
 	}

Modified: branches/samba/upstream/lib/tdb/common/io.c
===================================================================
--- branches/samba/upstream/lib/tdb/common/io.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/lib/tdb/common/io.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -53,6 +53,14 @@
 		return -1;
 	}
 
+	/* Unmap, update size, remap */
+	if (tdb_munmap(tdb) == -1) {
+		tdb->ecode = TDB_ERR_IO;
+		return -1;
+	}
+	tdb->map_size = st.st_size;
+	tdb_mmap(tdb);
+
 	if (st.st_size < (size_t)len) {
 		if (!probe) {
 			/* Ensure ecode is set for log fn. */
@@ -63,13 +71,6 @@
 		return -1;
 	}
 
-	/* Unmap, update size, remap */
-	if (tdb_munmap(tdb) == -1) {
-		tdb->ecode = TDB_ERR_IO;
-		return -1;
-	}
-	tdb->map_size = st.st_size;
-	tdb_mmap(tdb);
 	return 0;
 }
 

Modified: branches/samba/upstream/lib/tdb/common/open.c
===================================================================
--- branches/samba/upstream/lib/tdb/common/open.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/lib/tdb/common/open.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -313,13 +313,37 @@
 	if ((tdb_flags & TDB_CLEAR_IF_FIRST) &&
 	    (!tdb->read_only) &&
 	    (locked = (tdb_nest_lock(tdb, ACTIVE_LOCK, F_WRLCK, TDB_LOCK_NOWAIT|TDB_LOCK_PROBE) == 0))) {
-		open_flags |= O_CREAT;
-		if (ftruncate(tdb->fd, 0) == -1) {
+		int ret;
+		ret = tdb_brlock(tdb, F_WRLCK, FREELIST_TOP, 0,
+				TDB_LOCK_WAIT);
+		if (ret == -1) {
 			TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
-				 "failed to truncate %s: %s\n",
-				 name, strerror(errno)));
-			goto fail; /* errno set by ftruncate */
+				"tdb_brlock failed for %s: %s\n",
+				name, strerror(errno)));
+			goto fail;
 		}
+		ret = tdb_new_database(tdb, hash_size);
+		if (ret == -1) {
+			TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+				"tdb_new_database failed for %s: %s\n",
+				name, strerror(errno)));
+			tdb_unlockall(tdb);
+			goto fail;
+		}
+		ret = tdb_brunlock(tdb, F_WRLCK, FREELIST_TOP, 0);
+		if (ret == -1) {
+			TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+				"tdb_unlockall failed for %s: %s\n",
+				name, strerror(errno)));
+			goto fail;
+		}
+		ret = lseek(tdb->fd, 0, SEEK_SET);
+		if (ret == -1) {
+			TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_open_ex: "
+				"lseek failed for %s: %s\n",
+				name, strerror(errno)));
+			goto fail;
+		}
 	}
 
 	errno = 0;

Modified: branches/samba/upstream/libcli/auth/ntlm_check.c
===================================================================
--- branches/samba/upstream/libcli/auth/ntlm_check.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/libcli/auth/ntlm_check.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -87,7 +87,6 @@
 				 const uint8_t *part_passwd,
 				 const DATA_BLOB *sec_blob,
 				 const char *user, const char *domain,
-				 bool upper_case_domain, /* should the domain be transformed into upper case? */
 				 DATA_BLOB *user_sess_key)
 {
 	/* Finish the encryption of part_passwd. */
@@ -122,7 +121,7 @@
 	   but for NTLMv2 it is meant to contain the current time etc.
 	*/
 
-	if (!ntv2_owf_gen(part_passwd, user, domain, upper_case_domain, kr)) {
+	if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
 		return false;
 	}
 
@@ -161,7 +160,6 @@
 				const uint8_t *part_passwd,
 				const DATA_BLOB *sec_blob,
 				const char *user, const char *domain,
-				bool upper_case_domain, /* should the domain be transformed into upper case? */
 				DATA_BLOB *user_sess_key)
 {
 	/* Finish the encryption of part_passwd. */
@@ -192,7 +190,7 @@
 
 	client_key_data = data_blob_talloc(mem_ctx, ntv2_response->data+16, ntv2_response->length-16);
 
-	if (!ntv2_owf_gen(part_passwd, user, domain, upper_case_domain, kr)) {
+	if (!ntv2_owf_gen(part_passwd, user, domain, kr)) {
 		return false;
 	}
 
@@ -297,7 +295,15 @@
 {
 	const static uint8_t zeros[8];
 	DATA_BLOB tmp_sess_key;
+	const char *upper_client_domain = NULL;
 
+	if (client_domain != NULL) {
+		upper_client_domain = talloc_strdup_upper(mem_ctx, client_domain);
+		if (upper_client_domain == NULL) {
+			return NT_STATUS_NO_MEMORY;
+		}
+	}
+
 	if (stored_nt == NULL) {
 		DEBUG(3,("ntlm_password_check: NO NT password stored for user %s.\n", 
 			 username));
@@ -348,13 +354,13 @@
 		/* We have the NT MD4 hash challenge available - see if we can
 		   use it 
 		*/
-		DEBUG(4,("ntlm_password_check: Checking NTLMv2 password with domain [%s]\n", client_domain));
+		DEBUG(4,("ntlm_password_check: Checking NTLMv2 password with domain [%s]\n",
+			client_domain ? client_domain : "<NULL>"));
 		if (smb_pwd_check_ntlmv2(mem_ctx,
 					 nt_response, 
 					 stored_nt->hash, challenge, 
 					 client_username, 
 					 client_domain,
-					 false,
 					 user_sess_key)) {
 			if (user_sess_key->length) {
 				*lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -362,13 +368,13 @@
 			return NT_STATUS_OK;
 		}
 
-		DEBUG(4,("ntlm_password_check: Checking NTLMv2 password with uppercased version of domain [%s]\n", client_domain));
+		DEBUG(4,("ntlm_password_check: Checking NTLMv2 password with uppercased version of domain [%s]\n",
+			upper_client_domain ? upper_client_domain : "<NULL>"));
 		if (smb_pwd_check_ntlmv2(mem_ctx,
 					 nt_response, 
 					 stored_nt->hash, challenge, 
 					 client_username, 
-					 client_domain,
-					 true,
+					 upper_client_domain,
 					 user_sess_key)) {
 			if (user_sess_key->length) {
 				*lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -382,7 +388,6 @@
 					 stored_nt->hash, challenge, 
 					 client_username, 
 					 "",
-					 false,
 					 user_sess_key)) {
 			if (user_sess_key->length) {
 				*lm_sess_key = data_blob_talloc(mem_ctx, user_sess_key->data, MIN(8, user_sess_key->length));
@@ -470,13 +475,13 @@
 	/* This is for 'LMv2' authentication.  almost NTLMv2 but limited to 24 bytes.
 	   - related to Win9X, legacy NAS pass-though authentication
 	*/
-	DEBUG(4,("ntlm_password_check: Checking LMv2 password with domain %s\n", client_domain));
+	DEBUG(4,("ntlm_password_check: Checking LMv2 password with domain %s\n",
+		client_domain ? client_domain : "<NULL>"));
 	if (smb_pwd_check_ntlmv2(mem_ctx,
 				 lm_response, 
 				 stored_nt->hash, challenge, 
 				 client_username,
 				 client_domain,
-				 false,
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
 			/* If NTLMv2 authentication has preceeded us
@@ -488,7 +493,6 @@
 					    stored_nt->hash, challenge, 
 					    client_username,
 					    client_domain,
-					    false,
 					    user_sess_key);
 		} else {
 			/* Otherwise, use the LMv2 session key */
@@ -500,13 +504,13 @@
 		return NT_STATUS_OK;
 	}
 
-	DEBUG(4,("ntlm_password_check: Checking LMv2 password with upper-cased version of domain %s\n", client_domain));
+	DEBUG(4,("ntlm_password_check: Checking LMv2 password with upper-cased version of domain %s\n",
+		upper_client_domain ? upper_client_domain : "<NULL>"));
 	if (smb_pwd_check_ntlmv2(mem_ctx,
 				 lm_response, 
 				 stored_nt->hash, challenge, 
 				 client_username,
-				 client_domain,
-				 true,
+				 upper_client_domain,
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
 			/* If NTLMv2 authentication has preceeded us
@@ -517,8 +521,7 @@
 					    nt_response, 
 					    stored_nt->hash, challenge, 
 					    client_username,
-					    client_domain,
-					    true,
+					    upper_client_domain,
 					    user_sess_key);
 		} else {
 			/* Otherwise, use the LMv2 session key */
@@ -536,7 +539,6 @@
 				 stored_nt->hash, challenge, 
 				 client_username,
 				 "",
-				 false,
 				 &tmp_sess_key)) {
 		if (nt_response->length > 24) {
 			/* If NTLMv2 authentication has preceeded us
@@ -548,7 +550,6 @@
 					    stored_nt->hash, challenge, 
 					    client_username,
 					    "",
-					    false,
 					    user_sess_key);
 		} else {
 			/* Otherwise, use the LMv2 session key */

Modified: branches/samba/upstream/libcli/auth/proto.h
===================================================================
--- branches/samba/upstream/libcli/auth/proto.h	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/libcli/auth/proto.h	2012-10-30 06:15:57 UTC (rev 4174)
@@ -109,7 +109,6 @@
 void nt_lm_owf_gen(const char *pwd, uint8_t nt_p16[16], uint8_t p16[16]);
 bool ntv2_owf_gen(const uint8_t owf[16],
 		  const char *user_in, const char *domain_in,
-		  bool upper_case_domain, /* Transform the domain into UPPER case */
 		  uint8_t kr_buf[16]);
 void SMBOWFencrypt(const uint8_t passwd[16], const uint8_t *c8, uint8_t p24[24]);
 void SMBNTencrypt_hash(const uint8_t nt_hash[16], uint8_t *c8, uint8_t *p24);

Modified: branches/samba/upstream/libcli/auth/smbencrypt.c
===================================================================
--- branches/samba/upstream/libcli/auth/smbencrypt.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/libcli/auth/smbencrypt.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -168,7 +168,6 @@
 /* Does both the NTLMv2 owfs of a user's password */
 bool ntv2_owf_gen(const uint8_t owf[16],
 		  const char *user_in, const char *domain_in,
-		  bool upper_case_domain, /* Transform the domain into UPPER case */
 		  uint8_t kr_buf[16])
 {
 	smb_ucs2_t *user;
@@ -198,14 +197,6 @@
 		return false;
 	}
 
-	if (upper_case_domain) {
-		domain_in = strupper_talloc(mem_ctx, domain_in);
-		if (domain_in == NULL) {
-			talloc_free(mem_ctx);
-			return false;
-		}
-	}
-
 	ret = push_ucs2_talloc(mem_ctx, &user, user_in, &user_byte_len );
 	if (!ret) {
 		DEBUG(0, ("push_uss2_talloc() for user failed)\n"));
@@ -474,7 +465,7 @@
 	   the username and domain.
 	   This prevents username swapping during the auth exchange
 	*/
-	if (!ntv2_owf_gen(nt_hash, user, domain, true, ntlm_v2_hash)) {
+	if (!ntv2_owf_gen(nt_hash, user, domain, ntlm_v2_hash)) {
 		return false;
 	}
 

Modified: branches/samba/upstream/libcli/smb/smb2_create_blob.c
===================================================================
--- branches/samba/upstream/libcli/smb/smb2_create_blob.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/libcli/smb/smb2_create_blob.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -59,14 +59,13 @@
 
 		if ((next & 0x7) != 0 ||
 		    next > remaining ||
-		    name_offset < 16 ||
-		    name_offset > remaining ||
-		    name_length != 4 || /* windows enforces this */
+		    name_offset != 16 ||
+		    name_length < 4 ||
 		    name_offset + name_length > remaining ||
+		    (data_offset & 0x7) != 0 ||
 		    (data_offset && (data_offset < name_offset + name_length)) ||
-		    (data_offset && (data_offset > remaining)) ||
-		    (data_offset && data_length &&
-				(data_offset + (uint64_t)data_length > remaining))) {
+		    (data_offset > remaining) ||
+		    (data_offset + (uint64_t)data_length > remaining)) {
 			return NT_STATUS_INVALID_PARAMETER;
 		}
 
@@ -106,25 +105,44 @@
 {
 	uint32_t ofs = buffer->length;
 	size_t tag_length = strlen(blob->tag);
-	uint8_t pad = smb2_create_blob_padding(blob->data.length+tag_length, 4);
+	size_t blob_offset = 0;
+	size_t blob_pad = 0;
+	size_t next_offset = 0;
+	size_t next_pad = 0;
+	bool ok;
 
-	if (!data_blob_realloc(mem_ctx, buffer,
-			       buffer->length + 0x14 + tag_length + blob->data.length + pad))
+	blob_offset = 0x10 + tag_length;
+	blob_pad = smb2_create_blob_padding(blob_offset, 8);
+	next_offset = blob_offset + blob_pad + blob->data.length;
+	if (!last) {
+		next_pad = smb2_create_blob_padding(next_offset, 8);
+	}
+
+	ok = data_blob_realloc(mem_ctx, buffer,
+			       buffer->length + next_offset + next_pad);
+	if (!ok) {
 		return NT_STATUS_NO_MEMORY;
+	}
 
 	if (last) {
 		SIVAL(buffer->data, ofs+0x00, 0);
 	} else {
-		SIVAL(buffer->data, ofs+0x00, 0x14 + tag_length + blob->data.length + pad);
+		SIVAL(buffer->data, ofs+0x00, next_offset + next_pad);
 	}
 	SSVAL(buffer->data, ofs+0x04, 0x10); /* offset of tag */
 	SIVAL(buffer->data, ofs+0x06, tag_length); /* tag length */
-	SSVAL(buffer->data, ofs+0x0A, 0x14 + tag_length); /* offset of data */
+	SSVAL(buffer->data, ofs+0x0A, blob_offset + blob_pad); /* offset of data */
 	SIVAL(buffer->data, ofs+0x0C, blob->data.length);
 	memcpy(buffer->data+ofs+0x10, blob->tag, tag_length);
-	SIVAL(buffer->data, ofs+0x10+tag_length, 0); /* pad? */
-	memcpy(buffer->data+ofs+0x14+tag_length, blob->data.data, blob->data.length);
-	memset(buffer->data+ofs+0x14+tag_length+blob->data.length, 0, pad);
+	if (blob_pad > 0) {
+		memset(buffer->data+ofs+blob_offset, 0, blob_pad);
+		blob_offset += blob_pad;
+	}
+	memcpy(buffer->data+ofs+blob_offset, blob->data.data, blob->data.length);
+	if (next_pad > 0) {
+		memset(buffer->data+ofs+next_offset, 0, next_pad);
+		next_offset += next_pad;
+	}
 
 	return NT_STATUS_OK;
 }

Modified: branches/samba/upstream/nsswitch/pam_winbind.c
===================================================================
--- branches/samba/upstream/nsswitch/pam_winbind.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/nsswitch/pam_winbind.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -831,7 +831,7 @@
 	}
 	_pam_log(ctx, LOG_CRIT, "Received [%s] reply from application.\n", resp->resp);
 
-	if (strcasecmp(resp->resp, "yes") == 0) {
+	if ((resp->resp != NULL) && (strcasecmp(resp->resp, "yes") == 0)) {
 		retval = true;
 	}
 
@@ -2063,6 +2063,9 @@
 
 	switch (wbc_status) {
 		case WBC_ERR_UNKNOWN_USER:
+		/* match other insane libwbclient return codes */
+		case WBC_ERR_WINBIND_NOT_AVAILABLE:
+		case WBC_ERR_DOMAIN_NOT_FOUND:
 			return 1;
 		case WBC_ERR_SUCCESS:
 			return 0;

Modified: branches/samba/upstream/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-10-30 06:15:57 UTC (rev 4174)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.8'
+VERSION='3.6.9'
 REVISION=''
 SPECFILE="samba.spec"
 RPMVER=`rpm --version | awk '{print $3}'`

Modified: branches/samba/upstream/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/upstream/packaging/RHEL/samba.spec	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/RHEL/samba.spec	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,7 +2,7 @@
 %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
 %define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
 %if %{this_is_redhat} > 0
-%define rhel_ver %(lsb_release -sr)
+%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\\([0-9]*\\).*/\\1/g")
 %else
 %define rhel_ver 0
 %endif
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.8
+Version:      3.6.9
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/packaging/RHEL/samba.spec.tmpl
===================================================================
--- branches/samba/upstream/packaging/RHEL/samba.spec.tmpl	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/RHEL/samba.spec.tmpl	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2,7 +2,7 @@
 %define auth %(test -f /etc/pam.d/system-auth && echo /etc/pam.d/system-auth || echo)
 %define this_is_redhat  %(test -e /etc/redhat-release && echo 1 || echo 0)
 %if %{this_is_redhat} > 0
-%define rhel_ver %(lsb_release -sr)
+%define rhel_ver %(grep "release" /etc/redhat-release | sed %"s/^[^0-9]*\\([0-9]*\\).*/\\1/g")
 %else
 %define rhel_ver 0
 %endif

Modified: branches/samba/upstream/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-10-30 06:15:57 UTC (rev 4174)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.8
+Version:      3.6.9
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/packaging/systemd/nmb.service
===================================================================
--- branches/samba/upstream/packaging/systemd/nmb.service	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/systemd/nmb.service	2012-10-30 06:15:57 UTC (rev 4174)
@@ -7,6 +7,7 @@
 PIDFile=/run/nmbd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/nmbd $NMBDOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target

Modified: branches/samba/upstream/packaging/systemd/smb.service
===================================================================
--- branches/samba/upstream/packaging/systemd/smb.service	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/systemd/smb.service	2012-10-30 06:15:57 UTC (rev 4174)
@@ -8,6 +8,7 @@
 LimitNOFILE=16384
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/smbd $SMBDOPTIONS
+ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target

Modified: branches/samba/upstream/packaging/systemd/winbind.service
===================================================================
--- branches/samba/upstream/packaging/systemd/winbind.service	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/packaging/systemd/winbind.service	2012-10-30 06:15:57 UTC (rev 4174)
@@ -7,6 +7,7 @@
 PIDFile=/run/winbindd.pid
 EnvironmentFile=-/etc/sysconfig/samba
 ExecStart=/usr/sbin/winbindd "$WINBINDOPTIONS"
+ExecReload=/usr/bin/kill -HUP $MAINPID
 
 [Install]
 WantedBy=multi-user.target

Modified: branches/samba/upstream/source3/VERSION
===================================================================
--- branches/samba/upstream/source3/VERSION	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/VERSION	2012-10-30 06:15:57 UTC (rev 4174)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=8
+SAMBA_VERSION_RELEASE=9
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: branches/samba/upstream/source3/configure
===================================================================
--- branches/samba/upstream/source3/configure	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/configure	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1770,7 +1770,8 @@
   --with-ctdb=DIR         Where to find ctdb sources
   --with-acl-support      Include ACL support (default=auto)
   --with-aio-support      Include asynchronous io support (default=no)
-  --with-sendfile-support Check for sendfile support (default=yes)
+  --with-sendfile-support Whether sendfile support should be built in
+                          (default=auto)
   --with-wbclient         Use external wbclient (optional)
   --with-winbind          Build winbind (default, if supported by OS)
   --with-included-popt    use bundled popt library, not from system
@@ -20244,7 +20245,7 @@
 
 fi
 
-	if test x"$USESHARED" == x"no" ; then
+	if test x"$USESHARED" = x"no" ; then
 		LINK_LIBTALLOC=STATIC
 	fi
 	LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
@@ -20585,7 +20586,7 @@
 
 fi
 
-	if test x"$USESHARED" == x"no" ; then
+	if test x"$USESHARED" = x"no" ; then
 		LINK_LIBTDB=STATIC
 	fi
 	LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
@@ -34822,19 +34823,28 @@
 #################################################
 # check for sendfile support
 
-with_sendfile_support=yes
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to check to support sendfile" >&5
-$as_echo_n "checking whether to check to support sendfile... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sendfile support should be built in" >&5
+$as_echo_n "checking whether sendfile support should be built in... " >&6; }
 
 # Check whether --with-sendfile-support was given.
 if test "${with_sendfile_support+set}" = set; then :
   withval=$with_sendfile_support;  case "$withval" in
-  yes)
-
+  yes|no)
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5
+$as_echo "$withval" >&6; };
+	with_sendfile_support=$withval
+	;;
+  *)
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; };
+$as_echo "yes" >&6; }
+	with_sendfile_support=auto
+	;;
+  esac
+fi
 
-	case "$host_os" in
+
+if test x$with_sendfile_support != xno ; then
+    case "$host_os" in
 	*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for linux sendfile64 support" >&5
 $as_echo_n "checking for linux sendfile64 support... " >&6; }
@@ -35380,20 +35390,13 @@
 	;;
 	*)
 	;;
-        esac
-        ;;
-  *)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-    ;;
-  esac
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+    esac
+fi
 
+if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then
+	as_fn_error $? "sendfile support requested but sendfile not available " "$LINENO" 5
 fi
 
-
 ############################################
 # See if we have the Linux readahead syscall.
 

Modified: branches/samba/upstream/source3/configure.in
===================================================================
--- branches/samba/upstream/source3/configure.in	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/configure.in	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2138,7 +2138,7 @@
 if test "x$enable_external_libtalloc" = xno
 then
 	m4_include(../lib/talloc/libtalloc.m4)
-	if test x"$USESHARED" == x"no" ; then
+	if test x"$USESHARED" = x"no" ; then
 		LINK_LIBTALLOC=STATIC
 	fi
 	LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
@@ -2179,7 +2179,7 @@
 if test "x$enable_external_libtdb" = xno
 then
 	m4_include(../lib/tdb/libtdb.m4)
-	if test x"$USESHARED" == x"no" ; then
+	if test x"$USESHARED" = x"no" ; then
 		LINK_LIBTDB=STATIC
 	fi
 	LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e 's/.* //'`
@@ -5930,16 +5930,23 @@
 #################################################
 # check for sendfile support
 
-with_sendfile_support=yes
-AC_MSG_CHECKING(whether to check to support sendfile)
+AC_MSG_CHECKING(whether sendfile support should be built in)
 AC_ARG_WITH(sendfile-support,
-[AS_HELP_STRING([--with-sendfile-support], [Check for sendfile support (default=yes)])],
+[AS_HELP_STRING([--with-sendfile-support], [Whether sendfile support should be built in (default=auto)])],
 [ case "$withval" in
-  yes)
+  yes|no)
+	AC_MSG_RESULT($withval);
+	with_sendfile_support=$withval
+	;;
+  *)
+	AC_MSG_RESULT(yes)
+	with_sendfile_support=auto
+	;;
+  esac ],
+)
 
-	AC_MSG_RESULT(yes);
-
-	case "$host_os" in
+if test x$with_sendfile_support != xno ; then
+    case "$host_os" in
 	*linux* | gnu* | k*bsd*-gnu | kopensolaris*-gnu)
 		AC_CACHE_CHECK([for linux sendfile64 support],samba_cv_HAVE_SENDFILE64,[
 		AC_TRY_LINK([#include <sys/sendfile.h>],
@@ -6175,15 +6182,13 @@
 	;;
 	*)
 	;;
-        esac
-        ;;
-  *)
-    AC_MSG_RESULT(no)
-    ;;
-  esac ],
-  AC_MSG_RESULT(yes)
-)
+    esac
+fi
 
+if test x$with_sendfile_support = xyes -a x"$samba_cv_HAVE_SENDFILE" != xyes ; then
+	AC_MSG_ERROR(sendfile support requested but sendfile not available )
+fi
+
 ############################################
 # See if we have the Linux readahead syscall.
 

Modified: branches/samba/upstream/source3/include/version.h
===================================================================
--- branches/samba/upstream/source3/include/version.h	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/include/version.h	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 8
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.8"
+#define SAMBA_VERSION_RELEASE 9
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.9"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/upstream/source3/lib/ldb_compat.c
===================================================================
--- branches/samba/upstream/source3/lib/ldb_compat.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/lib/ldb_compat.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -84,9 +84,14 @@
 	return ret;
 }
 
+static bool need_encode(unsigned char cval)
+{
+	if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+		return true;
+	}
+	return false;
+}
 
-
-
 /*
    encode a blob as a RFC2254 binary string, escaping any
    non-printable or '\' characters
@@ -99,7 +104,7 @@
 	unsigned char *buf = val.data;
 
 	for (i=0;i<val.length;i++) {
-		if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+		if (need_encode(buf[i])) {
 			len += 2;
 		}
 	}
@@ -108,7 +113,7 @@
 
 	len = 0;
 	for (i=0;i<val.length;i++) {
-		if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+		if (need_encode(buf[i])) {
 			snprintf(ret+len, 4, "\\%02X", buf[i]);
 			len += 3;
 		} else {

Modified: branches/samba/upstream/source3/lib/sysquotas.c
===================================================================
--- branches/samba/upstream/source3/lib/sysquotas.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/lib/sysquotas.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -176,6 +176,8 @@
 } sys_quota_backends[] = {
 #ifdef HAVE_XFS_QUOTAS
 	{"xfs", sys_get_xfs_quota, 	sys_set_xfs_quota},
+	{"gfs", sys_get_xfs_quota, 	sys_set_xfs_quota},
+	{"gfs2", sys_get_xfs_quota, 	sys_set_xfs_quota},
 #endif /* HAVE_XFS_QUOTAS */
 #ifdef HAVE_NFS_QUOTAS
 	{"nfs", sys_get_nfs_quota,	sys_set_nfs_quota},

Modified: branches/samba/upstream/source3/libsmb/clispnego.c
===================================================================
--- branches/samba/upstream/source3/libsmb/clispnego.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/libsmb/clispnego.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -103,6 +103,10 @@
 	bool ret;
 	ASN1_DATA *data;
 
+	for (i = 0; i < ASN1_MAX_OIDS; i++) {
+		OIDs[i] = NULL;
+	}
+
 	data = asn1_init(talloc_tos());
 	if (data == NULL) {
 		return false;
@@ -253,6 +257,7 @@
 	bool ret;
 	ASN1_DATA *data;
 	int data_remaining;
+	*ticket = data_blob_null;
 
 	data = asn1_init(talloc_tos());
 	if (data == NULL) {

Modified: branches/samba/upstream/source3/printing/printer_list.c
===================================================================
--- branches/samba/upstream/source3/printing/printer_list.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/printing/printer_list.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -91,7 +91,8 @@
 
 	data = dbwrap_fetch_bystring_upper(db, key, key);
 	if (data.dptr == NULL) {
-		DEBUG(1, ("Failed to fetch record!\n"));
+		DEBUG(6, ("Failed to fetch record! "
+			  "The printer database is empty?\n"));
 		status = NT_STATUS_NOT_FOUND;
 		goto done;
 	}

Modified: branches/samba/upstream/source3/printing/printing.c
===================================================================
--- branches/samba/upstream/source3/printing/printing.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/printing/printing.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1656,6 +1656,28 @@
         num_children += 1;
 }
 
+static bool printer_housekeeping_fn(const struct timeval *now,
+				    void *private_data)
+{
+	static time_t last_pcap_reload_time = 0;
+	time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
+	time_t t = time_mono(NULL);
+
+	DEBUG(5, ("printer housekeeping\n"));
+
+	/* if periodic printcap rescan is enabled, see if it's time to reload */
+	if ((printcap_cache_time != 0)
+	 && (t >= (last_pcap_reload_time + printcap_cache_time))) {
+		DEBUG( 3,( "Printcap cache time expired.\n"));
+		pcap_cache_reload(server_event_context(),
+				  smbd_messaging_context(),
+				  &reload_pcap_change_notify);
+		last_pcap_reload_time = t;
+	}
+
+	return true;
+}
+
 static pid_t background_lpq_updater_pid = -1;
 
 /****************************************************************************
@@ -1729,6 +1751,15 @@
 			smb_panic("tevent_add_fd() failed for pause_pipe");
 		}
 
+		if (!(event_add_idle(ev, NULL,
+				     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
+				     "printer_housekeeping",
+				     printer_housekeeping_fn,
+				     NULL))) {
+			DEBUG(0, ("Could not add printing housekeeping event\n"));
+			exit(1);
+		}
+
 		DEBUG(5,("start_background_queue: background LPQ thread waiting for messages\n"));
 		ret = tevent_loop_wait(ev);
 		/* should not be reached */

Modified: branches/samba/upstream/source3/printing/printspoolss.c
===================================================================
--- branches/samba/upstream/source3/printing/printspoolss.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/printing/printspoolss.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -144,7 +144,7 @@
 
 	status = dcerpc_spoolss_OpenPrinter(b, pf, pf->svcname,
 					    "RAW", devmode_ctr,
-					    SEC_FLAG_MAXIMUM_ALLOWED,
+					    PRINTER_ACCESS_USE,
 					    &pf->handle, &werr);
 	if (!NT_STATUS_IS_OK(status)) {
 		goto done;

Modified: branches/samba/upstream/source3/rpc_client/cli_winreg_spoolss.c
===================================================================
--- branches/samba/upstream/source3/rpc_client/cli_winreg_spoolss.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/rpc_client/cli_winreg_spoolss.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -56,126 +56,124 @@
 
 /*        FLAGS,                NAME,                              with,   height,   left, top, right, bottom */
 static const struct spoolss_FormInfo1 builtin_forms1[] = {
-	{ SPOOLSS_FORM_BUILTIN, "10x11",                          {0x3e030,0x44368}, {0x0,0x0,0x3e030,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "10x14",                          {0x3e030,0x56d10}, {0x0,0x0,0x3e030,0x56d10} },
-	{ SPOOLSS_FORM_BUILTIN, "11x17",                          {0x44368,0x696b8}, {0x0,0x0,0x44368,0x696b8} },
-	{ SPOOLSS_FORM_BUILTIN, "12x11",                          {0x4a724,0x443e1}, {0x0,0x0,0x4a724,0x443e1} },
-	{ SPOOLSS_FORM_BUILTIN, "15x11",                          {0x5d048,0x44368}, {0x0,0x0,0x5d048,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "6 3/4 Envelope",                 {0x167ab,0x284ec}, {0x0,0x0,0x167ab,0x284ec} },
-	{ SPOOLSS_FORM_BUILTIN, "9x11",                           {0x37cf8,0x44368}, {0x0,0x0,0x37cf8,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "A0",                             {0xcd528,0x122488},{0x0,0x0,0xcd528,0x122488} },
-	{ SPOOLSS_FORM_BUILTIN, "A1",                             {0x91050,0xcd528}, {0x0,0x0,0x91050,0xcd528} },
-	{ SPOOLSS_FORM_BUILTIN, "A2",                             {0x668a0,0x91050}, {0x0,0x0,0x668a0,0x91050} },
-	{ SPOOLSS_FORM_BUILTIN, "A3 Extra Transverse",            {0x4e9d0,0x6ca48}, {0x0,0x0,0x4e9d0,0x6ca48} },
-	{ SPOOLSS_FORM_BUILTIN, "A3 Extra",                       {0x4e9d0,0x6ca48}, {0x0,0x0,0x4e9d0,0x6ca48} },
-	{ SPOOLSS_FORM_BUILTIN, "A3 Rotated",                     {0x668a0,0x48828}, {0x0,0x0,0x668a0,0x48828} },
-	{ SPOOLSS_FORM_BUILTIN, "A3 Transverse",                  {0x48828,0x668a0}, {0x0,0x0,0x48828,0x668a0} },
-	{ SPOOLSS_FORM_BUILTIN, "A3",                             {0x48828,0x668a0}, {0x0,0x0,0x48828,0x668a0} },
-	{ SPOOLSS_FORM_BUILTIN, "A4 Extra",                       {0x397c2,0x4eb16}, {0x0,0x0,0x397c2,0x4eb16} },
-	{ SPOOLSS_FORM_BUILTIN, "A4 Plus",                        {0x33450,0x50910}, {0x0,0x0,0x33450,0x50910} },
-	{ SPOOLSS_FORM_BUILTIN, "A4 Rotated",                     {0x48828,0x33450}, {0x0,0x0,0x48828,0x33450} },
-	{ SPOOLSS_FORM_BUILTIN, "A4 Small",                       {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
-	{ SPOOLSS_FORM_BUILTIN, "A4 Transverse",                  {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
-	{ SPOOLSS_FORM_BUILTIN, "A4",                             {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
-	{ SPOOLSS_FORM_BUILTIN, "A5 Extra",                       {0x2a7b0,0x395f8}, {0x0,0x0,0x2a7b0,0x395f8} },
-	{ SPOOLSS_FORM_BUILTIN, "A5 Rotated",                     {0x33450,0x24220}, {0x0,0x0,0x33450,0x24220} },
-	{ SPOOLSS_FORM_BUILTIN, "A5 Transverse",                  {0x24220,0x33450}, {0x0,0x0,0x24220,0x33450} },
-	{ SPOOLSS_FORM_BUILTIN, "A5",                             {0x24220,0x33450}, {0x0,0x0,0x24220,0x33450} },
-	{ SPOOLSS_FORM_BUILTIN, "A6 Rotated",                     {0x24220,0x19a28}, {0x0,0x0,0x24220,0x19a28} },
-	{ SPOOLSS_FORM_BUILTIN, "A6",                             {0x19a28,0x24220}, {0x0,0x0,0x19a28,0x24220} },
-	{ SPOOLSS_FORM_BUILTIN, "B4 (ISO)",                       {0x3d090,0x562e8}, {0x0,0x0,0x3d090,0x562e8} },
-	{ SPOOLSS_FORM_BUILTIN, "B4 (JIS) Rotated",               {0x58de0,0x3ebe8}, {0x0,0x0,0x58de0,0x3ebe8} },
-	{ SPOOLSS_FORM_BUILTIN, "B4 (JIS)",                       {0x3ebe8,0x58de0}, {0x0,0x0,0x3ebe8,0x58de0} },
-	{ SPOOLSS_FORM_BUILTIN, "B5 (ISO) Extra",                 {0x31128,0x43620}, {0x0,0x0,0x31128,0x43620} },
-	{ SPOOLSS_FORM_BUILTIN, "B5 (JIS) Rotated",               {0x3ebe8,0x2c6f0}, {0x0,0x0,0x3ebe8,0x2c6f0} },
-	{ SPOOLSS_FORM_BUILTIN, "B5 (JIS) Transverse",            {0x2c6f0,0x3ebe8}, {0x0,0x0,0x2c6f0,0x3ebe8} },
-	{ SPOOLSS_FORM_BUILTIN, "B5 (JIS)",                       {0x2c6f0,0x3ebe8}, {0x0,0x0,0x2c6f0,0x3ebe8} },
-	{ SPOOLSS_FORM_BUILTIN, "B6 (JIS) Rotated",               {0x2c6f0,0x1f400}, {0x0,0x0,0x2c6f0,0x1f400} },
-	{ SPOOLSS_FORM_BUILTIN, "B6 (JIS)",                       {0x1f400,0x2c6f0}, {0x0,0x0,0x1f400,0x2c6f0} },
-	{ SPOOLSS_FORM_BUILTIN, "C size sheet",                   {0x696b8,0x886d0}, {0x0,0x0,0x696b8,0x886d0} },
-	{ SPOOLSS_FORM_BUILTIN, "D size sheet",                   {0x886d0,0xd2d70}, {0x0,0x0,0x886d0,0xd2d70} },
-	{ SPOOLSS_FORM_BUILTIN, "Double Japan Postcard Rotated",  {0x24220,0x30d40}, {0x0,0x0,0x24220,0x30d40} },
-	{ SPOOLSS_FORM_BUILTIN, "E size sheet",                   {0xd2d70,0x110da0},{0x0,0x0,0xd2d70,0x110da0} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope #10",                   {0x19947,0x3ae94}, {0x0,0x0,0x19947,0x3ae94} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope #11",                   {0x1be7c,0x40565}, {0x0,0x0,0x1be7c,0x40565} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope #12",                   {0x1d74a,0x44368}, {0x0,0x0,0x1d74a,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope #14",                   {0x1f018,0x47504}, {0x0,0x0,0x1f018,0x47504} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope #9",                    {0x18079,0x37091}, {0x0,0x0,0x18079,0x37091} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope B4",                    {0x3d090,0x562e8}, {0x0,0x0,0x3d090,0x562e8} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope B5",                    {0x2af80,0x3d090}, {0x0,0x0,0x2af80,0x3d090} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope B6",                    {0x2af80,0x1e848}, {0x0,0x0,0x2af80,0x1e848} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope C3",                    {0x4f1a0,0x6fd10}, {0x0,0x0,0x4f1a0,0x6fd10} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope C4",                    {0x37e88,0x4f1a0}, {0x0,0x0,0x37e88,0x4f1a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope C5",                    {0x278d0,0x37e88}, {0x0,0x0,0x278d0,0x37e88} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope C6",                    {0x1bd50,0x278d0}, {0x0,0x0,0x1bd50,0x278d0} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope C65",                   {0x1bd50,0x37e88}, {0x0,0x0,0x1bd50,0x37e88} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope DL",                    {0x1adb0,0x35b60}, {0x0,0x0,0x1adb0,0x35b60} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope Invite",                {0x35b60,0x35b60}, {0x0,0x0,0x35b60,0x35b60} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope Monarch",               {0x18079,0x2e824}, {0x0,0x0,0x18079,0x2e824} },
-	{ SPOOLSS_FORM_BUILTIN, "Envelope",                       {0x1adb0,0x38270}, {0x0,0x0,0x1adb0,0x38270} },
-	{ SPOOLSS_FORM_BUILTIN, "Executive",                      {0x2cf56,0x411cc}, {0x0,0x0,0x2cf56,0x411cc} },
-	{ SPOOLSS_FORM_BUILTIN, "Folio",                          {0x34b5c,0x509d8}, {0x0,0x0,0x34b5c,0x509d8} },
-	{ SPOOLSS_FORM_BUILTIN, "German Legal Fanfold",           {0x34b5c,0x509d8}, {0x0,0x0,0x34b5c,0x509d8} },
-	{ SPOOLSS_FORM_BUILTIN, "German Std Fanfold",             {0x34b5c,0x4a6a0}, {0x0,0x0,0x34b5c,0x4a6a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope Chou #3 Rotated", {0x395f8,0x1d4c0}, {0x0,0x0,0x395f8,0x1d4c0} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope Chou #4 Rotated", {0x320c8,0x15f90}, {0x0,0x0,0x320c8,0x15f90} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope Kaku #2 Rotated", {0x510e0,0x3a980}, {0x0,0x0,0x510e0,0x3a980} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope Kaku #3 Rotated", {0x43a08,0x34bc0}, {0x0,0x0,0x43a08,0x34bc0} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope You #4 Rotated",  {0x395f8,0x19a28}, {0x0,0x0,0x395f8,0x19a28} },
-	{ SPOOLSS_FORM_BUILTIN, "Japan Envelope You #4",          {0x19a28,0x395f8}, {0x0,0x0,0x19a28,0x395f8} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Double Postcard",       {0x30d40,0x24220}, {0x0,0x0,0x30d40,0x24220} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Envelope Chou #3",      {0x1d4c0,0x395f8}, {0x0,0x0,0x1d4c0,0x395f8} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Envelope Chou #4",      {0x15f90,0x320c8}, {0x0,0x0,0x15f90,0x320c8} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Envelope Kaku #2",      {0x3a980,0x510e0}, {0x0,0x0,0x3a980,0x510e0} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Envelope Kaku #3",      {0x34bc0,0x43a08}, {0x0,0x0,0x34bc0,0x43a08} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Postcard Rotated",      {0x24220,0x186a0}, {0x0,0x0,0x24220,0x186a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Japanese Postcard",              {0x186a0,0x24220}, {0x0,0x0,0x186a0,0x24220} },
-	{ SPOOLSS_FORM_BUILTIN, "Ledger",                         {0x696b8,0x44368}, {0x0,0x0,0x696b8,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "Legal Extra",                    {0x3ae94,0x5d048}, {0x0,0x0,0x3ae94,0x5d048} },
-	{ SPOOLSS_FORM_BUILTIN, "Legal",                          {0x34b5c,0x56d10}, {0x0,0x0,0x34b5c,0x56d10} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Extra Transverse",        {0x3ae94,0x4a6a0}, {0x0,0x0,0x3ae94,0x4a6a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Extra",                   {0x3ae94,0x4a6a0}, {0x0,0x0,0x3ae94,0x4a6a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Plus",                    {0x34b5c,0x4eb16}, {0x0,0x0,0x34b5c,0x4eb16} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Rotated",                 {0x44368,0x34b5c}, {0x0,0x0,0x44368,0x34b5c} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Small",                   {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter Transverse",              {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "Letter",                         {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "Note",                           {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 16K Rotated",                {0x3f7a0,0x2de60}, {0x0,0x0,0x3f7a0,0x2de60} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 16K",                        {0x2de60,0x3f7a0}, {0x0,0x0,0x2de60,0x3f7a0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 32K Rotated",                {0x2cec0,0x1fbd0}, {0x0,0x0,0x2cec0,0x1fbd0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 32K",                        {0x1fbd0,0x2cec0}, {0x0,0x0,0x1fbd0,0x2cec0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 32K(Big) Rotated",           {0x318f8,0x222e0}, {0x0,0x0,0x318f8,0x222e0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC 32K(Big)",                   {0x222e0,0x318f8}, {0x0,0x0,0x222e0,0x318f8} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #1 Rotated",        {0x28488,0x18e70}, {0x0,0x0,0x28488,0x18e70} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #1",                {0x18e70,0x28488}, {0x0,0x0,0x18e70,0x28488} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #10 Rotated",       {0x6fd10,0x4f1a0}, {0x0,0x0,0x6fd10,0x4f1a0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #10",               {0x4f1a0,0x6fd10}, {0x0,0x0,0x4f1a0,0x6fd10} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #2 Rotated",        {0x2af80,0x18e70}, {0x0,0x0,0x2af80,0x18e70} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #2",                {0x18e70,0x2af80}, {0x0,0x0,0x18e70,0x2af80} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #3 Rotated",        {0x2af80,0x1e848}, {0x0,0x0,0x2af80,0x1e848} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #3",                {0x1e848,0x2af80}, {0x0,0x0,0x1e848,0x2af80} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #4 Rotated",        {0x32c80,0x1adb0}, {0x0,0x0,0x32c80,0x1adb0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #4",                {0x1adb0,0x32c80}, {0x0,0x0,0x1adb0,0x32c80} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #5 Rotated",        {0x35b60,0x1adb0}, {0x0,0x0,0x35b60,0x1adb0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #5",                {0x1adb0,0x35b60}, {0x0,0x0,0x1adb0,0x35b60} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #6 Rotated",        {0x38270,0x1d4c0}, {0x0,0x0,0x38270,0x1d4c0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #6",                {0x1d4c0,0x38270}, {0x0,0x0,0x1d4c0,0x38270} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #7 Rotated",        {0x38270,0x27100}, {0x0,0x0,0x38270,0x27100} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #7",                {0x27100,0x38270}, {0x0,0x0,0x27100,0x38270} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #8 Rotated",        {0x4b708,0x1d4c0}, {0x0,0x0,0x4b708,0x1d4c0} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #8",                {0x1d4c0,0x4b708}, {0x0,0x0,0x1d4c0,0x4b708} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #9 Rotated",        {0x4f1a0,0x37e88}, {0x0,0x0,0x4f1a0,0x37e88} },
-	{ SPOOLSS_FORM_BUILTIN, "PRC Envelope #9",                {0x37e88,0x4f1a0}, {0x0,0x0,0x37e88,0x4f1a0} },
-	{ SPOOLSS_FORM_BUILTIN, "Quarto",                         {0x347d8,0x43238}, {0x0,0x0,0x347d8,0x43238} },
-	{ SPOOLSS_FORM_BUILTIN, "Reserved48",                     {0x1,0x1},         {0x0,0x0,0x1,0x1} },
-	{ SPOOLSS_FORM_BUILTIN, "Reserved49",                     {0x1,0x1},         {0x0,0x0,0x1,0x1} },
-	{ SPOOLSS_FORM_BUILTIN, "Statement",                      {0x221b4,0x34b5c}, {0x0,0x0,0x221b4,0x34b5c} },
-	{ SPOOLSS_FORM_BUILTIN, "Super A",                        {0x376b8,0x56ea0}, {0x0,0x0,0x376b8,0x56ea0} },
-	{ SPOOLSS_FORM_BUILTIN, "Super B",                        {0x4a768,0x76e58}, {0x0,0x0,0x4a768,0x76e58} },
-	{ SPOOLSS_FORM_BUILTIN, "Tabloid Extra",                  {0x4a6a0,0x6f9f0}, {0x0,0x0,0x4a6a0,0x6f9f0} },
-	{ SPOOLSS_FORM_BUILTIN, "Tabloid",                        {0x44368,0x696b8}, {0x0,0x0,0x44368,0x696b8} },
-	{ SPOOLSS_FORM_BUILTIN, "US Std Fanfold",                 {0x5c3e1,0x44368}, {0x0,0x0,0x5c3e1,0x44368} }
+        { SPOOLSS_FORM_BUILTIN, "Letter",                         {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Small",                   {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Tabloid",                        {0x44368,0x696b8}, {0x0,0x0,0x44368,0x696b8} },
+        { SPOOLSS_FORM_BUILTIN, "Ledger",                         {0x696b8,0x44368}, {0x0,0x0,0x696b8,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Legal",                          {0x34b5c,0x56d10}, {0x0,0x0,0x34b5c,0x56d10} },
+        { SPOOLSS_FORM_BUILTIN, "Statement",                      {0x221b4,0x34b5c}, {0x0,0x0,0x221b4,0x34b5c} },
+        { SPOOLSS_FORM_BUILTIN, "Executive",                      {0x2cf56,0x411cc}, {0x0,0x0,0x2cf56,0x411cc} },
+        { SPOOLSS_FORM_BUILTIN, "A3",                             {0x48828,0x668a0}, {0x0,0x0,0x48828,0x668a0} },
+        { SPOOLSS_FORM_BUILTIN, "A4",                             {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
+        { SPOOLSS_FORM_BUILTIN, "A4 Small",                       {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
+        { SPOOLSS_FORM_BUILTIN, "A5",                             {0x24220,0x33450}, {0x0,0x0,0x24220,0x33450} },
+        { SPOOLSS_FORM_BUILTIN, "B4 (JIS)",                       {0x3ebe8,0x58de0}, {0x0,0x0,0x3ebe8,0x58de0} },
+        { SPOOLSS_FORM_BUILTIN, "B5 (JIS)",                       {0x2c6f0,0x3ebe8}, {0x0,0x0,0x2c6f0,0x3ebe8} },
+        { SPOOLSS_FORM_BUILTIN, "Folio",                          {0x34b5c,0x509d8}, {0x0,0x0,0x34b5c,0x509d8} },
+        { SPOOLSS_FORM_BUILTIN, "Quarto",                         {0x347d8,0x43238}, {0x0,0x0,0x347d8,0x43238} },
+        { SPOOLSS_FORM_BUILTIN, "10x14",                          {0x3e030,0x56d10}, {0x0,0x0,0x3e030,0x56d10} },
+        { SPOOLSS_FORM_BUILTIN, "11x17",                          {0x44368,0x696b8}, {0x0,0x0,0x44368,0x696b8} },
+        { SPOOLSS_FORM_BUILTIN, "Note",                           {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope #9",                    {0x18079,0x37091}, {0x0,0x0,0x18079,0x37091} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope #10",                   {0x19947,0x3ae94}, {0x0,0x0,0x19947,0x3ae94} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope #11",                   {0x1be7c,0x40565}, {0x0,0x0,0x1be7c,0x40565} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope #12",                   {0x1d74a,0x44368}, {0x0,0x0,0x1d74a,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope #14",                   {0x1f018,0x47504}, {0x0,0x0,0x1f018,0x47504} },
+        { SPOOLSS_FORM_BUILTIN, "C size sheet",                   {0x696b8,0x886d0}, {0x0,0x0,0x696b8,0x886d0} },
+        { SPOOLSS_FORM_BUILTIN, "D size sheet",                   {0x886d0,0xd2d70}, {0x0,0x0,0x886d0,0xd2d70} },
+        { SPOOLSS_FORM_BUILTIN, "E size sheet",                   {0xd2d70,0x110da0},{0x0,0x0,0xd2d70,0x110da0} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope DL",                    {0x1adb0,0x35b60}, {0x0,0x0,0x1adb0,0x35b60} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope C5",                    {0x278d0,0x37e88}, {0x0,0x0,0x278d0,0x37e88} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope C3",                    {0x4f1a0,0x6fd10}, {0x0,0x0,0x4f1a0,0x6fd10} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope C4",                    {0x37e88,0x4f1a0}, {0x0,0x0,0x37e88,0x4f1a0} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope C6",                    {0x1bd50,0x278d0}, {0x0,0x0,0x1bd50,0x278d0} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope C65",                   {0x1bd50,0x37e88}, {0x0,0x0,0x1bd50,0x37e88} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope B4",                    {0x3d090,0x562e8}, {0x0,0x0,0x3d090,0x562e8} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope B5",                    {0x2af80,0x3d090}, {0x0,0x0,0x2af80,0x3d090} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope B6",                    {0x2af80,0x1e848}, {0x0,0x0,0x2af80,0x1e848} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope",                       {0x1adb0,0x38270}, {0x0,0x0,0x1adb0,0x38270} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope Monarch",               {0x18079,0x2e824}, {0x0,0x0,0x18079,0x2e824} },
+        { SPOOLSS_FORM_BUILTIN, "6 3/4 Envelope",                 {0x167ab,0x284ec}, {0x0,0x0,0x167ab,0x284ec} },
+        { SPOOLSS_FORM_BUILTIN, "US Std Fanfold",                 {0x5c3e1,0x44368}, {0x0,0x0,0x5c3e1,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "German Std Fanfold",             {0x34b5c,0x4a6a0}, {0x0,0x0,0x34b5c,0x4a6a0} },
+        { SPOOLSS_FORM_BUILTIN, "German Legal Fanfold",           {0x34b5c,0x509d8}, {0x0,0x0,0x34b5c,0x509d8} },
+        { SPOOLSS_FORM_BUILTIN, "B4 (ISO)",                       {0x3d090,0x562e8}, {0x0,0x0,0x3d090,0x562e8} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Postcard",              {0x186a0,0x24220}, {0x0,0x0,0x186a0,0x24220} },
+        { SPOOLSS_FORM_BUILTIN, "9x11",                           {0x37cf8,0x44368}, {0x0,0x0,0x37cf8,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "10x11",                          {0x3e030,0x44368}, {0x0,0x0,0x3e030,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "15x11",                          {0x5d048,0x44368}, {0x0,0x0,0x5d048,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "Envelope Invite",                {0x35b60,0x35b60}, {0x0,0x0,0x35b60,0x35b60} },
+        { SPOOLSS_FORM_BUILTIN, "Reserved48",                     {0x1,0x1},         {0x0,0x0,0x1,0x1} },
+        { SPOOLSS_FORM_BUILTIN, "Reserved49",                     {0x1,0x1},         {0x0,0x0,0x1,0x1} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Extra",                   {0x3ae94,0x4a6a0}, {0x0,0x0,0x3ae94,0x4a6a0} },
+        { SPOOLSS_FORM_BUILTIN, "Legal Extra",                    {0x3ae94,0x5d048}, {0x0,0x0,0x3ae94,0x5d048} },
+        { SPOOLSS_FORM_BUILTIN, "Tabloid Extra",                  {0x4a6a0,0x6f9f0}, {0x0,0x0,0x4a6a0,0x6f9f0} },
+        { SPOOLSS_FORM_BUILTIN, "A4 Extra",                       {0x397c2,0x4eb16}, {0x0,0x0,0x397c2,0x4eb16} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Transverse",              {0x34b5c,0x44368}, {0x0,0x0,0x34b5c,0x44368} },
+        { SPOOLSS_FORM_BUILTIN, "A4 Transverse",                  {0x33450,0x48828}, {0x0,0x0,0x33450,0x48828} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Extra Transverse",        {0x3ae94,0x4a6a0}, {0x0,0x0,0x3ae94,0x4a6a0} },
+        { SPOOLSS_FORM_BUILTIN, "Super A",                        {0x376b8,0x56ea0}, {0x0,0x0,0x376b8,0x56ea0} },
+        { SPOOLSS_FORM_BUILTIN, "Super B",                        {0x4a768,0x76e58}, {0x0,0x0,0x4a768,0x76e58} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Plus",                    {0x34b5c,0x4eb16}, {0x0,0x0,0x34b5c,0x4eb16} },
+        { SPOOLSS_FORM_BUILTIN, "A4 Plus",                        {0x33450,0x50910}, {0x0,0x0,0x33450,0x50910} },
+        { SPOOLSS_FORM_BUILTIN, "A5 Transverse",                  {0x24220,0x33450}, {0x0,0x0,0x24220,0x33450} },
+        { SPOOLSS_FORM_BUILTIN, "B5 (JIS) Transverse",            {0x2c6f0,0x3ebe8}, {0x0,0x0,0x2c6f0,0x3ebe8} },
+        { SPOOLSS_FORM_BUILTIN, "A3 Extra",                       {0x4e9d0,0x6ca48}, {0x0,0x0,0x4e9d0,0x6ca48} },
+        { SPOOLSS_FORM_BUILTIN, "A5 Extra",                       {0x2a7b0,0x395f8}, {0x0,0x0,0x2a7b0,0x395f8} },
+        { SPOOLSS_FORM_BUILTIN, "B5 (ISO) Extra",                 {0x31128,0x43620}, {0x0,0x0,0x31128,0x43620} },
+        { SPOOLSS_FORM_BUILTIN, "A2",                             {0x668a0,0x91050}, {0x0,0x0,0x668a0,0x91050} },
+        { SPOOLSS_FORM_BUILTIN, "A3 Transverse",                  {0x48828,0x668a0}, {0x0,0x0,0x48828,0x668a0} },
+        { SPOOLSS_FORM_BUILTIN, "A3 Extra Transverse",            {0x4e9d0,0x6ca48}, {0x0,0x0,0x4e9d0,0x6ca48} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Double Postcard",       {0x30d40,0x24220}, {0x0,0x0,0x30d40,0x24220} },
+        { SPOOLSS_FORM_BUILTIN, "A6",                             {0x19a28,0x24220}, {0x0,0x0,0x19a28,0x24220} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope Kaku #2 Rotated", {0x510e0,0x3a980}, {0x0,0x0,0x510e0,0x3a980} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope Kaku #3 Rotated", {0x43a08,0x34bc0}, {0x0,0x0,0x43a08,0x34bc0} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope Chou #3 Rotated", {0x395f8,0x1d4c0}, {0x0,0x0,0x395f8,0x1d4c0} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope Chou #4 Rotated", {0x320c8,0x15f90}, {0x0,0x0,0x320c8,0x15f90} },
+        { SPOOLSS_FORM_BUILTIN, "Letter Rotated",                 {0x44368,0x34b5c}, {0x0,0x0,0x44368,0x34b5c} },
+        { SPOOLSS_FORM_BUILTIN, "A3 Rotated",                     {0x668a0,0x48828}, {0x0,0x0,0x668a0,0x48828} },
+        { SPOOLSS_FORM_BUILTIN, "A4 Rotated",                     {0x48828,0x33450}, {0x0,0x0,0x48828,0x33450} },
+        { SPOOLSS_FORM_BUILTIN, "A5 Rotated",                     {0x33450,0x24220}, {0x0,0x0,0x33450,0x24220} },
+        { SPOOLSS_FORM_BUILTIN, "B4 (JIS) Rotated",               {0x58de0,0x3ebe8}, {0x0,0x0,0x58de0,0x3ebe8} },
+        { SPOOLSS_FORM_BUILTIN, "B5 (JIS) Rotated",               {0x3ebe8,0x2c6f0}, {0x0,0x0,0x3ebe8,0x2c6f0} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Postcard Rotated",      {0x24220,0x186a0}, {0x0,0x0,0x24220,0x186a0} },
+        { SPOOLSS_FORM_BUILTIN, "Double Japan Postcard Rotated",  {0x24220,0x30d40}, {0x0,0x0,0x24220,0x30d40} },
+        { SPOOLSS_FORM_BUILTIN, "A6 Rotated",                     {0x24220,0x19a28}, {0x0,0x0,0x24220,0x19a28} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Envelope Kaku #2",      {0x3a980,0x510e0}, {0x0,0x0,0x3a980,0x510e0} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Envelope Kaku #3",      {0x34bc0,0x43a08}, {0x0,0x0,0x34bc0,0x43a08} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Envelope Chou #3",      {0x1d4c0,0x395f8}, {0x0,0x0,0x1d4c0,0x395f8} },
+        { SPOOLSS_FORM_BUILTIN, "Japanese Envelope Chou #4",      {0x15f90,0x320c8}, {0x0,0x0,0x15f90,0x320c8} },
+        { SPOOLSS_FORM_BUILTIN, "B6 (JIS)",                       {0x1f400,0x2c6f0}, {0x0,0x0,0x1f400,0x2c6f0} },
+        { SPOOLSS_FORM_BUILTIN, "B6 (JIS) Rotated",               {0x2c6f0,0x1f400}, {0x0,0x0,0x2c6f0,0x1f400} },
+        { SPOOLSS_FORM_BUILTIN, "12x11",                          {0x4a724,0x443e1}, {0x0,0x0,0x4a724,0x443e1} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope You #4",          {0x19a28,0x395f8}, {0x0,0x0,0x19a28,0x395f8} },
+        { SPOOLSS_FORM_BUILTIN, "Japan Envelope You #4 Rotated",  {0x395f8,0x19a28}, {0x0,0x0,0x395f8,0x19a28} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 16K",                        {0x2de60,0x3f7a0}, {0x0,0x0,0x2de60,0x3f7a0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 32K",                        {0x1fbd0,0x2cec0}, {0x0,0x0,0x1fbd0,0x2cec0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 32K(Big)",                   {0x222e0,0x318f8}, {0x0,0x0,0x222e0,0x318f8} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #1",                {0x18e70,0x28488}, {0x0,0x0,0x18e70,0x28488} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #2",                {0x18e70,0x2af80}, {0x0,0x0,0x18e70,0x2af80} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #3",                {0x1e848,0x2af80}, {0x0,0x0,0x1e848,0x2af80} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #4",                {0x1adb0,0x32c80}, {0x0,0x0,0x1adb0,0x32c80} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #5",                {0x1adb0,0x35b60}, {0x0,0x0,0x1adb0,0x35b60} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #6",                {0x1d4c0,0x38270}, {0x0,0x0,0x1d4c0,0x38270} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #7",                {0x27100,0x38270}, {0x0,0x0,0x27100,0x38270} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #8",                {0x1d4c0,0x4b708}, {0x0,0x0,0x1d4c0,0x4b708} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #9",                {0x37e88,0x4f1a0}, {0x0,0x0,0x37e88,0x4f1a0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #10",               {0x4f1a0,0x6fd10}, {0x0,0x0,0x4f1a0,0x6fd10} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 16K Rotated",                {0x3f7a0,0x2de60}, {0x0,0x0,0x3f7a0,0x2de60} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 32K Rotated",                {0x2cec0,0x1fbd0}, {0x0,0x0,0x2cec0,0x1fbd0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC 32K(Big) Rotated",           {0x318f8,0x222e0}, {0x0,0x0,0x318f8,0x222e0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #1 Rotated",        {0x28488,0x18e70}, {0x0,0x0,0x28488,0x18e70} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #2 Rotated",        {0x2af80,0x18e70}, {0x0,0x0,0x2af80,0x18e70} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #3 Rotated",        {0x2af80,0x1e848}, {0x0,0x0,0x2af80,0x1e848} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #4 Rotated",        {0x32c80,0x1adb0}, {0x0,0x0,0x32c80,0x1adb0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #5 Rotated",        {0x35b60,0x1adb0}, {0x0,0x0,0x35b60,0x1adb0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #6 Rotated",        {0x38270,0x1d4c0}, {0x0,0x0,0x38270,0x1d4c0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #7 Rotated",        {0x38270,0x27100}, {0x0,0x0,0x38270,0x27100} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #8 Rotated",        {0x4b708,0x1d4c0}, {0x0,0x0,0x4b708,0x1d4c0} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #9 Rotated",        {0x4f1a0,0x37e88}, {0x0,0x0,0x4f1a0,0x37e88} },
+        { SPOOLSS_FORM_BUILTIN, "PRC Envelope #10 Rotated",       {0x6fd10,0x4f1a0}, {0x0,0x0,0x6fd10,0x4f1a0} }
 };
 
 /********************************************************************

Modified: branches/samba/upstream/source3/rpc_server/svcctl/srv_svcctl_reg.c
===================================================================
--- branches/samba/upstream/source3/rpc_server/svcctl/srv_svcctl_reg.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/rpc_server/svcctl/srv_svcctl_reg.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -392,10 +392,6 @@
 		}
 	}
 
-	if (ipath == NULL || dname == NULL || description == NULL) {
-		goto done;
-	}
-
 	/* Default to an external service if we haven't found a match */
 	if (builtin_svcs[i].servicename == NULL) {
 		struct rcinit_file_information *init_info = NULL;

Modified: branches/samba/upstream/source3/selftest/knownfail
===================================================================
--- branches/samba/upstream/source3/selftest/knownfail	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/selftest/knownfail	2012-10-30 06:15:57 UTC (rev 4174)
@@ -4,7 +4,13 @@
 samba3.posix_s3.rap.printing # fails sometimes on sn-devel
 samba3.posix_s3.rpc.spoolss.*printserver.enum_printers_old # fails on some hosts due to timing issues ?
 samba3.posix_s3.rpc.spoolss.printer.*addprinterex.print_test # another intermittent failure
+samba3.posix_s3.rpc.spoolss.printer.*addprinter.driver_info_winreg # knownfail or flapping?
+samba3.posix_s3.rpc.spoolss.printer.*addprinterex.driver_info_winreg # knownfail or flapping?
 samba3.posix_s3.smb2.lock.*.rw-exclusive # another intermittent failure
+samba3.posix_s3.smb2.compound.*interim2 # wrong return code (STATUS_CANCELLED)
+samba3.posix_s3.smb2.oplock.*batch12
+samba3.posix_s3.smb2.oplock.*batch20
+samba3.posix_s3.smb2.oplock.*stream1
 .*driver.add_driver_timestamps # we only can store dates, not timestamps
 samba3.raw.mux.* #This test is flaky on the async lock time
 samba3.smbtorture_s3.*OPLOCK4 # fails sometimes on sn-devel

Modified: branches/samba/upstream/source3/selftest/tests.py
===================================================================
--- branches/samba/upstream/source3/selftest/tests.py	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/selftest/tests.py	2012-10-30 06:15:57 UTC (rev 4174)
@@ -162,7 +162,7 @@
        "raw.samba3rootdirfid", "raw.sfileinfo.end-of-file"]
 
 smb2 = ["smb2.lock", "smb2.read", "smb2.compound", "smb2.connect", "smb2.scan", "smb2.scanfind",
-        "smb2.bench-oplock"]
+        "smb2.bench-oplock", "smb2.oplock"]
 
 rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sharesec",
        "rpc.samba3.spoolss", "rpc.samba3.wkssvc", "rpc.samba3.winreg",

Modified: branches/samba/upstream/source3/smbd/file_access.c
===================================================================
--- branches/samba/upstream/source3/smbd/file_access.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/file_access.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -87,7 +87,7 @@
 ****************************************************************************/
 
 bool can_delete_file_in_directory(connection_struct *conn,
-				  struct smb_filename *smb_fname)
+				  const struct smb_filename *smb_fname)
 {
 	TALLOC_CTX *ctx = talloc_tos();
 	char *dname = NULL;

Modified: branches/samba/upstream/source3/smbd/globals.h
===================================================================
--- branches/samba/upstream/source3/smbd/globals.h	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/globals.h	2012-10-30 06:15:57 UTC (rev 4174)
@@ -369,8 +369,6 @@
 	struct smb_request *smb1req;
 	struct files_struct *compat_chain_fsp;
 
-	NTSTATUS next_status;
-
 	/*
 	 * The sub request for async backend calls.
 	 * This is used for SMB2 Cancel.

Modified: branches/samba/upstream/source3/smbd/lanman.c
===================================================================
--- branches/samba/upstream/source3/smbd/lanman.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/lanman.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -3524,7 +3524,7 @@
 					    QueueName,
 					    NULL,
 					    devmode_ctr,
-					    SEC_FLAG_MAXIMUM_ALLOWED,
+					    PRINTER_ACCESS_ADMINISTER,
 					    &handle,
 					    &werr);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -4979,7 +4979,7 @@
 					    name,
 					    NULL,
 					    devmode_ctr,
-					    SEC_FLAG_MAXIMUM_ALLOWED,
+					    PRINTER_ACCESS_USE,
 					    &handle,
 					    &werr);
 	if (!NT_STATUS_IS_OK(status)) {
@@ -5179,7 +5179,7 @@
 					    PrinterName,
 					    NULL,
 					    devmode_ctr,
-					    SEC_FLAG_MAXIMUM_ALLOWED,
+					    PRINTER_ACCESS_USE,
 					    &handle,
 					    &werr);
 	if (!NT_STATUS_IS_OK(status)) {

Modified: branches/samba/upstream/source3/smbd/open.c
===================================================================
--- branches/samba/upstream/source3/smbd/open.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/open.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1410,6 +1410,12 @@
 				return NT_STATUS_ACCESS_DENIED;
 			}
 
+			if (!(access_granted & DELETE_ACCESS)) {
+				if (can_delete_file_in_directory(conn, smb_fname)) {
+					access_granted |= DELETE_ACCESS;
+				}
+			}
+
 			access_mask = access_granted;
 		} else {
 			access_mask = FILE_GENERIC_ALL;

Modified: branches/samba/upstream/source3/smbd/posix_acls.c
===================================================================
--- branches/samba/upstream/source3/smbd/posix_acls.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/posix_acls.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1353,13 +1353,15 @@
  type.
 ****************************************************************************/
 
-static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace,
-				     const struct share_params *params,
-				     const bool is_directory,
-							const struct dom_sid *pfile_owner_sid,
-							const struct dom_sid *pfile_grp_sid,
-							const SMB_STRUCT_STAT *pst,
-							bool setting_acl)
+static bool ensure_canon_entry_valid(connection_struct *conn,
+					canon_ace **pp_ace,
+					bool is_default_acl,
+					const struct share_params *params,
+					const bool is_directory,
+					const struct dom_sid *pfile_owner_sid,
+					const struct dom_sid *pfile_grp_sid,
+					const SMB_STRUCT_STAT *pst,
+					bool setting_acl)
 {
 	canon_ace *pace;
 	bool got_user = False;
@@ -1370,8 +1372,9 @@
 	for (pace = *pp_ace; pace; pace = pace->next) {
 		if (pace->type == SMB_ACL_USER_OBJ) {
 
-			if (setting_acl)
+			if (setting_acl && !is_default_acl) {
 				apply_default_perms(params, is_directory, pace, S_IRUSR);
+			}
 			got_user = True;
 
 		} else if (pace->type == SMB_ACL_GROUP_OBJ) {
@@ -1380,8 +1383,9 @@
 			 * Ensure create mask/force create mode is respected on set.
 			 */
 
-			if (setting_acl)
+			if (setting_acl && !is_default_acl) {
 				apply_default_perms(params, is_directory, pace, S_IRGRP);
+			}
 			got_grp = True;
 
 		} else if (pace->type == SMB_ACL_OTHER) {
@@ -1390,10 +1394,21 @@
 			 * Ensure create mask/force create mode is respected on set.
 			 */
 
-			if (setting_acl)
+			if (setting_acl && !is_default_acl) {
 				apply_default_perms(params, is_directory, pace, S_IROTH);
+			}
 			got_other = True;
 			pace_other = pace;
+
+		} else if (pace->type == SMB_ACL_USER || pace->type == SMB_ACL_GROUP) {
+
+			/*
+			 * Ensure create mask/force create mode is respected on set.
+			 */
+
+			if (setting_acl && !is_default_acl) {
+				apply_default_perms(params, is_directory, pace, S_IRGRP);
+			}
 		}
 	}
 
@@ -1437,7 +1452,9 @@
 					pace->perms = pace_other->perms;
 			}
 
-			apply_default_perms(params, is_directory, pace, S_IRUSR);
+			if (!is_default_acl) {
+				apply_default_perms(params, is_directory, pace, S_IRUSR);
+			}
 		} else {
 			pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRUSR, S_IWUSR, S_IXUSR);
 		}
@@ -1463,7 +1480,9 @@
 				pace->perms = pace_other->perms;
 			else
 				pace->perms = 0;
-			apply_default_perms(params, is_directory, pace, S_IRGRP);
+			if (!is_default_acl) {
+				apply_default_perms(params, is_directory, pace, S_IRGRP);
+			}
 		} else {
 			pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRGRP, S_IWGRP, S_IXGRP);
 		}
@@ -1485,7 +1504,9 @@
 		pace->attr = ALLOW_ACE;
 		if (setting_acl) {
 			pace->perms = 0;
-			apply_default_perms(params, is_directory, pace, S_IROTH);
+			if (!is_default_acl) {
+				apply_default_perms(params, is_directory, pace, S_IROTH);
+			}
 		} else
 			pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IROTH, S_IWOTH, S_IXOTH);
 
@@ -2330,7 +2351,7 @@
 
 	print_canon_ace_list( "file ace - before valid", file_ace);
 
-	if (!ensure_canon_entry_valid(fsp->conn, &file_ace, fsp->conn->params,
+	if (!ensure_canon_entry_valid(fsp->conn, &file_ace, false, fsp->conn->params,
 			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
 		free_canon_ace_list(file_ace);
 		free_canon_ace_list(dir_ace);
@@ -2339,7 +2360,7 @@
 
 	print_canon_ace_list( "dir ace - before valid", dir_ace);
 
-	if (dir_ace && !ensure_canon_entry_valid(fsp->conn, &dir_ace, fsp->conn->params,
+	if (dir_ace && !ensure_canon_entry_valid(fsp->conn, &dir_ace, true, fsp->conn->params,
 			fsp->is_directory, pfile_owner_sid, pfile_grp_sid, pst, True)) {
 		free_canon_ace_list(file_ace);
 		free_canon_ace_list(dir_ace);
@@ -2428,6 +2449,7 @@
 	canon_ace *ace = NULL;
 	canon_ace *next_ace = NULL;
 	int entry_id = SMB_ACL_FIRST_ENTRY;
+	bool is_default_acl = (the_acl_type == SMB_ACL_TYPE_DEFAULT);
 	SMB_ACL_ENTRY_T entry;
 	size_t ace_count;
 
@@ -2515,7 +2537,7 @@
 		ace->trustee = sid;
 		ace->unix_ug = unix_ug;
 		ace->owner_type = owner_type;
-		ace->ace_flags = get_pai_flags(pal, ace, (the_acl_type == SMB_ACL_TYPE_DEFAULT));
+		ace->ace_flags = get_pai_flags(pal, ace, is_default_acl);
 
 		DLIST_ADD(l_head, ace);
 	}
@@ -2524,7 +2546,7 @@
 	 * This next call will ensure we have at least a user/group/world set.
 	 */
 
-	if (!ensure_canon_entry_valid(conn, &l_head, conn->params,
+	if (!ensure_canon_entry_valid(conn, &l_head, is_default_acl, conn->params,
 				      S_ISDIR(psbuf->st_ex_mode), powner, pgroup,
 				      psbuf, False))
 		goto fail;
@@ -2534,7 +2556,7 @@
 	 * acl_mask. Ensure all DENY Entries are at the start of the list.
 	 */
 
-	DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", the_acl_type == SMB_ACL_TYPE_ACCESS ? "Access" : "Default" ));
+	DEBUG(10,("canonicalise_acl: %s ace entries before arrange :\n", is_default_acl ?  "Default" : "Access"));
 
 	for ( ace_count = 0, ace = l_head; ace; ace = next_ace, ace_count++) {
 		next_ace = ace->next;

Modified: branches/samba/upstream/source3/smbd/proto.h
===================================================================
--- branches/samba/upstream/source3/smbd/proto.h	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/proto.h	2012-10-30 06:15:57 UTC (rev 4174)
@@ -301,7 +301,7 @@
 			 const struct smb_filename *smb_fname,
 			 uint32_t access_mask);
 bool can_delete_file_in_directory(connection_struct *conn,
-				  struct smb_filename *smb_fname);
+				  const struct smb_filename *smb_fname);
 bool can_access_file_data(connection_struct *conn,
 			  const struct smb_filename *smb_fname,
 			  uint32 access_mask);

Modified: branches/samba/upstream/source3/smbd/quotas.c
===================================================================
--- branches/samba/upstream/source3/smbd/quotas.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/quotas.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -746,9 +746,6 @@
 	*bsize = gqr.getquota_rslt_u.gqr_rquota.rq_bsize;
 	*dsize = D.dqb_bsoftlimit;
 
-	if (D.dqb_curblocks == 1)
-		*bsize = 512;
-
 	if (D.dqb_curblocks > D.dqb_bsoftlimit) {
 		*dfree = 0;
 		*dsize = D.dqb_curblocks;

Modified: branches/samba/upstream/source3/smbd/server.c
===================================================================
--- branches/samba/upstream/source3/smbd/server.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/server.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -619,26 +619,6 @@
 	return true;
 }
 
-static bool smbd_parent_housekeeping(const struct timeval *now, void *private_data)
-{
-	time_t printcap_cache_time = (time_t)lp_printcap_cache_time();
-	time_t t = time_mono(NULL);
-
-	DEBUG(5, ("parent housekeeping\n"));
-
-	/* if periodic printcap rescan is enabled, see if it's time to reload */
-	if ((printcap_cache_time != 0)
-	 && (t >= (last_printer_reload_time + printcap_cache_time))) {
-		DEBUG( 3,( "Printcap cache time expired.\n"));
-		pcap_cache_reload(server_event_context(),
-				  smbd_messaging_context(),
-				  &reload_pcap_change_notify);
-		last_printer_reload_time = t;
-	}
-
-	return true;
-}
-
 /****************************************************************************
  Open the socket communication.
 ****************************************************************************/
@@ -650,6 +630,8 @@
 	int num_interfaces = iface_count();
 	int i;
 	char *ports;
+	char *tok;
+	const char *ptr;
 	unsigned dns_port = 0;
 
 #ifdef HAVE_ATEXIT
@@ -671,6 +653,16 @@
 		ports = talloc_strdup(talloc_tos(), smb_ports);
 	}
 
+	for (ptr = ports;
+	     next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
+		unsigned port = atoi(tok);
+
+		if (port == 0 || port > 0xffff) {
+			exit_server_cleanly("Invalid port in the config or on "
+					    "the commandline specified!");
+		}
+	}
+
 	if (lp_interfaces() && lp_bind_interfaces_only()) {
 		/* We have been given an interfaces line, and been
 		   told to only bind to those interfaces. Create a
@@ -682,8 +674,6 @@
 		for(i = 0; i < num_interfaces; i++) {
 			const struct sockaddr_storage *ifss =
 					iface_n_sockaddr_storage(i);
-			char *tok;
-			const char *ptr;
 
 			if (ifss == NULL) {
 				DEBUG(0,("open_sockets_smbd: "
@@ -695,9 +685,6 @@
 			for (ptr=ports;
 			     next_token_talloc(talloc_tos(),&ptr, &tok, " \t,");) {
 				unsigned port = atoi(tok);
-				if (port == 0 || port > 0xffff) {
-					continue;
-				}
 
 				/* Keep the first port for mDNS service
 				 * registration.
@@ -715,8 +702,6 @@
 		/* Just bind to 0.0.0.0 - accept connections
 		   from anywhere. */
 
-		char *tok;
-		const char *ptr;
 		const char *sock_addr = lp_socket_address();
 		char *sock_tok;
 		const char *sock_ptr;
@@ -734,11 +719,7 @@
 		     next_token_talloc(talloc_tos(), &sock_ptr, &sock_tok, " \t,"); ) {
 			for (ptr=ports; next_token_talloc(talloc_tos(), &ptr, &tok, " \t,"); ) {
 				struct sockaddr_storage ss;
-
 				unsigned port = atoi(tok);
-				if (port == 0 || port > 0xffff) {
-					continue;
-				}
 
 				/* Keep the first port for mDNS service
 				 * registration.
@@ -780,14 +761,6 @@
 		return false;
 	}
 
-	if (!(event_add_idle(smbd_event_context(), NULL,
-			     timeval_set(SMBD_HOUSEKEEPING_INTERVAL, 0),
-			     "parent_housekeeping", smbd_parent_housekeeping,
-			     NULL))) {
-		DEBUG(0, ("Could not add parent_housekeeping event\n"));
-		return false;
-	}
-
         /* Listen to messages */
 
 	messaging_register(msg_ctx, NULL, MSG_SMB_SAM_SYNC, msg_sam_sync);

Modified: branches/samba/upstream/source3/smbd/server_reload.c
===================================================================
--- branches/samba/upstream/source3/smbd/server_reload.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/server_reload.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -167,5 +167,14 @@
 void reload_pcap_change_notify(struct tevent_context *ev,
 			       struct messaging_context *msg_ctx)
 {
+	/*
+	 * Reload the printers first in the background process so that
+	 * newly added printers get default values created in the registry.
+	 *
+	 * This will block the process for some time (~1 sec per printer), but
+	 * it doesn't block smbd's servering clients.
+	 */
+	reload_printers(ev, msg_ctx);
+
 	message_send_all(msg_ctx, MSG_PRINTER_PCAP, NULL, 0, NULL);
 }

Modified: branches/samba/upstream/source3/smbd/sesssetup.c
===================================================================
--- branches/samba/upstream/source3/smbd/sesssetup.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/sesssetup.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -735,7 +735,7 @@
 		return;
 	}
 
-	if (auth.data[0] == ASN1_APPLICATION(0)) {
+	if (auth.length > 0 && auth.data[0] == ASN1_APPLICATION(0)) {
 		/* Might be a second negTokenTarg packet */
 		char *kerb_mech = NULL;
 

Modified: branches/samba/upstream/source3/smbd/smb2_create.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_create.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/smb2_create.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -386,6 +386,7 @@
 struct smbd_smb2_create_state {
 	struct smbd_smb2_request *smb2req;
 	struct smb_request *smb1req;
+	bool open_was_deferred;
 	struct timed_event *te;
 	struct tevent_immediate *im;
 	struct timeval request_time;
@@ -964,7 +965,7 @@
 		return false;
 	}
 	/* It's not in progress if there's no timeout event. */
-	if (!state->te) {
+	if (!state->open_was_deferred) {
 		return false;
 	}
 
@@ -995,6 +996,7 @@
 		"mid %llu\n",
 		(unsigned long long)mid ));
 
+	state->open_was_deferred = false;
 	/* Ensure we don't have any outstanding timer event. */
 	TALLOC_FREE(state->te);
 	/* Ensure we don't have any outstanding immediate event. */
@@ -1238,6 +1240,7 @@
 				&end_time,
 				true) ));
 
+	state->open_was_deferred = true;
 	state->te = event_add_timed(smb2req->sconn->smb2.event_ctx,
 				state,
 				end_time,

Modified: branches/samba/upstream/source3/smbd/smb2_notify.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_notify.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/smb2_notify.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -357,10 +357,9 @@
 	struct smbd_smb2_notify_state *state = tevent_req_data(req,
 					       struct smbd_smb2_notify_state);
 
+	state->smb2req->cancelled = true;
 	smbd_notify_cancel_by_smbreq(state->smbreq);
 
-	state->smb2req->cancelled = true;
-	tevent_req_done(req);
 	return true;
 }
 

Modified: branches/samba/upstream/source3/smbd/smb2_server.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_server.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/smb2_server.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -426,7 +426,6 @@
 
 	for (idx=1; idx < count; idx += 3) {
 		const uint8_t *inhdr = NULL;
-		uint32_t flags;
 
 		if (req->in.vector[idx].iov_len != SMB2_HDR_BODY) {
 			return NT_STATUS_INVALID_PARAMETER;
@@ -446,50 +445,6 @@
 		if (!smb2_validate_message_id(req->sconn, inhdr)) {
 			return NT_STATUS_INVALID_PARAMETER;
 		}
-
-		flags = IVAL(inhdr, SMB2_HDR_FLAGS);
-		if (idx == 1) {
-			/*
-			 * the 1st request should never have the
-			 * SMB2_HDR_FLAG_CHAINED flag set
-			 */
-			if (flags & SMB2_HDR_FLAG_CHAINED) {
-				req->next_status = NT_STATUS_INVALID_PARAMETER;
-				return NT_STATUS_OK;
-			}
-		} else if (idx == 4) {
-			/*
-			 * the 2nd request triggers related vs. unrelated
-			 * compounded requests
-			 */
-			if (flags & SMB2_HDR_FLAG_CHAINED) {
-				req->compound_related = true;
-			}
-		} else if (idx > 4) {
-#if 0
-			/*
-			 * It seems the this tests are wrong
-			 * see the SMB2-COMPOUND test
-			 */
-
-			/*
-			 * all other requests should match the 2nd one
-			 */
-			if (flags & SMB2_HDR_FLAG_CHAINED) {
-				if (!req->compound_related) {
-					req->next_status =
-						NT_STATUS_INVALID_PARAMETER;
-					return NT_STATUS_OK;
-				}
-			} else {
-				if (req->compound_related) {
-					req->next_status =
-						NT_STATUS_INVALID_PARAMETER;
-					return NT_STATUS_OK;
-				}
-			}
-#endif
-		}
 	}
 
 	return NT_STATUS_OK;
@@ -992,9 +947,13 @@
 		 * request chain. This is not allowed.
 		 * Cancel the outstanding request.
 		 */
-		tevent_req_cancel(req->subreq);
+		bool ok = tevent_req_cancel(req->subreq);
+		if (ok) {
+			return NT_STATUS_OK;
+		}
+		TALLOC_FREE(req->subreq);
 		return smbd_smb2_request_error(req,
-			NT_STATUS_INSUFFICIENT_RESOURCES);
+			NT_STATUS_INTERNAL_ERROR);
 	}
 
 	if (DEBUGLEVEL >= 10) {
@@ -1369,6 +1328,18 @@
 	 */
 	session_status = smbd_smb2_request_check_session(req);
 
+	if (flags & SMB2_HDR_FLAG_CHAINED) {
+		/*
+		 * This check is mostly for giving the correct error code
+		 * for compounded requests.
+		 */
+		if (!NT_STATUS_IS_OK(session_status)) {
+			return smbd_smb2_request_error(req, NT_STATUS_INVALID_PARAMETER);
+		}
+	} else {
+		req->compat_chain_fsp = NULL;
+	}
+
 	req->do_signing = false;
 	if (flags & SMB2_HDR_FLAG_SIGNED) {
 		if (!NT_STATUS_IS_OK(session_status)) {
@@ -1388,21 +1359,7 @@
 	}
 
 	if (flags & SMB2_HDR_FLAG_CHAINED) {
-		/*
-		 * This check is mostly for giving the correct error code
-		 * for compounded requests.
-		 *
-		 * TODO: we may need to move this after the session
-		 *       and tcon checks.
-		 */
-		if (!NT_STATUS_IS_OK(req->next_status)) {
-			return smbd_smb2_request_error(req, req->next_status);
-		}
-	} else {
-		req->compat_chain_fsp = NULL;
-	}
-
-	if (req->compound_related) {
+		req->compound_related = true;
 		req->sconn->smb2.compound_related_in_progress = true;
 	}
 
@@ -1853,6 +1810,7 @@
 	}
 
 	if (req->compound_related) {
+		req->compound_related = false;
 		req->sconn->smb2.compound_related_in_progress = false;
 	}
 
@@ -2100,10 +2058,9 @@
 	}
 
 	/*
-	 * if a request fails, all other remaining
-	 * compounded requests should fail too
+	 * Note: Even if there is an error, continue to process the request.
+	 * per MS-SMB2.
 	 */
-	req->next_status = NT_STATUS_INVALID_PARAMETER;
 
 	return smbd_smb2_request_done_ex(req, status, body, info, __location__);
 }

Modified: branches/samba/upstream/source3/smbd/smb2_sesssetup.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_sesssetup.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/smb2_sesssetup.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -560,7 +560,7 @@
 		return NT_STATUS_LOGON_FAILURE;
 	}
 
-	if (auth.data[0] == ASN1_APPLICATION(0)) {
+	if (auth.length > 0 && auth.data[0] == ASN1_APPLICATION(0)) {
 		/* Might be a second negTokenTarg packet */
 		DATA_BLOB secblob_in = data_blob_null;
 		char *kerb_mech = NULL;
@@ -835,6 +835,8 @@
 		in_session_id = req->last_session_id;
 	}
 
+	req->last_session_id = UINT64_MAX;
+
 	/* lookup an existing session */
 	p = idr_find(req->sconn->smb2.sessions.idtree, in_session_id);
 	if (p == NULL) {

Modified: branches/samba/upstream/source3/smbd/smb2_tcon.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_tcon.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/smbd/smb2_tcon.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -298,6 +298,8 @@
 		in_tid = req->last_tid;
 	}
 
+	req->last_tid = UINT32_MAX;
+
 	/* lookup an existing session */
 	p = idr_find(req->session->tcons.idtree, in_tid);
 	if (p == NULL) {

Modified: branches/samba/upstream/source3/torture/torture.c
===================================================================
--- branches/samba/upstream/source3/torture/torture.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/torture/torture.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -8102,6 +8102,60 @@
 	return result;
 }
 
+static bool run_local_tdb_opener(int dummy)
+{
+	TDB_CONTEXT *t;
+	unsigned v = 0;
+
+	while (1) {
+		t = tdb_open("test.tdb", 1000, TDB_CLEAR_IF_FIRST,
+			     O_RDWR|O_CREAT, 0755);
+		if (t == NULL) {
+			perror("tdb_open failed");
+			return false;
+		}
+		tdb_close(t);
+
+		v += 1;
+		printf("\r%u", v);
+	}
+	return true;
+}
+
+static bool run_local_tdb_writer(int dummy)
+{
+	TDB_CONTEXT *t;
+	unsigned v = 0;
+	TDB_DATA val;
+
+	t = tdb_open("test.tdb", 1000, 0, O_RDWR|O_CREAT, 0755);
+	if (t == 0) {
+		perror("tdb_open failed");
+		return 1;
+	}
+
+	val.dptr = (uint8_t *)&v;
+	val.dsize = sizeof(v);
+
+	while (1) {
+		TDB_DATA data;
+		int ret;
+
+		ret = tdb_store(t, val, val, 0);
+		if (ret != 0) {
+			printf("%s\n", tdb_errorstr(t));
+		}
+		v += 1;
+		printf("\r%u", v);
+
+		data = tdb_fetch(t, val);
+		if (data.dptr != NULL) {
+			SAFE_FREE(data.dptr);
+		}
+	}
+	return true;
+}
+
 static double create_procs(bool (*fn)(int), bool *result)
 {
 	int i, status;
@@ -8290,6 +8344,8 @@
 	{ "LOCAL-binary_to_sid", run_local_binary_to_sid, 0},
 	{ "LOCAL-DBTRANS", run_local_dbtrans, 0},
 	{ "LOCAL-TEVENT-SELECT", run_local_tevent_select, 0},
+	{ "LOCAL-TDB-OPENER", run_local_tdb_opener, 0 },
+	{ "LOCAL-TDB-WRITER", run_local_tdb_writer, 0 },
 	{NULL, NULL, 0}};
 
 

Modified: branches/samba/upstream/source3/utils/net_rpc.c
===================================================================
--- branches/samba/upstream/source3/utils/net_rpc.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/utils/net_rpc.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -4902,28 +4902,6 @@
 	return;
 }
 
-struct share_list {
-	int num_shares;
-	char **shares;
-};
-
-static void collect_share(const char *name, uint32 m,
-			  const char *comment, void *state)
-{
-	struct share_list *share_list = (struct share_list *)state;
-
-	if (m != STYPE_DISKTREE)
-		return;
-
-	share_list->num_shares += 1;
-	share_list->shares = SMB_REALLOC_ARRAY(share_list->shares, char *, share_list->num_shares);
-	if (!share_list->shares) {
-		share_list->num_shares = 0;
-		return;
-	}
-	share_list->shares[share_list->num_shares-1] = SMB_STRDUP(name);
-}
-
 /**
  * List shares on a remote RPC server, including the security descriptors.
  *
@@ -4949,16 +4927,21 @@
 						int argc,
 						const char **argv)
 {
-	int ret;
 	bool r;
-	uint32 i;
 	FILE *f;
+	NTSTATUS nt_status = NT_STATUS_OK;
+	uint32_t total_entries = 0;
+	uint32_t resume_handle = 0;
+	uint32_t preferred_len = 0xffffffff;
+	uint32_t i;
+	struct dcerpc_binding_handle *b = NULL;
+	struct srvsvc_NetShareInfoCtr info_ctr;
+	struct srvsvc_NetShareCtr1 ctr1;
+	WERROR result;
 
 	struct user_token *tokens = NULL;
 	int num_tokens = 0;
 
-	struct share_list share_list;
-
 	if (argc == 0) {
 		f = stdin;
 	} else {
@@ -4983,22 +4966,47 @@
 	for (i=0; i<num_tokens; i++)
 		collect_alias_memberships(&tokens[i].token);
 
-	share_list.num_shares = 0;
-	share_list.shares = NULL;
+	ZERO_STRUCT(info_ctr);
+	ZERO_STRUCT(ctr1);
 
-	ret = cli_RNetShareEnum(cli, collect_share, &share_list);
+	info_ctr.level = 1;
+	info_ctr.ctr.ctr1 = &ctr1;
 
-	if (ret == -1) {
-		DEBUG(0, ("Error returning browse list: %s\n",
-			  cli_errstr(cli)));
+	b = pipe_hnd->binding_handle;
+
+	/* Issue the NetShareEnum RPC call and retrieve the response */
+	nt_status = dcerpc_srvsvc_NetShareEnumAll(b,
+					talloc_tos(),
+					pipe_hnd->desthost,
+					&info_ctr,
+					preferred_len,
+					&total_entries,
+					&resume_handle,
+					&result);
+
+	/* Was it successful? */
+	if (!NT_STATUS_IS_OK(nt_status)) {
+		/*  Nope.  Go clean up. */
 		goto done;
 	}
 
-	for (i = 0; i < share_list.num_shares; i++) {
-		char *netname = share_list.shares[i];
+	if (!W_ERROR_IS_OK(result)) {
+		/*  Nope.  Go clean up. */
+		nt_status = werror_to_ntstatus(result);
+		goto done;
+	}
 
-		if (netname[strlen(netname)-1] == '$')
+	if (total_entries == 0) {
+		goto done;
+	}
+
+        /* For each returned entry... */
+	for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
+		const char *netname = info_ctr.ctr.ctr1->array[i].name;
+
+		if (info_ctr.ctr.ctr1->array[i].type != STYPE_DISKTREE) {
 			continue;
+		}
 
 		d_printf("%s\n", netname);
 
@@ -5010,9 +5018,8 @@
 		free_user_token(&tokens[i].token);
 	}
 	SAFE_FREE(tokens);
-	SAFE_FREE(share_list.shares);
 
-	return NT_STATUS_OK;
+	return nt_status;
 }
 
 static int rpc_share_allowedusers(struct net_context *c, int argc,

Modified: branches/samba/upstream/source3/winbindd/idmap_hash/idmap_hash.c
===================================================================
--- branches/samba/upstream/source3/winbindd/idmap_hash/idmap_hash.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/winbindd/idmap_hash/idmap_hash.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -259,7 +259,7 @@
 
 static NTSTATUS nss_hash_init(struct nss_domain_entry *e )
 {
-	return be_init(NULL);
+	return NT_STATUS_OK;
 }
 
 /**********************************************************************

Modified: branches/samba/upstream/source3/winbindd/winbindd_cm.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_cm.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source3/winbindd/winbindd_cm.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -1769,12 +1769,6 @@
 		return NT_STATUS_OK;
 	}
 
-	if (!winbindd_can_contact_domain(domain)) {
-		invalidate_cm_connection(&domain->conn);
-		domain->initialized = True;
-		return NT_STATUS_OK;
-	}
-
 	if (connection_ok(domain)) {
 		if (!domain->initialized) {
 			set_dc_type_and_flags(domain);

Modified: branches/samba/upstream/source4/lib/ldb/common/ldb_parse.c
===================================================================
--- branches/samba/upstream/source4/lib/ldb/common/ldb_parse.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source4/lib/ldb/common/ldb_parse.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -111,6 +111,13 @@
 	return ret;
 }
 
+static bool need_encode(unsigned char cval)
+{
+	if (cval < 0x20 || cval > 0x7E || strchr(" *()\\&|!\"", cval)) {
+		return true;
+	}
+	return false;
+}
 
 /*
    encode a blob as a RFC2254 binary string, escaping any
@@ -124,7 +131,7 @@
 	unsigned char *buf = val.data;
 
 	for (i=0;i<val.length;i++) {
-		if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+		if (need_encode(buf[i])) {
 			len += 2;
 		}
 	}
@@ -133,7 +140,7 @@
 
 	len = 0;
 	for (i=0;i<val.length;i++) {
-		if (!isprint(buf[i]) || strchr(" *()\\&|!\"", buf[i])) {
+		if (need_encode(buf[i])) {
 			snprintf(ret+len, 4, "\\%02X", buf[i]);
 			len += 3;
 		} else {

Modified: branches/samba/upstream/source4/torture/smb2/compound.c
===================================================================
--- branches/samba/upstream/source4/torture/smb2/compound.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source4/torture/smb2/compound.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -33,9 +33,6 @@
 		goto done; \
 	}} while (0)
 
-#define TARGET_IS_W2K8(_tctx) (torture_setting_bool(_tctx, "w2k8", false))
-#define TARGET_IS_WIN7(_tctx) (torture_setting_bool(_tctx, "win7", false))
-
 static bool test_compound_related1(struct torture_context *tctx,
 				   struct smb2_tree *tree)
 {
@@ -166,9 +163,9 @@
 	status = smb2_close_recv(req[2], &cl);
 	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 	status = smb2_close_recv(req[3], &cl);
-	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 	status = smb2_close_recv(req[4], &cl);
-	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
 	tree->tid = saved_tid;
 	tree->session->uid = saved_uid;
@@ -252,9 +249,9 @@
 	const char *fname = "compound_invalid1.dat";
 	struct smb2_close cl;
 	bool ret = true;
-	struct smb2_request *req[2];
+	struct smb2_request *req[3];
 
-	smb2_transport_credits_ask_num(tree->session->transport, 2);
+	smb2_transport_credits_ask_num(tree->session->transport, 3);
 
 	smb2_util_unlink(tree, fname);
 
@@ -278,7 +275,7 @@
 					  0x00200000;
 	cr.in.fname			= fname;
 
-	smb2_transport_compound_start(tree->session->transport, 2);
+	smb2_transport_compound_start(tree->session->transport, 3);
 
 	/* passing the first request with the related flag is invalid */
 	smb2_transport_compound_set_related(tree->session->transport, true);
@@ -292,11 +289,16 @@
 	cl.in.file.handle = hd;
 	req[1] = smb2_close_send(tree, &cl);
 
+	smb2_transport_compound_set_related(tree->session->transport, false);
+	req[2] = smb2_close_send(tree, &cl);
+
 	status = smb2_create_recv(req[0], tree, &cr);
 	/* TODO: check why this fails with --signing=required */
 	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
 	status = smb2_close_recv(req[1], &cl);
 	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+	status = smb2_close_recv(req[2], &cl);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
 	smb2_util_unlink(tree, fname);
 done:
@@ -367,9 +369,9 @@
 	status = smb2_close_recv(req[1], &cl);
 	CHECK_STATUS(status, NT_STATUS_OK);
 	status = smb2_close_recv(req[2], &cl);
-	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+	CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
 	status = smb2_close_recv(req[3], &cl);
-	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
+	CHECK_STATUS(status, NT_STATUS_USER_SESSION_DELETED);
 	status = smb2_close_recv(req[4], &cl);
 	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
 
@@ -439,9 +441,9 @@
 	status = smb2_close_recv(req[2], &cl);
 	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 	status = smb2_close_recv(req[3], &cl);
-	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 	status = smb2_close_recv(req[4], &cl);
-	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+	CHECK_STATUS(status, NT_STATUS_FILE_CLOSED);
 
 	smb2_util_unlink(tree, fname);
 done:
@@ -465,10 +467,6 @@
     /* Win7 compound request implementation deviates substantially from the
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-	    torture_skip(tctx, "Interim test is specific to Windows server "
-			       "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);
 
@@ -536,10 +534,6 @@
     /* Win7 compound request implementation deviates substantially from the
      * SMB2 spec as noted in MS-SMB2 <159>, <162>.  This, test currently
      * verifies the Windows behavior, not the general spec behavior. */
-    if (!TARGET_IS_WIN7(tctx) && !TARGET_IS_W2K8(tctx)) {
-	    torture_skip(tctx, "Interim test is specific to Windows server "
-			       "behavior.\n");
-    }
 
     smb2_transport_credits_ask_num(tree->session->transport, 5);
 

Modified: branches/samba/upstream/source4/torture/smb2/oplock.c
===================================================================
--- branches/samba/upstream/source4/torture/smb2/oplock.c	2012-09-20 05:13:14 UTC (rev 4173)
+++ branches/samba/upstream/source4/torture/smb2/oplock.c	2012-10-30 06:15:57 UTC (rev 4174)
@@ -2384,10 +2384,6 @@
 	int timeout = torture_setting_int(tctx, "oplocktimeout", 30);
 	int te;
 
-	if (torture_setting_bool(tctx, "samba3", false)) {
-		torture_skip(tctx, "BATCH22 disabled against samba3\n");
-	}
-
 	status = torture_smb2_testdir(tree1, BASEDIR, &h);
 	torture_assert_ntstatus_ok(tctx, status, "Error creating directory");
 
@@ -2727,12 +2723,6 @@
 		{&fname_default_stream, true,  SMB2_OPLOCK_LEVEL_EXCLUSIVE, SMB2_OPLOCK_LEVEL_II},
 	};
 
-	/* Only passes against windows at the moment. */
-	if (torture_setting_bool(tctx, "samba3", false) ||
-	    torture_setting_bool(tctx, "samba4", false)) {
-		torture_skip(tctx, "STREAM1 disabled against samba3+4\n");
-	}
-
 	fname_stream = talloc_asprintf(tctx, "%s:%s", fname_base, stream);
 	fname_default_stream = talloc_asprintf(tctx, "%s%s", fname_base,
 					       default_stream);



