[Pkg-samba-maint] r4179 - in branches/samba/upstream: . docs/manpages docs-xml/build/DTD lib/addns lib/replace lib/tsocket nsswitch packaging/RHEL packaging/RHEL-CTDB source3 source3/auth source3/include source3/lib source3/libads source3/libsmb source3/locking source3/modules source3/rpc_client source3/rpc_server/spoolss source3/smbd source3/utils source3/winbindd source4/torture/smb2

Wed Dec 12 21:11:48 UTC 2012

Author: bubulle
Date: 2012-12-12 21:11:47 +0000 (Wed, 12 Dec 2012)
New Revision: 4179

Added:
   branches/samba/upstream/source3/utils/net_dns.h
Modified:
   branches/samba/upstream/WHATSNEW.txt
   branches/samba/upstream/docs-xml/build/DTD/samba.entities
   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/dnsgss.c
   branches/samba/upstream/lib/replace/replace.c
   branches/samba/upstream/lib/replace/replace.h
   branches/samba/upstream/lib/replace/snprintf.c
   branches/samba/upstream/lib/tsocket/tsocket.h
   branches/samba/upstream/lib/tsocket/tsocket_bsd.c
   branches/samba/upstream/lib/tsocket/tsocket_helpers.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/source3/VERSION
   branches/samba/upstream/source3/auth/auth_util.c
   branches/samba/upstream/source3/configure
   branches/samba/upstream/source3/configure.in
   branches/samba/upstream/source3/include/config.h.in
   branches/samba/upstream/source3/include/proto.h
   branches/samba/upstream/source3/include/version.h
   branches/samba/upstream/source3/lib/dummysmbd.c
   branches/samba/upstream/source3/lib/util.c
   branches/samba/upstream/source3/libads/kerberos.c
   branches/samba/upstream/source3/libads/kerberos_keytab.c
   branches/samba/upstream/source3/libads/kerberos_verify.c
   branches/samba/upstream/source3/libsmb/cliconnect.c
   branches/samba/upstream/source3/libsmb/clikrb5.c
   branches/samba/upstream/source3/locking/locking.c
   branches/samba/upstream/source3/modules/vfs_acl_common.c
   branches/samba/upstream/source3/modules/vfs_aio_pthread.c
   branches/samba/upstream/source3/rpc_client/cli_lsarpc.c
   branches/samba/upstream/source3/rpc_client/cli_lsarpc.h
   branches/samba/upstream/source3/rpc_client/cli_pipe.c
   branches/samba/upstream/source3/rpc_server/spoolss/srv_spoolss_nt.c
   branches/samba/upstream/source3/smbd/dir.c
   branches/samba/upstream/source3/smbd/open.c
   branches/samba/upstream/source3/smbd/posix_acls.c
   branches/samba/upstream/source3/smbd/process.c
   branches/samba/upstream/source3/smbd/trans2.c
   branches/samba/upstream/source3/utils/net_ads.c
   branches/samba/upstream/source3/utils/net_dns.c
   branches/samba/upstream/source3/winbindd/winbindd_cm.c
   branches/samba/upstream/source3/winbindd/winbindd_msrpc.c
   branches/samba/upstream/source3/winbindd/winbindd_pam.c
   branches/samba/upstream/source3/winbindd/winbindd_proto.h
   branches/samba/upstream/source3/winbindd/winbindd_rpc.c
   branches/samba/upstream/source3/wscript
   branches/samba/upstream/source4/torture/smb2/create.c
Log:
Load samba-3.6.10 into branches/samba/upstream.

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

--- branches/samba/upstream/WHATSNEW.txt	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/WHATSNEW.txt	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1,3 +1,97 @@
+                   ==============================
+                   Release Notes for Samba 3.6.10
+                         December 10, 2012
+                   ==============================
+
+
+This is is the latest stable release of Samba 3.6.
+
+Major enhancements in Samba 3.6.10 include:
+
+o  Respond correctly to FILE_STREAM_INFO requests (bug #9460).
+o  Fix segfault when "default devmode" is disabled (bug #9433).
+o  Fix segfaults in "log level = 10" on Solaris (bug #9390).
+
+
+Changes since 3.6.9:
+--------------------
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 9236: ACL masks incorrectly applied when setting ACLs.
+    * BUG 9374: Allow smb2.acls torture test to pass against smbd with a POSIX
+      ACLs backend.
+
+
+o   Björn Baumbach <bb at sernet.de>
+    * BUG 9345: Manpages: Fix use of <smbconfoption> tag.
+
+
+o   Sumit Bose <sbose at redhat.com>
+    * BUG 9367: Use work around for 'winbind use default domain' only if it is
+      set.
+
+
+o   Günther Deschner <gd at samba.org>
+    * BUG 9272: 'net ads join' does not provide AES keys in host keytab.
+    * BUG 9426: Lookup nametype 0x20 in rpc_pipe_open_tcp_port().
+    * BUG 9439: Fix ncacn_ip_tcp reconnection code for lsa lookups.
+    * BUG 9451: Allow to force DNS updates using net.
+
+
+o   David Disseldorp <ddiss at samba.org>
+    * BUG 9433: Fix segfault when "default devmode" is disabled.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 9359: Optimization needed for SMB2 performance sensitive workloads.
+    * BUG 9422: Large read requests cause server to issue malformed reply.
+    * BUG 9439: Fix ncacn_ip_tcp reconnection code for lsa lookups.
+
+
+o   Stefan Metzmacher <metze at samba.org>
+    * BUG 9209: Improve the smb2.create.blob test.
+    * BUG 9272: 'net ads join' does not provide AES keys in host keytab.
+    * BUG 9390: Fix segfaults in "log level = 10" on Solaris.
+    * BUG 9402: lib/addns doesn't work with a bind9 server.
+
+
+o   Matthieu Patou <mat at matws.net>
+    * BUG 9418: Fix MD5 detection in the autoconf build.
+
+
+o   Andreas Schneider <asn at samba.org>
+    * BUG 8564: Fix segfault in pam_sm_authenticate().
+    * BUG 9326: Fix 'net ads join' message for the dns domain.
+    * BUG 9386: Winbind: Failover if netlogon pipe is not available.
+    * BUG 9436: Fix leaking sockets of SMB connections to a DC.
+
+
+o   Richard Sharpe <realrichardsharpe at gmail.com>
+    * BUG 9460: Respond correctly to FILE_STREAM_INFO requests.
+
+
+######################################################################
+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.9
                          October 29, 2012
@@ -125,9 +219,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    =============================
                    Release Notes for Samba 3.6.8
                          September 17, 2012

Modified: branches/samba/upstream/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/upstream/docs/manpages/eventlogadm.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/eventlogadm.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/findsmb.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_ad.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_adex.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_autorid.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_hash.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_ldap.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_nss.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_rid.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_tdb.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/idmap_tdb2.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/libsmbclient.7	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "10/29/2012" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "12/06/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/upstream/docs/manpages/lmhosts.5	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/lmhosts.5	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/log2pcap.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/net.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NET" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 \-n|\-\-netbiosname <primary NetBIOS name>
 .RS 4
 This option allows you to override the NetBIOS name that Samba uses for itself\&. This is identical to setting the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBnetbios name\fR\m[]
 parameter in the
 smb\&.conf
 file\&. However, a command line setting will take precedence over settings in
@@ -114,7 +114,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/nmbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/nmbd.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/nmbd.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -134,7 +134,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/upstream/docs/manpages/nmblookup.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/nmblookup.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -72,7 +72,7 @@
 \-n|\-\-netbiosname <primary NetBIOS name>
 .RS 4
 This option allows you to override the NetBIOS name that Samba uses for itself\&. This is identical to setting the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBnetbios name\fR\m[]
 parameter in the
 smb\&.conf
 file\&. However, a command line setting will take precedence over settings in
@@ -132,7 +132,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/ntlm_auth.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -274,7 +274,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/pam_winbind.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: 8
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "10/29/2012" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "10/29/2012" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "12/06/2012" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/upstream/docs/manpages/pdbedit.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/pdbedit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -561,7 +561,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/profiles.1
===================================================================
--- branches/samba/upstream/docs/manpages/profiles.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/profiles.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/rpcclient.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -73,7 +73,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.
@@ -162,7 +162,7 @@
 \-n|\-\-netbiosname <primary NetBIOS name>
 .RS 4
 This option allows you to override the NetBIOS name that Samba uses for itself\&. This is identical to setting the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBnetbios name\fR\m[]
 parameter in the
 smb\&.conf
 file\&. However, a command line setting will take precedence over settings in

Modified: branches/samba/upstream/docs/manpages/samba.7
===================================================================
--- branches/samba/upstream/docs/manpages/samba.7	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/samba.7	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "10/29/2012" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "12/06/2012" "Samba 3\&.6" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/sharesec.1
===================================================================
--- branches/samba/upstream/docs/manpages/sharesec.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/sharesec.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -88,7 +88,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/smb.conf.5	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smb.conf.5	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "12/06/2012" "Samba 3\&.6" "File Formats and Conventions"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcacls.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcacls.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbcacls.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -108,7 +108,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/smbclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbclient.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbclient.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -249,7 +249,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.
@@ -338,7 +338,7 @@
 \-n|\-\-netbiosname <primary NetBIOS name>
 .RS 4
 This option allows you to override the NetBIOS name that Samba uses for itself\&. This is identical to setting the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBnetbios name\fR\m[]
 parameter in the
 smb\&.conf
 file\&. However, a command line setting will take precedence over settings in

Modified: branches/samba/upstream/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcontrol.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbcontrol.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbcquotas.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -88,7 +88,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/smbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbd.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbd.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -96,7 +96,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/smbget.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbget.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbget.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbgetrc.5	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbpasswd.5	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "10/29/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbpasswd.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbspool.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbstatus.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -53,7 +53,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/smbta-util.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbta-util.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbta-util.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbta-util
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTA\-UTIL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbtar.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/smbtree.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -58,7 +58,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/swat.8
===================================================================
--- branches/samba/upstream/docs/manpages/swat.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/swat.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -82,7 +82,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbbackup.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/tdbbackup.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/tdbdump.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/tdbtool.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/testparm.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_audit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_cap.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_catia.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_commit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_crossrename.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_default_quota.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_dirsort.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_fileid.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_full_audit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_gpfs.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_netatalk.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_prealloc.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_preopen.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_readahead.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_readonly.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_recycle.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_time_audit.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/vfstest.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -60,7 +60,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/upstream/docs/manpages/wbinfo.1	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/wbinfo.1	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "10/29/2012" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "12/06/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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2012-12-12 21:11:47 UTC (rev 4179)
@@ -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: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "10/29/2012" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "12/06/2012" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbindd.8
===================================================================
--- branches/samba/upstream/docs/manpages/winbindd.8	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs/manpages/winbindd.8	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 10/29/2012
+.\"      Date: 12/06/2012
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "10/29/2012" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -173,7 +173,7 @@
 Levels above 1 will generate considerable amounts of log data, and should only be used when investigating a problem\&. Levels above 3 are designed for use only by developers and generate HUGE amounts of log data, most of which is extremely cryptic\&.
 .sp
 Note that specifying this parameter here will override the
-\m[blue]\fB\%smb.conf.5.html#\fR\m[]
+\m[blue]\fBlog level\fR\m[]
 parameter in the
 smb\&.conf
 file\&.

Modified: branches/samba/upstream/docs-xml/build/DTD/samba.entities
===================================================================
--- branches/samba/upstream/docs-xml/build/DTD/samba.entities	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/docs-xml/build/DTD/samba.entities	2012-12-12 21:11:47 UTC (rev 4179)
@@ -180,7 +180,7 @@
 data, most of which is extremely cryptic.</para>
 
 <para>Note that specifying this parameter here will 
-override the <smbconfoption><name>log level</name></smbconfoption> parameter
+override the <smbconfoption name="log level" /> parameter
 in the &smb.conf; file.</para>
 </listitem>
 </varlistentry>'>
@@ -207,7 +207,7 @@
 data, most of which is extremely cryptic.</para>
 
 <para>Note that specifying this parameter here will 
-override the <smbconfoption><name>log level</name></smbconfoption> parameter
+override the <smbconfoption name="log level" /> parameter
 in the &smb.conf; file.</para>
 </listitem>
 </varlistentry>'>
@@ -297,11 +297,13 @@
 
 <para>If this parameter is not set then the name resolve order 
 defined in the &smb.conf; file parameter  
-(<smbconfoption><name>name resolve order</name></smbconfoption>) will be used.
+(<smbconfoption name="name resolve order" />) will be used.
 </para>
 
 <para>The default order is lmhosts, host, wins, bcast. Without 
-this parameter or any entry in the <smbconfoption><name>name resolve order</name></smbconfoption> parameter of the &smb.conf; file, the name 
+this parameter or any entry in the
+<smbconfoption name="name resolve order" /> parameter of
+the &smb.conf; file, the name
 resolution methods will be attempted in this order. </para></listitem>
 </varlistentry>'>
 
@@ -310,7 +312,8 @@
 <term>-n|--netbiosname <primary NetBIOS name></term>
 <listitem><para>This option allows you to override
 the NetBIOS name that Samba uses for itself. This is identical
-to setting the <smbconfoption><name>netbios name</name></smbconfoption> parameter in the &smb.conf; file. 
+to setting the <smbconfoption name="netbios name" /> parameter in
+the &smb.conf; file.
 However, a command
 line setting will take precedence over settings in
 &smb.conf;.</para></listitem>

Modified: branches/samba/upstream/lib/addns/dnsgss.c
===================================================================
--- branches/samba/upstream/lib/addns/dnsgss.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/addns/dnsgss.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -164,6 +164,8 @@
 			struct dns_request *resp;
 			struct dns_buffer *buf;
 			struct dns_tkey_record *tkey;
+			struct dns_rrec *tkey_answer = NULL;
+			uint16_t i;
 
 			err = dns_receive(mem_ctx, conn, &buf);
 			if (!ERR_DNS_IS_OK(err)) goto error;
@@ -174,10 +176,16 @@
 			/*
 			 * TODO: Compare id and keyname
 			 */
-			
-			if ((resp->num_additionals != 1) ||
-			    (resp->num_answers == 0) ||
-			    (resp->answers[0]->type != QTYPE_TKEY)) {
+
+			for (i=0; i < resp->num_answers; i++) {
+				if (resp->answers[i]->type != QTYPE_TKEY) {
+					continue;
+				}
+
+				tkey_answer = resp->answers[i];
+			}
+
+			if (tkey_answer == NULL) {
 				err = ERROR_DNS_INVALID_MESSAGE;
 				goto error;
 			}

Modified: branches/samba/upstream/lib/replace/replace.c
===================================================================
--- branches/samba/upstream/lib/replace/replace.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/replace/replace.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -750,7 +750,7 @@
 }
 #endif
 
-#ifndef HAVE_VDPRINTF
+#if !defined(HAVE_VDPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 int rep_vdprintf(int fd, const char *format, va_list ap)
 {
 	char *s = NULL;
@@ -767,7 +767,7 @@
 }
 #endif
 
-#ifndef HAVE_DPRINTF
+#if !defined(HAVE_DPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 int rep_dprintf(int fd, const char *format, ...)
 {
 	int ret;

Modified: branches/samba/upstream/lib/replace/replace.h
===================================================================
--- branches/samba/upstream/lib/replace/replace.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/replace/replace.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -355,16 +355,6 @@
 /* prototype is in system/network.h */
 #endif
 
-#ifndef HAVE_VDPRINTF
-#define vdprintf rep_vdprintf
-int rep_vdprintf(int fd, const char *format, va_list ap);
-#endif
-
-#ifndef HAVE_DPRINTF
-#define dprintf rep_dprintf
-int rep_dprintf(int fd, const char *format, ...);
-#endif
-
 #ifndef PRINTF_ATTRIBUTE
 #if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 )
 /** Use gcc attribute to check printf fns.  a1 is the 1-based index of
@@ -385,7 +375,17 @@
 #endif
 #endif
 
-#ifndef HAVE_VASPRINTF
+#if !defined(HAVE_VDPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define vdprintf rep_vdprintf
+int rep_vdprintf(int fd, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
+#endif
+
+#if !defined(HAVE_DPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define dprintf rep_dprintf
+int rep_dprintf(int fd, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+#endif
+
+#if !defined(HAVE_VASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 #define vasprintf rep_vasprintf
 int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
 #endif
@@ -400,11 +400,29 @@
 int rep_vsnprintf(char *,size_t ,const char *, va_list ap) PRINTF_ATTRIBUTE(3,0);
 #endif
 
-#ifndef HAVE_ASPRINTF
+#if !defined(HAVE_ASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 #define asprintf rep_asprintf
 int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
 #endif
 
+#if !defined(HAVE_C99_VSNPRINTF)
+#ifdef REPLACE_BROKEN_PRINTF
+/*
+ * We do not redefine printf by default
+ * as it breaks the build if system headers
+ * use __attribute__((format(printf, 3, 0)))
+ * instead of __attribute__((format(__printf__, 3, 0)))
+ */
+#define printf rep_printf
+#endif
+int rep_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2);
+#endif
+
+#if !defined(HAVE_C99_VSNPRINTF)
+#define fprintf rep_fprintf
+int rep_fprintf(FILE *stream, const char *, ...) PRINTF_ATTRIBUTE(2,3);
+#endif
+
 #ifndef HAVE_VSYSLOG
 #ifdef HAVE_SYSLOG
 #define vsyslog rep_vsyslog

Modified: branches/samba/upstream/lib/replace/snprintf.c
===================================================================
--- branches/samba/upstream/lib/replace/snprintf.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/replace/snprintf.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1187,7 +1187,7 @@
 	return max;
 }
 
- int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+ int rep_vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
 	return dopr(str, count, fmt, args);
 }
@@ -1200,7 +1200,7 @@
  * that doesn't work properly according to the autoconf test.
  */
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
- int snprintf(char *str,size_t count,const char *fmt,...)
+ int rep_snprintf(char *str,size_t count,const char *fmt,...)
 {
 	size_t ret;
 	va_list ap;
@@ -1213,7 +1213,7 @@
 #endif
 
 #ifndef HAVE_C99_VSNPRINTF
- int printf(const char *fmt, ...)
+ int rep_printf(const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
@@ -1234,7 +1234,7 @@
 #endif
 
 #ifndef HAVE_C99_VSNPRINTF
- int fprintf(FILE *stream, const char *fmt, ...)
+ int rep_fprintf(FILE *stream, const char *fmt, ...)
 {
 	va_list ap;
 	int ret;
@@ -1256,8 +1256,8 @@
 
 #endif 
 
-#ifndef HAVE_VASPRINTF
- int vasprintf(char **ptr, const char *format, va_list ap)
+#if !defined(HAVE_VASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+ int rep_vasprintf(char **ptr, const char *format, va_list ap)
 {
 	int ret;
 	va_list ap2;
@@ -1278,9 +1278,8 @@
 }
 #endif
 
-
-#ifndef HAVE_ASPRINTF
- int asprintf(char **ptr, const char *format, ...)
+#if !defined(HAVE_ASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+ int rep_asprintf(char **ptr, const char *format, ...)
 {
 	va_list ap;
 	int ret;

Modified: branches/samba/upstream/lib/tsocket/tsocket.h
===================================================================
--- branches/samba/upstream/lib/tsocket/tsocket.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/tsocket/tsocket.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -627,6 +627,27 @@
 char *tsocket_address_unix_path(const struct tsocket_address *addr,
 				TALLOC_CTX *mem_ctx);
 
+/**
+ * @brief Request a syscall optimization for tdgram_recvfrom_send()
+ *
+ * This function is only used to reduce the amount of syscalls and
+ * optimize performance. You should only use this if you know
+ * what you're doing.
+ *
+ * The optimization is off by default.
+ *
+ * @param[in]  dgram    The tdgram_context of a bsd socket, if this
+ *                      not a bsd socket the function does nothing.
+ *
+ * @param[in]  on       The boolean value to turn the optimization on and off.
+ *
+ * @return              The old boolean value.
+ *
+ * @see tdgram_recvfrom_send()
+ */
+bool tdgram_bsd_optimize_recvfrom(struct tdgram_context *dgram,
+				  bool on);
+
 #ifdef DOXYGEN
 /**
  * @brief Create a tdgram_context for a ipv4 or ipv6 UDP communication.
@@ -689,6 +710,27 @@
 #endif
 
 /**
+ * @brief Request a syscall optimization for tstream_readv_send()
+ *
+ * This function is only used to reduce the amount of syscalls and
+ * optimize performance. You should only use this if you know
+ * what you're doing.
+ *
+ * The optimization is off by default.
+ *
+ * @param[in]  stream   The tstream_context of a bsd socket, if this
+ *                      not a bsd socket the function does nothing.
+ *
+ * @param[in]  on       The boolean value to turn the optimization on and off.
+ *
+ * @return              The old boolean value.
+ *
+ * @see tstream_readv_send()
+ */
+bool tstream_bsd_optimize_readv(struct tstream_context *stream,
+				bool on);
+
+/**
  * @brief Connect async to a TCP endpoint and create a tstream_context for the
  * stream based communication.
  *

Modified: branches/samba/upstream/lib/tsocket/tsocket_bsd.c
===================================================================
--- branches/samba/upstream/lib/tsocket/tsocket_bsd.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/tsocket/tsocket_bsd.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -654,6 +654,7 @@
 
 	void *event_ptr;
 	struct tevent_fd *fde;
+	bool optimize_recvfrom;
 
 	void *readable_private;
 	void (*readable_handler)(void *private_data);
@@ -661,6 +662,25 @@
 	void (*writeable_handler)(void *private_data);
 };
 
+bool tdgram_bsd_optimize_recvfrom(struct tdgram_context *dgram,
+				  bool on)
+{
+	struct tdgram_bsd *bsds =
+		talloc_get_type(_tdgram_context_data(dgram),
+		struct tdgram_bsd);
+	bool old;
+
+	if (bsds == NULL) {
+		/* not a bsd socket */
+		return false;
+	}
+
+	old = bsds->optimize_recvfrom;
+	bsds->optimize_recvfrom = on;
+
+	return old;
+}
+
 static void tdgram_bsd_fde_handler(struct tevent_context *ev,
 				   struct tevent_fd *fde,
 				   uint16_t flags,
@@ -837,14 +857,25 @@
 		goto post;
 	}
 
+
 	/*
 	 * this is a fast path, not waiting for the
 	 * socket to become explicit readable gains
 	 * about 10%-20% performance in benchmark tests.
 	 */
-	tdgram_bsd_recvfrom_handler(req);
-	if (!tevent_req_is_in_progress(req)) {
-		goto post;
+	if (bsds->optimize_recvfrom) {
+		/*
+		 * We only do the optimization on
+		 * recvfrom if the caller asked for it.
+		 *
+		 * This is needed because in most cases
+		 * we preferr to flush send buffers before
+		 * receiving incoming requests.
+		 */
+		tdgram_bsd_recvfrom_handler(req);
+		if (!tevent_req_is_in_progress(req)) {
+			goto post;
+		}
 	}
 
 	ret = tdgram_bsd_set_readable_handler(bsds, ev,
@@ -1400,6 +1431,7 @@
 
 	void *event_ptr;
 	struct tevent_fd *fde;
+	bool optimize_readv;
 
 	void *readable_private;
 	void (*readable_handler)(void *private_data);
@@ -1407,6 +1439,25 @@
 	void (*writeable_handler)(void *private_data);
 };
 
+bool tstream_bsd_optimize_readv(struct tstream_context *stream,
+				bool on)
+{
+	struct tstream_bsd *bsds =
+		talloc_get_type(_tstream_context_data(stream),
+		struct tstream_bsd);
+	bool old;
+
+	if (bsds == NULL) {
+		/* not a bsd socket */
+		return false;
+	}
+
+	old = bsds->optimize_readv;
+	bsds->optimize_readv = on;
+
+	return old;
+}
+
 static void tstream_bsd_fde_handler(struct tevent_context *ev,
 				    struct tevent_fd *fde,
 				    uint16_t flags,
@@ -1619,9 +1670,19 @@
 	 * socket to become explicit readable gains
 	 * about 10%-20% performance in benchmark tests.
 	 */
-	tstream_bsd_readv_handler(req);
-	if (!tevent_req_is_in_progress(req)) {
-		goto post;
+	if (bsds->optimize_readv) {
+		/*
+		 * We only do the optimization on
+		 * readv if the caller asked for it.
+		 *
+		 * This is needed because in most cases
+		 * we preferr to flush send buffers before
+		 * receiving incoming requests.
+		 */
+		tstream_bsd_readv_handler(req);
+		if (!tevent_req_is_in_progress(req)) {
+			goto post;
+		}
 	}
 
 	ret = tstream_bsd_set_readable_handler(bsds, ev,

Modified: branches/samba/upstream/lib/tsocket/tsocket_helpers.c
===================================================================
--- branches/samba/upstream/lib/tsocket/tsocket_helpers.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/lib/tsocket/tsocket_helpers.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -212,7 +212,21 @@
 	size_t to_read = 0;
 	size_t i;
 	struct tevent_req *subreq;
+	bool optimize = false;
+	bool save_optimize = false;
 
+	if (state->count > 0) {
+		/*
+		 * This is not the first time we asked for a vector,
+		 * which means parts of the pdu already arrived.
+		 *
+		 * In this case it make sense to enable
+		 * a syscall/performance optimization if the
+		 * low level tstream implementation supports it.
+		 */
+		optimize = true;
+	}
+
 	TALLOC_FREE(state->vector);
 	state->count = 0;
 
@@ -255,11 +269,26 @@
 		return;
 	}
 
+	if (optimize) {
+		/*
+		 * If the low level stream is a bsd socket
+		 * we will get syscall optimization.
+		 *
+		 * If it is not a bsd socket
+		 * tstream_bsd_optimize_readv() just returns.
+		 */
+		save_optimize = tstream_bsd_optimize_readv(state->caller.stream,
+							   true);
+	}
 	subreq = tstream_readv_send(state,
 				    state->caller.ev,
 				    state->caller.stream,
 				    state->vector,
 				    state->count);
+	if (optimize) {
+		tstream_bsd_optimize_readv(state->caller.stream,
+					   save_optimize);
+	}
 	if (tevent_req_nomem(subreq, req)) {
 		return;
 	}

Modified: branches/samba/upstream/nsswitch/pam_winbind.c
===================================================================
--- branches/samba/upstream/nsswitch/pam_winbind.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/nsswitch/pam_winbind.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2735,10 +2735,11 @@
 		_pam_free_data_info3(pamh);
 	}
 
-	_PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
+	if (ctx != NULL) {
+		_PAM_LOG_FUNCTION_LEAVE("pam_sm_authenticate", ctx, retval);
+		TALLOC_FREE(ctx);
+	}
 
-	TALLOC_FREE(ctx);
-
 	return retval;
 }
 

Modified: branches/samba/upstream/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/packaging/RHEL/makerpms.sh	2012-12-12 21:11:47 UTC (rev 4179)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.9'
+VERSION='3.6.10'
 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-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/packaging/RHEL/samba.spec	2012-12-12 21:11:47 UTC (rev 4179)
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.9
+Version:      3.6.10
 Release:      1
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2012-12-12 21:11:47 UTC (rev 4179)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.9
+Version:      3.6.10
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/source3/VERSION
===================================================================
--- branches/samba/upstream/source3/VERSION	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/VERSION	2012-12-12 21:11:47 UTC (rev 4179)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=9
+SAMBA_VERSION_RELEASE=10
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: branches/samba/upstream/source3/auth/auth_util.c
===================================================================
--- branches/samba/upstream/source3/auth/auth_util.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/auth/auth_util.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1174,7 +1174,8 @@
 			/* make sure we get the case of the username correct */
 			/* work around 'winbind use default domain = yes' */
 
-			if ( !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
+			if ( lp_winbind_use_default_domain() &&
+			     !strchr_m( pw->pw_name, *lp_winbind_separator() ) ) {
 				char *domain;
 
 				/* split the domain and username into 2 strings */

Modified: branches/samba/upstream/source3/configure
===================================================================
--- branches/samba/upstream/source3/configure	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/configure	2012-12-12 21:11:47 UTC (rev 4179)
@@ -13945,32 +13945,15 @@
 done
 
 
-for ac_header in md5.h
-do :
-  ac_fn_c_check_header_mongrel "$LINENO" "md5.h" "ac_cv_header_md5_h" "$ac_includes_default"
-if test "x$ac_cv_header_md5_h" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_MD5_H 1
-_ACEOF
-
-fi
-
-done
-
-
 samba_cv_md5lib=none
 
-if test x"$ac_cv_header_md5_h" = x"yes"; then
-
-$as_echo "#define HAVE_MD5_H 1" >>confdefs.h
-
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lmd5" >&5
-$as_echo_n "checking for MD5Update in -lmd5... " >&6; }
-if ${ac_cv_lib_md5_MD5Update+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lc" >&5
+$as_echo_n "checking for MD5Update in -lc... " >&6; }
+if ${ac_cv_lib_c_MD5Update+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmd5  $LIBS"
+LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -13990,24 +13973,22 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_md5_MD5Update=yes
+  ac_cv_lib_c_MD5Update=yes
 else
-  ac_cv_lib_md5_MD5Update=no
+  ac_cv_lib_c_MD5Update=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md5_MD5Update" >&5
-$as_echo "$ac_cv_lib_md5_MD5Update" >&6; }
-if test "x$ac_cv_lib_md5_MD5Update" = xyes; then :
-  samba_cv_md5lib=md5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_MD5Update" >&5
+$as_echo "$ac_cv_lib_c_MD5Update" >&6; }
+if test "x$ac_cv_lib_c_MD5Update" = xyes; then :
+  samba_cv_md5lib=""
 fi
 
-fi
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
+if test x"$samba_cv_md5lib" = x"none" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lmd" >&5
 $as_echo_n "checking for MD5Update in -lmd... " >&6; }
 if ${ac_cv_lib_md_MD5Update+:} false; then :
@@ -14050,15 +14031,14 @@
 
 fi
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lc" >&5
-$as_echo_n "checking for MD5Update in -lc... " >&6; }
-if ${ac_cv_lib_c_MD5Update+:} false; then :
+if test x"$samba_cv_md5lib" = x"none" ; then
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5Update in -lmd5" >&5
+$as_echo_n "checking for MD5Update in -lmd5... " >&6; }
+if ${ac_cv_lib_md5_MD5Update+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
+LIBS="-lmd5  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14078,32 +14058,47 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_MD5Update=yes
+  ac_cv_lib_md5_MD5Update=yes
 else
-  ac_cv_lib_c_MD5Update=no
+  ac_cv_lib_md5_MD5Update=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_MD5Update" >&5
-$as_echo "$ac_cv_lib_c_MD5Update" >&6; }
-if test "x$ac_cv_lib_c_MD5Update" = xyes; then :
-  samba_cv_md5lib=""
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_md5_MD5Update" >&5
+$as_echo "$ac_cv_lib_md5_MD5Update" >&6; }
+if test "x$ac_cv_lib_md5_MD5Update" = xyes; then :
+  samba_cv_md5lib=md5
 fi
 
 fi
 
 if test x"$samba_cv_md5lib" != x"none" ; then
+	for ac_header in md5.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "md5.h" "ac_cv_header_md5_h" "$ac_includes_default"
+if test "x$ac_cv_header_md5_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_MD5_H 1
+_ACEOF
+
+fi
+
+done
+
+fi
+
+CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" != x"none" ; then
 	if test x"$samba_cv_md5lib" != x ; then
 		LIBS="${LIBS} -l${samba_cv_md5lib}"
-	fi
-	CRYPTO_MD5_OBJ=
 
 $as_echo "#define HAVE_LIBMD5 1" >>confdefs.h
 
-else
-	CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
+	fi
+	CRYPTO_MD5_OBJ=
 fi
 
 
@@ -30798,6 +30793,69 @@
     found_arcfour_hmac=yes
   fi
 
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCTYPE_AES128_CTS_HMAC_SHA1_96" >&5
+$as_echo_n "checking for ENCTYPE_AES128_CTS_HMAC_SHA1_96... " >&6; }
+if ${samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <krb5.h>
+int
+main ()
+{
+krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes
+else
+  samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" >&5
+$as_echo "$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" >&6; }
+  if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then
+
+$as_echo "#define HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96 1" >>confdefs.h
+
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENCTYPE_AES256_CTS_HMAC_SHA1_96" >&5
+$as_echo_n "checking for ENCTYPE_AES256_CTS_HMAC_SHA1_96... " >&6; }
+if ${samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <krb5.h>
+int
+main ()
+{
+krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes
+else
+  samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" >&5
+$as_echo "$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" >&6; }
+  if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then
+
+$as_echo "#define HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96 1" >>confdefs.h
+
+  fi
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AP_OPTS_USE_SUBKEY" >&5
 $as_echo_n "checking for AP_OPTS_USE_SUBKEY... " >&6; }
 if ${samba_cv_HAVE_AP_OPTS_USE_SUBKEY+:} false; then :

Modified: branches/samba/upstream/source3/configure.in
===================================================================
--- branches/samba/upstream/source3/configure.in	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/configure.in	2012-12-12 21:11:47 UTC (rev 4179)
@@ -752,35 +752,31 @@
 AC_CHECK_HEADERS(linux/falloc.h)
 
 dnl check for OS implementation of md5 conformant to rfc1321
-AC_CHECK_HEADERS(md5.h)
-
 samba_cv_md5lib=none
 
-if test x"$ac_cv_header_md5_h" = x"yes"; then
-	AC_DEFINE(HAVE_MD5_H, 1,
-		[Whether md5.h is available.])
-	AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
-fi
+AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
+if test x"$samba_cv_md5lib" = x"none" ; then
 	AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
 fi
 
-if test x"$ac_cv_header_md5_h" = x"yes" -a \
-        x"$samba_cv_md5lib" = x"none" ; then
-	AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
+if test x"$samba_cv_md5lib" = x"none" ; then
+	AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
 fi
 
 if test x"$samba_cv_md5lib" != x"none" ; then
+	AC_CHECK_HEADERS(md5.h)
+fi
+
+CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
+if test x"$ac_cv_header_md5_h" = x"yes" -a \
+        x"$samba_cv_md5lib" != x"none" ; then
 	if test x"$samba_cv_md5lib" != x ; then
 		LIBS="${LIBS} -l${samba_cv_md5lib}"
+		AC_DEFINE(HAVE_LIBMD5, 1,
+				  [Whether libmd5 conformant to rfc1321 is available.])
 	fi
 	CRYPTO_MD5_OBJ=
-	AC_DEFINE(HAVE_LIBMD5, 1,
-	    [Whether libmd5 conformant to rfc1321 is available.])
-else
-	CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
 fi
 
 AC_SUBST(CRYPTO_MD5_OBJ)
@@ -4156,6 +4152,27 @@
     found_arcfour_hmac=yes
   fi
 
+  AC_CACHE_CHECK([for ENCTYPE_AES128_CTS_HMAC_SHA1_96],
+                 samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,[
+    AC_TRY_COMPILE([#include <krb5.h>],
+      [krb5_enctype enctype; enctype = ENCTYPE_AES128_CTS_HMAC_SHA1_96;],
+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=yes,
+      samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96=no)])
+  if test x"$samba_cv_HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96" = x"yes"; then
+    AC_DEFINE(HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96,1,
+              [Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is available])
+  fi
+  AC_CACHE_CHECK([for ENCTYPE_AES256_CTS_HMAC_SHA1_96],
+                 samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,[
+    AC_TRY_COMPILE([#include <krb5.h>],
+      [krb5_enctype enctype; enctype = ENCTYPE_AES256_CTS_HMAC_SHA1_96;],
+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=yes,
+      samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96=no)])
+  if test x"$samba_cv_HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96" = x"yes"; then
+    AC_DEFINE(HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96,1,
+              [Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is available])
+  fi
+
   AC_CACHE_CHECK([for AP_OPTS_USE_SUBKEY],
                  samba_cv_HAVE_AP_OPTS_USE_SUBKEY,[
     AC_TRY_COMPILE([#include <krb5.h>],

Modified: branches/samba/upstream/source3/include/config.h.in
===================================================================
--- branches/samba/upstream/source3/include/config.h.in	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/include/config.h.in	2012-12-12 21:11:47 UTC (rev 4179)
@@ -456,6 +456,14 @@
 /* Define to 1 if you have the `dup2' function. */
 #undef HAVE_DUP2
 
+/* Whether the ENCTYPE_AES128_CTS_HMAC_SHA1_96 key type definition is
+   available */
+#undef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+
+/* Whether the ENCTYPE_AES256_CTS_HMAC_SHA1_96 key type definition is
+   available */
+#undef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+
 /* Whether the ENCTYPE_ARCFOUR_HMAC key type definition is available */
 #undef HAVE_ENCTYPE_ARCFOUR_HMAC
 
@@ -1419,7 +1427,7 @@
 /* Whether the macro for makedev is available */
 #undef HAVE_MAKEDEV
 
-/* Whether md5.h is available. */
+/* Define to 1 if you have the <md5.h> header file. */
 #undef HAVE_MD5_H
 
 /* Define to 1 if you have the `memalign' function. */

Modified: branches/samba/upstream/source3/include/proto.h
===================================================================
--- branches/samba/upstream/source3/include/proto.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/include/proto.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1970,8 +1970,7 @@
 			enum file_close_type close_type);
 void send_stat_cache_delete_message(struct messaging_context *msg_ctx,
 				    const char *name);
-NTSTATUS can_delete_directory(struct connection_struct *conn,
-				const char *dirname);
+NTSTATUS can_delete_directory_fsp(files_struct *fsp);
 bool change_to_root_user(void);
 struct event_context *smbd_event_context(void);
 void contend_level2_oplocks_begin(files_struct *fsp,

Modified: branches/samba/upstream/source3/include/version.h
===================================================================
--- branches/samba/upstream/source3/include/version.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/include/version.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 9
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.9"
+#define SAMBA_VERSION_RELEASE 10
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.10"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/upstream/source3/lib/dummysmbd.c
===================================================================
--- branches/samba/upstream/source3/lib/dummysmbd.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/lib/dummysmbd.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -44,8 +44,7 @@
 {
 }
 
-NTSTATUS can_delete_directory(struct connection_struct *conn,
-				const char *dirname)
+NTSTATUS can_delete_directory_fsp(files_struct *fsp)
 {
 	return NT_STATUS_OK;
 }

Modified: branches/samba/upstream/source3/lib/util.c
===================================================================
--- branches/samba/upstream/source3/lib/util.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/lib/util.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -383,7 +383,7 @@
 
 void smb_setlen(char *buf,int len)
 {
-	_smb_setlen(buf,len);
+	_smb_setlen_large(buf,len);
 
 	SCVAL(buf,4,0xFF);
 	SCVAL(buf,5,'S');

Modified: branches/samba/upstream/source3/libads/kerberos.c
===================================================================
--- branches/samba/upstream/source3/libads/kerberos.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/libads/kerberos.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -850,6 +850,7 @@
 	int fd;
 	char *realm_upper = NULL;
 	bool result = false;
+	char *aes_enctypes = NULL;
 
 	if (!lp_create_krb5_conf()) {
 		return false;
@@ -887,14 +888,33 @@
 		goto done;
 	}
 
+	aes_enctypes = talloc_strdup(fname, "");
+	if (aes_enctypes == NULL) {
+		goto done;
+	}
+
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+	aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes256-cts-hmac-sha1-96 ");
+	if (aes_enctypes == NULL) {
+		goto done;
+	}
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+	aes_enctypes = talloc_asprintf_append(aes_enctypes, "%s", "aes128-cts-hmac-sha1-96");
+	if (aes_enctypes == NULL) {
+		goto done;
+	}
+#endif
+
 	file_contents = talloc_asprintf(fname,
 					"[libdefaults]\n\tdefault_realm = %s\n"
-					"\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
-					"\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
-					"\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+					"\tdefault_tgs_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+					"\tdefault_tkt_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+					"\tpreferred_enctypes = %s RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
 					"[realms]\n\t%s = {\n"
 					"\t%s\t}\n",
-					realm_upper, realm_upper, kdc_ip_string);
+					realm_upper, aes_enctypes, aes_enctypes, aes_enctypes,
+					realm_upper, kdc_ip_string);
 
 	if (!file_contents) {
 		goto done;

Modified: branches/samba/upstream/source3/libads/kerberos_keytab.c
===================================================================
--- branches/samba/upstream/source3/libads/kerberos_keytab.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/libads/kerberos_keytab.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -261,9 +261,15 @@
 	krb5_keytab keytab = NULL;
 	krb5_data password;
 	krb5_kvno kvno;
-        krb5_enctype enctypes[4] = {
+        krb5_enctype enctypes[6] = {
 		ENCTYPE_DES_CBC_CRC,
 		ENCTYPE_DES_CBC_MD5,
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+		ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+#endif
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+		ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+#endif
 		ENCTYPE_ARCFOUR_HMAC,
 		0
 	};

Modified: branches/samba/upstream/source3/libads/kerberos_verify.c
===================================================================
--- branches/samba/upstream/source3/libads/kerberos_verify.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/libads/kerberos_verify.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -344,6 +344,12 @@
 	/* Let's make some room for 2 password (old and new)*/
 	krb5_data passwords[2];
 	krb5_enctype enctypes[] = {
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+		ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+		ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+#endif
 		ENCTYPE_ARCFOUR_HMAC,
 		ENCTYPE_DES_CBC_CRC,
 		ENCTYPE_DES_CBC_MD5,

Modified: branches/samba/upstream/source3/libsmb/cliconnect.c
===================================================================
--- branches/samba/upstream/source3/libsmb/cliconnect.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/libsmb/cliconnect.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -94,7 +94,9 @@
 
 static void cli_set_session_key (struct cli_state *cli, const DATA_BLOB session_key) 
 {
-	cli->user_session_key = data_blob(session_key.data, session_key.length);
+	cli->user_session_key = data_blob(NULL, 16);
+	data_blob_clear(&cli->user_session_key);
+	memcpy(cli->user_session_key.data, session_key.data, MIN(session_key.length, 16));
 }
 
 /****************************************************************************

Modified: branches/samba/upstream/source3/libsmb/clikrb5.c
===================================================================
--- branches/samba/upstream/source3/libsmb/clikrb5.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/libsmb/clikrb5.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -865,6 +865,12 @@
 	krb5_ccache ccdef = NULL;
 	krb5_auth_context auth_context = NULL;
 	krb5_enctype enc_types[] = {
+#ifdef HAVE_ENCTYPE_AES256_CTS_HMAC_SHA1_96
+		ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+#endif
+#ifdef HAVE_ENCTYPE_AES128_CTS_HMAC_SHA1_96
+		ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+#endif
 		ENCTYPE_ARCFOUR_HMAC,
 		ENCTYPE_DES_CBC_MD5,
 		ENCTYPE_DES_CBC_CRC,

Modified: branches/samba/upstream/source3/locking/locking.c
===================================================================
--- branches/samba/upstream/source3/locking/locking.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/locking/locking.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1476,8 +1476,7 @@
 			return NT_STATUS_ACCESS_DENIED;
 		}
 
-		return can_delete_directory(fsp->conn,
-					    fsp->fsp_name->base_name);
+		return can_delete_directory_fsp(fsp);
 	}
 
 	return NT_STATUS_OK;

Modified: branches/samba/upstream/source3/modules/vfs_acl_common.c
===================================================================
--- branches/samba/upstream/source3/modules/vfs_acl_common.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/modules/vfs_acl_common.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -646,7 +646,22 @@
 					get_current_nttok(handle->conn),
 					fsp->access_mask,
 					&access_granted);
-		if (!NT_STATUS_IS_OK(status)) {
+		/*
+		 * Check if we need to override ACCESS_DENIED for DELETE_ACCESS.
+		 * Do this if we only failed open on DELETE_ACCESS, and
+		 * we have permission to delete from the parent directory.
+		 */
+		if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) &&
+			(fsp->access_mask & DELETE_ACCESS) &&
+			(access_granted == DELETE_ACCESS) &&
+			can_delete_file_in_directory(handle->conn, smb_fname)) {
+				DEBUG(10,("open_acl_xattr: "
+					"overrode "
+					"DELETE_ACCESS on "
+					"file %s\n",
+					smb_fname_str_dbg(smb_fname)));
+				status = NT_STATUS_OK;
+		} else if (!NT_STATUS_IS_OK(status)) {
 			DEBUG(10,("open_acl_xattr: %s open "
 				"for access 0x%x (0x%x) "
 				"refused with error %s\n",

Modified: branches/samba/upstream/source3/modules/vfs_aio_pthread.c
===================================================================
--- branches/samba/upstream/source3/modules/vfs_aio_pthread.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/modules/vfs_aio_pthread.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -74,6 +74,7 @@
 	struct fd_event *sock_event = NULL;
 	int ret = 0;
 	int num_threads;
+	int fd;
 
 	if (pool) {
 		return true;
@@ -85,9 +86,14 @@
 		errno = ret;
 		return false;
 	}
+
+	fd = pthreadpool_signal_fd(pool);
+
+	set_blocking(fd, false);
+
 	sock_event = tevent_add_fd(server_event_context(),
 				NULL,
-				pthreadpool_signal_fd(pool),
+				fd,
 				TEVENT_FD_READ,
 				aio_pthread_handle_completion,
 				NULL);
@@ -290,25 +296,43 @@
 		return;
 	}
 
-	ret = pthreadpool_finished_job(pool, &jobid);
-	if (ret) {
-		smb_panic("aio_pthread_handle_completion");
-		return;
-	}
+	while (true) {
+		ret = pthreadpool_finished_job(pool, &jobid);
 
-	pd = find_private_data_by_jobid(jobid);
-	if (pd == NULL) {
-		DEBUG(1, ("aio_pthread_handle_completion cannot find jobid %d\n",
-			  jobid));
-		return;
-	}
+		if (ret == EINTR || ret == EAGAIN) {
+			return;
+		}
+#ifdef EWOULDBLOCK
+		if (ret == EWOULDBLOCK) {
+			return;
+		}
+#endif
 
-	aio_ex = (struct aio_extra *)pd->aiocb->aio_sigevent.sigev_value.sival_ptr;
-	smbd_aio_complete_aio_ex(aio_ex);
+		if (ret == ECANCELED) {
+			return;
+		}
 
-	DEBUG(10,("aio_pthread_handle_completion: jobid %d completed\n",
-		jobid ));
-	TALLOC_FREE(aio_ex);
+		if (ret) {
+			smb_panic("aio_pthread_handle_completion");
+			return;
+		}
+
+		pd = find_private_data_by_jobid(jobid);
+		if (pd == NULL) {
+			DEBUG(1, ("aio_pthread_handle_completion cannot find "
+				  "jobid %d\n", jobid));
+			return;
+		}
+
+		aio_ex = (struct aio_extra *)
+			pd->aiocb->aio_sigevent.sigev_value.sival_ptr;
+
+		smbd_aio_complete_aio_ex(aio_ex);
+
+		DEBUG(10,("aio_pthread_handle_completion: jobid %d "
+			  "completed\n", jobid ));
+		TALLOC_FREE(aio_ex);
+	}
 }
 
 /************************************************************************

Modified: branches/samba/upstream/source3/rpc_client/cli_lsarpc.c
===================================================================
--- branches/samba/upstream/source3/rpc_client/cli_lsarpc.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/rpc_client/cli_lsarpc.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -330,16 +330,16 @@
  * at 20480 for win2k3, but we keep it at a save 1000 for now. */
 #define LOOKUP_SIDS_HUNK_SIZE 1000
 
-static NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
-					       TALLOC_CTX *mem_ctx,
-					       struct policy_handle *pol,
-					       int num_sids,
-					       const struct dom_sid *sids,
-					       char ***pdomains,
-					       char ***pnames,
-					       enum lsa_SidType **ptypes,
-					       bool use_lookupsids3,
-					       NTSTATUS *presult)
+NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
+					TALLOC_CTX *mem_ctx,
+					struct policy_handle *pol,
+					int num_sids,
+					const struct dom_sid *sids,
+					char ***pdomains,
+					char ***pnames,
+					enum lsa_SidType **ptypes,
+					bool use_lookupsids3,
+					NTSTATUS *presult)
 {
 	NTSTATUS status = NT_STATUS_OK;
 	NTSTATUS result = NT_STATUS_OK;
@@ -539,48 +539,19 @@
 					      result);
 }
 
-NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *pol,
-				 int num_sids,
-				 const struct dom_sid *sids,
-				 char ***pdomains,
-				 char ***pnames,
-				 enum lsa_SidType **ptypes)
-{
-	NTSTATUS status;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-	status = dcerpc_lsa_lookup_sids_generic(cli->binding_handle,
-						mem_ctx,
-						pol,
-						num_sids,
-						sids,
-						pdomains,
-						pnames,
-						ptypes,
-						true,
-						&result);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	return result;
-}
-
 /** Lookup a list of names */
 
-static NTSTATUS dcerpc_lsa_lookup_names_generic(struct dcerpc_binding_handle *h,
-						TALLOC_CTX *mem_ctx,
-						struct policy_handle *pol,
-						uint32_t num_names,
-						const char **names,
-						const char ***dom_names,
-						enum lsa_LookupNamesLevel level,
-						struct dom_sid **sids,
-						enum lsa_SidType **types,
-						bool use_lookupnames4,
-						NTSTATUS *presult)
+NTSTATUS dcerpc_lsa_lookup_names_generic(struct dcerpc_binding_handle *h,
+					 TALLOC_CTX *mem_ctx,
+					 struct policy_handle *pol,
+					 uint32_t num_names,
+					 const char **names,
+					 const char ***dom_names,
+					 enum lsa_LookupNamesLevel level,
+					 struct dom_sid **sids,
+					 enum lsa_SidType **types,
+					 bool use_lookupnames4,
+					 NTSTATUS *presult)
 {
 	NTSTATUS status;
 	struct lsa_String *lsa_names = NULL;
@@ -790,33 +761,3 @@
 					       true,
 					       result);
 }
-
-NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *pol,
-				  int num_names,
-				  const char **names,
-				  const char ***dom_names,
-				  int level,
-				  struct dom_sid **sids,
-				  enum lsa_SidType **types)
-{
-	NTSTATUS status;
-	NTSTATUS result = NT_STATUS_UNSUCCESSFUL;
-
-	status = dcerpc_lsa_lookup_names4(cli->binding_handle,
-					  mem_ctx,
-					  pol,
-					  num_names,
-					  names,
-					  dom_names,
-					  level,
-					  sids,
-					  types,
-					  &result);
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	return result;
-}

Modified: branches/samba/upstream/source3/rpc_client/cli_lsarpc.h
===================================================================
--- branches/samba/upstream/source3/rpc_client/cli_lsarpc.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/rpc_client/cli_lsarpc.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -125,7 +125,16 @@
 				char ***pdomains,
 				char ***pnames,
 				enum lsa_SidType **ptypes);
-
+NTSTATUS dcerpc_lsa_lookup_sids_generic(struct dcerpc_binding_handle *h,
+					TALLOC_CTX *mem_ctx,
+					struct policy_handle *pol,
+					int num_sids,
+					const struct dom_sid *sids,
+					char ***pdomains,
+					char ***pnames,
+					enum lsa_SidType **ptypes,
+					bool use_lookupsids3,
+					NTSTATUS *presult);
 /**
  * @brief Look up the names that correspond to an array of sids.
  *
@@ -158,15 +167,6 @@
 				 char ***pnames,
 				 enum lsa_SidType **ptypes,
 				 NTSTATUS *result);
-NTSTATUS rpccli_lsa_lookup_sids3(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx,
-				 struct policy_handle *pol,
-				 int num_sids,
-				 const struct dom_sid *sids,
-				 char ***pdomains,
-				 char ***pnames,
-				 enum lsa_SidType **ptypes);
-
 NTSTATUS dcerpc_lsa_lookup_names(struct dcerpc_binding_handle *h,
 				 TALLOC_CTX *mem_ctx,
 				 struct policy_handle *pol,
@@ -196,14 +196,17 @@
 				  struct dom_sid **sids,
 				  enum lsa_SidType **types,
 				  NTSTATUS *result);
-NTSTATUS rpccli_lsa_lookup_names4(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx,
-				  struct policy_handle *pol, int num_names,
-				  const char **names,
-				  const char ***dom_names,
-				  int level,
-				  struct dom_sid **sids,
-				  enum lsa_SidType **types);
+NTSTATUS dcerpc_lsa_lookup_names_generic(struct dcerpc_binding_handle *h,
+					 TALLOC_CTX *mem_ctx,
+					 struct policy_handle *pol,
+					 uint32_t num_names,
+					 const char **names,
+					 const char ***dom_names,
+					 enum lsa_LookupNamesLevel level,
+					 struct dom_sid **sids,
+					 enum lsa_SidType **types,
+					 bool use_lookupnames4,
+					 NTSTATUS *presult);
 
 bool fetch_domain_sid( char *domain, char *remote_machine, struct dom_sid *psid);
 

Modified: branches/samba/upstream/source3/rpc_client/cli_pipe.c
===================================================================
--- branches/samba/upstream/source3/rpc_client/cli_pipe.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/rpc_client/cli_pipe.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -2450,7 +2450,7 @@
 	result->max_xmit_frag = RPC_MAX_PDU_FRAG_LEN;
 	result->max_recv_frag = RPC_MAX_PDU_FRAG_LEN;
 
-	if (!resolve_name(host, &addr, 0, false)) {
+	if (!resolve_name(host, &addr, NBT_NAME_SERVER, false)) {
 		status = NT_STATUS_NOT_FOUND;
 		goto fail;
 	}

Modified: branches/samba/upstream/source3/rpc_server/spoolss/srv_spoolss_nt.c
===================================================================
--- branches/samba/upstream/source3/rpc_server/spoolss/srv_spoolss_nt.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/rpc_server/spoolss/srv_spoolss_nt.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1942,24 +1942,12 @@
 	 * save it here in case we get a job submission on this handle
 	 */
 
-	 if ((Printer->printer_type != SPLHND_SERVER) &&
-	     r->in.devmode_ctr.devmode) {
+	 if ((Printer->printer_type != SPLHND_SERVER)
+	  && (r->in.devmode_ctr.devmode != NULL)) {
 		copy_devicemode(NULL, r->in.devmode_ctr.devmode,
 				&Printer->devmode);
 	 }
 
-#if 0	/* JERRY -- I'm doubtful this is really effective */
-	/* HACK ALERT!!! Sleep for 1/3 of a second to try trigger a LAN/WAN
-	   optimization in Windows 2000 clients  --jerry */
-
-	if ( (r->in.access_mask == PRINTER_ACCESS_ADMINISTER)
-		&& (RA_WIN2K == get_remote_arch()) )
-	{
-		DEBUG(10,("_spoolss_OpenPrinterEx: Enabling LAN/WAN hack for Win2k clients.\n"));
-		sys_usleep( 500000 );
-	}
-#endif
-
 	return WERR_OK;
 }
 
@@ -4037,8 +4025,22 @@
 	r->cjobs		= count;
 	r->averageppm		= info2->averageppm;
 
-	copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-	if (!r->devmode) {
+	if (info2->devmode != NULL) {
+		result = copy_devicemode(mem_ctx,
+					 info2->devmode,
+					 &r->devmode);
+		if (!W_ERROR_IS_OK(result)) {
+			return result;
+		}
+	} else if (lp_default_devmode(snum)) {
+		result = spoolss_create_default_devmode(mem_ctx,
+							info2->printername,
+							&r->devmode);
+		if (!W_ERROR_IS_OK(result)) {
+			return result;
+		}
+	} else {
+		r->devmode = NULL;
 		DEBUG(8,("Returning NULL Devicemode!\n"));
 	}
 
@@ -4218,8 +4220,22 @@
 		return result;
 	}
 
-	copy_devicemode(mem_ctx, info2->devmode, &r->devmode);
-	if (!r->devmode) {
+	if (info2->devmode != NULL) {
+		result = copy_devicemode(mem_ctx,
+					 info2->devmode,
+					 &r->devmode);
+		if (!W_ERROR_IS_OK(result)) {
+			return result;
+		}
+	} else if (lp_default_devmode(snum)) {
+		result = spoolss_create_default_devmode(mem_ctx,
+							info2->printername,
+							&r->devmode);
+		if (!W_ERROR_IS_OK(result)) {
+			return result;
+		}
+	} else {
+		r->devmode = NULL;
 		DEBUG(8,("Returning NULL Devicemode!\n"));
 	}
 

Modified: branches/samba/upstream/source3/smbd/dir.c
===================================================================
--- branches/samba/upstream/source3/smbd/dir.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/smbd/dir.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1643,16 +1643,19 @@
  Is this directory empty ?
 *****************************************************************/
 
-NTSTATUS can_delete_directory(struct connection_struct *conn,
-				const char *dirname)
+NTSTATUS can_delete_directory_fsp(files_struct *fsp)
 {
 	NTSTATUS status = NT_STATUS_OK;
 	long dirpos = 0;
 	const char *dname = NULL;
 	char *talloced = NULL;
 	SMB_STRUCT_STAT st;
-	struct smb_Dir *dir_hnd = OpenDir(talloc_tos(), conn,
-					dirname, NULL, 0);
+	struct connection_struct *conn = fsp->conn;
+	struct smb_Dir *dir_hnd = OpenDir_fsp(talloc_tos(),
+					conn,
+					fsp,
+					NULL,
+					0);
 
 	if (!dir_hnd) {
 		return map_nt_error_from_unix(errno);
@@ -1667,12 +1670,12 @@
 			}
 		}
 
-		if (!is_visible_file(conn, dirname, dname, &st, True)) {
+		if (!is_visible_file(conn, fsp->fsp_name->base_name, dname, &st, True)) {
 			TALLOC_FREE(talloced);
 			continue;
 		}
 
-		DEBUG(10,("can_delete_directory: got name %s - can't delete\n",
+		DEBUG(10,("can_delete_directory_fsp: got name %s - can't delete\n",
 			 dname ));
 		status = NT_STATUS_DIRECTORY_NOT_EMPTY;
 		break;

Modified: branches/samba/upstream/source3/smbd/open.c
===================================================================
--- branches/samba/upstream/source3/smbd/open.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/smbd/open.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -58,6 +58,13 @@
 		return NT_STATUS_OK;
 	}
 
+	/*
+	 * If we can access the path to this file, by
+	 * default we have FILE_READ_ATTRIBUTES from the
+	 * containing directory. See the section:
+	 * "Algorithm to Check Access to an Existing File"
+	 * in MS-FSA.pdf.
+	 */
 	return se_access_check(sd,
 				token,
 				(access_desired & ~FILE_READ_ATTRIBUTES),
@@ -1416,7 +1423,14 @@
 				}
 			}
 
-			access_mask = access_granted;
+			/*
+			 * If we can access the path to this file, by
+			 * default we have FILE_READ_ATTRIBUTES from the
+			 * containing directory. See the section.
+			 * "Algorithm to Check Access to an Existing File"
+			 * in MS-FSA.pdf.
+			 */
+			access_mask = access_granted | FILE_READ_ATTRIBUTES;
 		} else {
 			access_mask = FILE_GENERIC_ALL;
 		}
@@ -2752,8 +2766,8 @@
 
 	mtimespec = smb_dname->st.st_ex_mtime;
 
-	/* Temporary access mask used to open the directory fd. */
-	fsp->access_mask = FILE_READ_DATA | FILE_READ_ATTRIBUTES;
+	fsp->access_mask = access_mask;
+
 #ifdef O_DIRECTORY
 	status = fd_open(conn, fsp, O_RDONLY|O_DIRECTORY, 0);
 #else

Modified: branches/samba/upstream/source3/smbd/posix_acls.c
===================================================================
--- branches/samba/upstream/source3/smbd/posix_acls.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/smbd/posix_acls.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1372,7 +1372,11 @@
 	for (pace = *pp_ace; pace; pace = pace->next) {
 		if (pace->type == SMB_ACL_USER_OBJ) {
 
-			if (setting_acl && !is_default_acl) {
+			if (setting_acl) {
+				/*
+				 * Ensure we have default parameters for the
+				 * user (owner) even on default ACLs.
+				 */
 				apply_default_perms(params, is_directory, pace, S_IRUSR);
 			}
 			got_user = True;
@@ -1452,9 +1456,11 @@
 					pace->perms = pace_other->perms;
 			}
 
-			if (!is_default_acl) {
-				apply_default_perms(params, is_directory, pace, S_IRUSR);
-			}
+			/*
+			 * Ensure we have default parameters for the
+			 * user (owner) even on default ACLs.
+			 */
+			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);
 		}

Modified: branches/samba/upstream/source3/smbd/process.c
===================================================================
--- branches/samba/upstream/source3/smbd/process.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/smbd/process.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -151,7 +151,7 @@
 		}
 	}
 
-	len = smb_len(buf_out) + 4;
+	len = smb_len_large(buf_out) + 4;
 
 	ret = write_data(sconn->sock, buf_out+nwritten, len - nwritten);
 	if (ret <= 0) {
@@ -2030,7 +2030,8 @@
 		 * example).
 		 */
 		req->chain_outbuf = TALLOC_REALLOC_ARRAY(
-			req, req->outbuf, uint8_t, smb_len(req->outbuf) + 4);
+			req, req->outbuf, uint8_t,
+			smb_len_large(req->outbuf) + 4);
 		if (req->chain_outbuf == NULL) {
 			smb_panic("talloc failed");
 		}

Modified: branches/samba/upstream/source3/smbd/trans2.c
===================================================================
--- branches/samba/upstream/source3/smbd/trans2.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/smbd/trans2.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -4062,7 +4062,7 @@
 	unsigned int i;
 	unsigned int ofs = 0;
 
-	for (i = 0; i < num_streams && ofs <= max_data_bytes; i++) {
+	for (i = 0; i < num_streams; i++) {
 		unsigned int next_offset;
 		size_t namelen;
 		smb_ucs2_t *namebuf;
@@ -4081,6 +4081,16 @@
 
 		namelen -= 2;
 
+		/*
+		 * We cannot overflow ...
+		 */
+		if ((ofs + 24 + namelen) > max_data_bytes) {
+			DEBUG(10, ("refusing to overflow reply at stream %u\n",
+				i));
+			TALLOC_FREE(namebuf);
+			return STATUS_BUFFER_OVERFLOW;
+		}
+
 		SIVAL(data, ofs+4, namelen);
 		SOFF_T(data, ofs+8, streams[i].size);
 		SOFF_T(data, ofs+16, streams[i].alloc_size);
@@ -4095,6 +4105,14 @@
 		else {
 			unsigned int align = ndr_align_size(next_offset, 8);
 
+			if ((next_offset + align) > max_data_bytes) {
+				DEBUG(10, ("refusing to overflow align "
+					"reply at stream %u\n",
+					i));
+				TALLOC_FREE(namebuf);
+				return STATUS_BUFFER_OVERFLOW;
+			}
+
 			memset(data+next_offset, 0, align);
 			next_offset += align;
 
@@ -4105,6 +4123,8 @@
 		ofs = next_offset;
 	}
 
+	DEBUG(10, ("max_data: %u, data_size: %u\n", max_data_bytes, ofs));
+
 	*data_size = ofs;
 
 	return NT_STATUS_OK;
@@ -4694,6 +4714,7 @@
 			if (!NT_STATUS_IS_OK(status)) {
 				DEBUG(10, ("marshall_stream_info failed: %s\n",
 					   nt_errstr(status)));
+				TALLOC_FREE(streams);
 				return status;
 			}
 

Modified: branches/samba/upstream/source3/utils/net_ads.c
===================================================================
--- branches/samba/upstream/source3/utils/net_ads.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/utils/net_ads.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -37,6 +37,7 @@
 #include "krb5_env.h"
 #include "../libcli/security/security.h"
 #include "libsmb/libsmb.h"
+#include "utils/net_dns.h"
 
 #ifdef HAVE_ADS
 
@@ -1123,12 +1124,9 @@
 
 #if defined(WITH_DNS_UPDATES)
 #include "../lib/addns/dns.h"
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-		      const char *pszDomainName, const char *pszHostName,
-		      const struct sockaddr_storage *sslist,
-		      size_t num_addrs );
 
-static NTSTATUS net_update_dns_internal(TALLOC_CTX *ctx, ADS_STRUCT *ads,
+static NTSTATUS net_update_dns_internal(struct net_context *c,
+					TALLOC_CTX *ctx, ADS_STRUCT *ads,
 					const char *machine_name,
 					const struct sockaddr_storage *addrs,
 					int num_addrs)
@@ -1190,7 +1188,7 @@
 		status = ads_dns_lookup_ns( ctx, root_domain, &nameservers, &ns_count );
 
 		if ( !NT_STATUS_IS_OK(status) || (ns_count == 0)) {
-			DEBUG(3,("net_ads_join: Failed to find name server for the %s "
+			DEBUG(3,("net_update_dns_internal: Failed to find name server for the %s "
 			 "realm\n", ads->config.realm));
 			goto done;
 		}
@@ -1201,12 +1199,25 @@
 
 	for (i=0; i < ns_count; i++) {
 
+		uint32_t flags = DNS_UPDATE_SIGNED |
+				 DNS_UPDATE_UNSIGNED |
+				 DNS_UPDATE_UNSIGNED_SUFFICIENT |
+				 DNS_UPDATE_PROBE |
+				 DNS_UPDATE_PROBE_SUFFICIENT;
+
+		if (c->opt_force) {
+			flags &= ~DNS_UPDATE_PROBE_SUFFICIENT;
+			flags &= ~DNS_UPDATE_UNSIGNED_SUFFICIENT;
+		}
+
+		status = NT_STATUS_UNSUCCESSFUL;
+
 		/* Now perform the dns update - we'll try non-secure and if we fail,
 		   we'll follow it up with a secure update */
 
 		fstrcpy( dns_server, nameservers[i].hostname );
 
-		dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs);
+		dns_err = DoDNSUpdate(dns_server, dnsdomain, machine_name, addrs, num_addrs, flags);
 		if (ERR_DNS_IS_OK(dns_err)) {
 			status = NT_STATUS_OK;
 			goto done;
@@ -1233,7 +1244,8 @@
 	return status;
 }
 
-static NTSTATUS net_update_dns_ext(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
+static NTSTATUS net_update_dns_ext(struct net_context *c,
+				   TALLOC_CTX *mem_ctx, ADS_STRUCT *ads,
 				   const char *hostname,
 				   struct sockaddr_storage *iplist,
 				   int num_addrs)
@@ -1263,18 +1275,18 @@
 		iplist = iplist_alloc;
 	}
 
-	status = net_update_dns_internal(mem_ctx, ads, machine_name,
+	status = net_update_dns_internal(c, mem_ctx, ads, machine_name,
 					 iplist, num_addrs);
 
 	SAFE_FREE(iplist_alloc);
 	return status;
 }
 
-static NTSTATUS net_update_dns(TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
+static NTSTATUS net_update_dns(struct net_context *c, TALLOC_CTX *mem_ctx, ADS_STRUCT *ads, const char *hostname)
 {
 	NTSTATUS status;
 
-	status = net_update_dns_ext(mem_ctx, ads, hostname, NULL, 0);
+	status = net_update_dns_ext(c, mem_ctx, ads, hostname, NULL, 0);
 	return status;
 }
 #endif
@@ -1436,7 +1448,7 @@
 	d_printf(_("Using short domain name -- %s\n"), r->out.netbios_domain_name);
 
 	if (r->out.dns_domain_name) {
-		d_printf(_("Joined '%s' to realm '%s'\n"), r->in.machine_name,
+		d_printf(_("Joined '%s' to dns domain '%s'\n"), r->in.machine_name,
 			r->out.dns_domain_name);
 	} else {
 		d_printf(_("Joined '%s' to domain '%s'\n"), r->in.machine_name,
@@ -1479,7 +1491,7 @@
 			ads_kinit_password( ads_dns );
 		}
 
-		if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns( ctx, ads_dns, NULL)) ) {
+		if ( !ads_dns || !NT_STATUS_IS_OK(net_update_dns(c, ctx, ads_dns, NULL)) ) {
 			d_fprintf( stderr, _("DNS update failed!\n") );
 		}
 
@@ -1584,7 +1596,7 @@
 		return -1;
 	}
 
-	ntstatus = net_update_dns_ext(ctx, ads, hostname, addrs, num_addrs);
+	ntstatus = net_update_dns_ext(c, ctx, ads, hostname, addrs, num_addrs);
 	if (!NT_STATUS_IS_OK(ntstatus)) {
 		d_fprintf( stderr, _("DNS update failed!\n") );
 		ads_destroy( &ads );
@@ -1605,10 +1617,6 @@
 #endif
 }
 
-#if defined(WITH_DNS_UPDATES)
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-#endif
-
 static int net_ads_dns_gethostbyname(struct net_context *c, int argc, const char **argv)
 {
 #if defined(WITH_DNS_UPDATES)

Modified: branches/samba/upstream/source3/utils/net_dns.c
===================================================================
--- branches/samba/upstream/source3/utils/net_dns.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/utils/net_dns.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -22,23 +22,17 @@
 #include "includes.h"
 #include "utils/net.h"
 #include "../lib/addns/dns.h"
+#include "utils/net_dns.h"
 
 #if defined(WITH_DNS_UPDATES)
-/*
- * Silly prototype to get rid of a warning
- */
 
-DNS_ERROR DoDNSUpdate(char *pszServerName,
-		      const char *pszDomainName, const char *pszHostName,
-		      const struct sockaddr_storage *sslist,
-		      size_t num_addrs );
-
 /*********************************************************************
 *********************************************************************/
 
 DNS_ERROR DoDNSUpdate(char *pszServerName,
 		      const char *pszDomainName, const char *pszHostName,
-		      const struct sockaddr_storage *sslist, size_t num_addrs )
+		      const struct sockaddr_storage *sslist, size_t num_addrs,
+		      uint32_t flags)
 {
 	DNS_ERROR err;
 	struct dns_connection *conn;
@@ -46,6 +40,14 @@
 	OM_uint32 minor;
 	struct dns_update_request *req, *resp;
 
+	DEBUG(10,("DoDNSUpdate called with flags: 0x%08x\n", flags));
+
+	if (!(flags & DNS_UPDATE_SIGNED) &&
+	    !(flags & DNS_UPDATE_UNSIGNED) &&
+	    !(flags & DNS_UPDATE_PROBE)) {
+		return ERROR_DNS_INVALID_PARAMETER;
+	}
+
 	if ( (num_addrs <= 0) || !sslist ) {
 		return ERROR_DNS_INVALID_PARAMETER;
 	}
@@ -59,45 +61,65 @@
 		goto error;
 	}
 
-	/*
-	 * Probe if everything's fine
-	 */
+	if (flags & DNS_UPDATE_PROBE) {
 
-	err = dns_create_probe(mem_ctx, pszDomainName, pszHostName,
-			       num_addrs, sslist, &req);
-	if (!ERR_DNS_IS_OK(err)) goto error;
+		/*
+		 * Probe if everything's fine
+		 */
 
-	err = dns_update_transaction(mem_ctx, conn, req, &resp);
-	if (!ERR_DNS_IS_OK(err)) goto error;
+		err = dns_create_probe(mem_ctx, pszDomainName, pszHostName,
+				       num_addrs, sslist, &req);
+		if (!ERR_DNS_IS_OK(err)) goto error;
 
-	if (dns_response_code(resp->flags) == DNS_NO_ERROR) {
-		TALLOC_FREE(mem_ctx);
-		return ERROR_DNS_SUCCESS;
+		err = dns_update_transaction(mem_ctx, conn, req, &resp);
+		if (!ERR_DNS_IS_OK(err)) goto error;
+
+		if (!ERR_DNS_IS_OK(err)) {
+			DEBUG(3,("DoDNSUpdate: failed to probe DNS\n"));
+		}
+
+		if ((dns_response_code(resp->flags) == DNS_NO_ERROR) &&
+		    (flags & DNS_UPDATE_PROBE_SUFFICIENT)) {
+			TALLOC_FREE(mem_ctx);
+			return ERROR_DNS_SUCCESS;
+		}
 	}
 
-	/*
-	 * First try without signing
-	 */
+	if (flags & DNS_UPDATE_UNSIGNED) {
 
-	err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
-					sslist, num_addrs, &req);
-	if (!ERR_DNS_IS_OK(err)) goto error;
+		/*
+		 * First try without signing
+		 */
 
-	err = dns_update_transaction(mem_ctx, conn, req, &resp);
-	if (!ERR_DNS_IS_OK(err)) goto error;
+		err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
+						sslist, num_addrs, &req);
+		if (!ERR_DNS_IS_OK(err)) goto error;
 
-	if (dns_response_code(resp->flags) == DNS_NO_ERROR) {
-		TALLOC_FREE(mem_ctx);
-		return ERROR_DNS_SUCCESS;
+		err = dns_update_transaction(mem_ctx, conn, req, &resp);
+		if (!ERR_DNS_IS_OK(err)) goto error;
+
+		if (!ERR_DNS_IS_OK(err)) {
+			DEBUG(3,("DoDNSUpdate: unsigned update failed\n"));
+		}
+
+		if ((dns_response_code(resp->flags) == DNS_NO_ERROR) &&
+		    (flags & DNS_UPDATE_UNSIGNED_SUFFICIENT)) {
+			TALLOC_FREE(mem_ctx);
+			return ERROR_DNS_SUCCESS;
+		}
 	}
 
 	/*
 	 * Okay, we have to try with signing
 	 */
-	{
+	if (flags & DNS_UPDATE_SIGNED) {
 		gss_ctx_id_t gss_context;
 		char *keyname;
 
+		err = dns_create_update_request(mem_ctx, pszDomainName, pszHostName,
+						sslist, num_addrs, &req);
+		if (!ERR_DNS_IS_OK(err)) goto error;
+
 		if (!(keyname = dns_generate_keyname( mem_ctx ))) {
 			err = ERROR_DNS_NO_MEMORY;
 			goto error;
@@ -128,6 +150,10 @@
 
 		err = (dns_response_code(resp->flags) == DNS_NO_ERROR) ?
 			ERROR_DNS_SUCCESS : ERROR_DNS_UPDATE_FAILED;
+
+		if (!ERR_DNS_IS_OK(err)) {
+			DEBUG(3,("DoDNSUpdate: signed update failed\n"));
+		}
 	}
 
 
@@ -177,12 +203,6 @@
 	return count;
 }
 
-/*
- * Silly prototype to get rid of a warning
- */
-
-DNS_ERROR do_gethostbyname(const char *server, const char *host);
-
 DNS_ERROR do_gethostbyname(const char *server, const char *host)
 {
 	struct dns_connection *conn;

Added: branches/samba/upstream/source3/utils/net_dns.h
===================================================================
--- branches/samba/upstream/source3/utils/net_dns.h	                        (rev 0)
+++ branches/samba/upstream/source3/utils/net_dns.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -0,0 +1,43 @@
+/*
+   Samba Unix/Linux Dynamic DNS Update
+   net ads commands
+
+   Copyright (C) Krishna Ganugapati (krishnag at centeris.com)         2006
+   Copyright (C) Gerald Carter                                      2006
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+/* flags for DoDNSUpdate */
+
+#define	DNS_UPDATE_SIGNED		0x01
+#define	DNS_UPDATE_SIGNED_SUFFICIENT	0x02
+#define	DNS_UPDATE_UNSIGNED		0x04
+#define	DNS_UPDATE_UNSIGNED_SUFFICIENT	0x08
+#define	DNS_UPDATE_PROBE		0x10
+#define	DNS_UPDATE_PROBE_SUFFICIENT	0x20
+
+#if defined(WITH_DNS_UPDATES)
+
+#include "../lib/addns/dns.h"
+
+DNS_ERROR DoDNSUpdate(char *pszServerName,
+		      const char *pszDomainName, const char *pszHostName,
+		      const struct sockaddr_storage *sslist,
+		      size_t num_addrs,
+		      uint32_t flags);
+
+DNS_ERROR do_gethostbyname(const char *server, const char *host);
+
+#endif /* defined(WITH_DNS_UPDATES) */

Modified: branches/samba/upstream/source3/winbindd/winbindd_cm.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_cm.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/winbindd/winbindd_cm.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1602,6 +1602,10 @@
 
 		result = cm_prepare_connection(domain, fd, domain->dcname,
 			&new_conn->cli, &retry);
+		if (!NT_STATUS_IS_OK(result)) {
+			/* Don't leak the smb connection socket */
+			close(fd);
+		}
 
 		if (!retry)
 			break;
@@ -2564,6 +2568,37 @@
 }
 
 /****************************************************************************
+Open a LSA connection to a DC, suiteable for LSA lookup calls.
+****************************************************************************/
+
+NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
+			 TALLOC_CTX *mem_ctx,
+			 struct rpc_pipe_client **cli,
+			 struct policy_handle *lsa_policy)
+{
+	NTSTATUS status;
+
+	if (domain->can_do_ncacn_ip_tcp) {
+		status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
+		if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
+		    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR) ||
+		    NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
+			invalidate_cm_connection(&domain->conn);
+			status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
+		}
+		if (!NT_STATUS_IS_OK(status)) {
+			return status;
+		}
+
+		return NT_STATUS_OK;
+	}
+
+	status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);
+
+	return status;
+}
+
+/****************************************************************************
  Open the netlogon pipe to this DC. Use schannel if specified in client conf.
  session key stored in conn->netlogon_pipe->dc->sess_key.
 ****************************************************************************/

Modified: branches/samba/upstream/source3/winbindd/winbindd_msrpc.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_msrpc.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/winbindd/winbindd_msrpc.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -35,6 +35,13 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND
 
+static NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
+				      struct winbindd_domain *domain,
+				      uint32_t num_names,
+				      const char **names,
+				      const char ***domains,
+				      struct dom_sid **sids,
+				      enum lsa_SidType **types);
 
 /* Query display info for a domain.  This returns enough information plus a
    bit extra to give an overview of domain users for the User Manager
@@ -1057,16 +1064,6 @@
 	return status;
 }
 
-typedef NTSTATUS (*lookup_sids_fn_t)(struct dcerpc_binding_handle *h,
-				     TALLOC_CTX *mem_ctx,
-				     struct policy_handle *pol,
-				     int num_sids,
-				     const struct dom_sid *sids,
-				     char ***pdomains,
-				     char ***pnames,
-				     enum lsa_SidType **ptypes,
-				     NTSTATUS *result);
-
 NTSTATUS winbindd_lookup_sids(TALLOC_CTX *mem_ctx,
 			      struct winbindd_domain *domain,
 			      uint32_t num_sids,
@@ -1081,25 +1078,21 @@
 	struct dcerpc_binding_handle *b = NULL;
 	struct policy_handle lsa_policy;
 	unsigned int orig_timeout;
-	lookup_sids_fn_t lookup_sids_fn = dcerpc_lsa_lookup_sids;
+	bool use_lookupsids3 = false;
+	bool retried = false;
 
-	if (domain->can_do_ncacn_ip_tcp) {
-		status = cm_connect_lsa_tcp(domain, mem_ctx, &cli);
-		if (NT_STATUS_IS_OK(status)) {
-			lookup_sids_fn = dcerpc_lsa_lookup_sids3;
-			goto lookup;
-		}
-		domain->can_do_ncacn_ip_tcp = false;
-	}
-	status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
-
+ connect:
+	status = cm_connect_lsat(domain, mem_ctx, &cli, &lsa_policy);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
- lookup:
 	b = cli->binding_handle;
 
+	if (cli->transport->transport == NCACN_IP_TCP) {
+		use_lookupsids3 = true;
+	}
+
 	/*
 	 * This call can take a long time
 	 * allow the server to time out.
@@ -1107,21 +1100,23 @@
 	 */
 	orig_timeout = dcerpc_binding_handle_set_timeout(b, 35000);
 
-	status = lookup_sids_fn(b,
-				mem_ctx,
-				&lsa_policy,
-				num_sids,
-				sids,
-				domains,
-				names,
-				types,
-				&result);
+	status = dcerpc_lsa_lookup_sids_generic(b,
+						mem_ctx,
+						&lsa_policy,
+						num_sids,
+						sids,
+						domains,
+						names,
+						types,
+						use_lookupsids3,
+						&result);
 
 	/* And restore our original timeout. */
 	dcerpc_binding_handle_set_timeout(b, orig_timeout);
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-	    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR)) {
+	    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR) ||
+	    NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
 		/*
 		 * This can happen if the schannel key is not
 		 * valid anymore, we need to invalidate the
@@ -1129,6 +1124,11 @@
 		 * a netlogon connection first.
 		 */
 		invalidate_cm_connection(&domain->conn);
+		domain->can_do_ncacn_ip_tcp = domain->active_directory;
+		if (!retried) {
+			retried = true;
+			goto connect;
+		}
 		status = NT_STATUS_ACCESS_DENIED;
 	}
 
@@ -1143,24 +1143,13 @@
 	return NT_STATUS_OK;
 }
 
-typedef NTSTATUS (*lookup_names_fn_t)(struct dcerpc_binding_handle *h,
-				      TALLOC_CTX *mem_ctx,
-				      struct policy_handle *pol,
+static NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
+				      struct winbindd_domain *domain,
 				      uint32_t num_names,
 				      const char **names,
-				      const char ***dom_names,
-				      enum lsa_LookupNamesLevel level,
+				      const char ***domains,
 				      struct dom_sid **sids,
-				      enum lsa_SidType **types,
-				      NTSTATUS *result);
-
-NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
-			       struct winbindd_domain *domain,
-			       uint32_t num_names,
-			       const char **names,
-			       const char ***domains,
-			       struct dom_sid **sids,
-			       enum lsa_SidType **types)
+				      enum lsa_SidType **types)
 {
 	NTSTATUS status;
 	NTSTATUS result;
@@ -1168,25 +1157,21 @@
 	struct dcerpc_binding_handle *b = NULL;
 	struct policy_handle lsa_policy;
 	unsigned int orig_timeout = 0;
-	lookup_names_fn_t lookup_names_fn = dcerpc_lsa_lookup_names;
+	bool use_lookupnames4 = false;
+	bool retried = false;
 
-	if (domain->can_do_ncacn_ip_tcp) {
-		status = cm_connect_lsa_tcp(domain, mem_ctx, &cli);
-		if (NT_STATUS_IS_OK(status)) {
-			lookup_names_fn = dcerpc_lsa_lookup_names4;
-			goto lookup;
-		}
-		domain->can_do_ncacn_ip_tcp = false;
-	}
-	status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
-
+ connect:
+	status = cm_connect_lsat(domain, mem_ctx, &cli, &lsa_policy);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
- lookup:
 	b = cli->binding_handle;
 
+	if (cli->transport->transport == NCACN_IP_TCP) {
+		use_lookupnames4 = true;
+	}
+
 	/*
 	 * This call can take a long time
 	 * allow the server to time out.
@@ -1194,22 +1179,24 @@
 	 */
 	orig_timeout = dcerpc_binding_handle_set_timeout(b, 35000);
 
-	status = lookup_names_fn(b,
-				 mem_ctx,
-				 &lsa_policy,
-				 num_names,
-				 (const char **) names,
-				 domains,
-				 1,
-				 sids,
-				 types,
-				 &result);
+	status = dcerpc_lsa_lookup_names_generic(b,
+						 mem_ctx,
+						 &lsa_policy,
+						 num_names,
+						 (const char **) names,
+						 domains,
+						 1,
+						 sids,
+						 types,
+						 use_lookupnames4,
+						 &result);
 
 	/* And restore our original timeout. */
 	dcerpc_binding_handle_set_timeout(b, orig_timeout);
 
 	if (NT_STATUS_EQUAL(status, NT_STATUS_ACCESS_DENIED) ||
-	    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR)) {
+	    NT_STATUS_EQUAL(status, NT_STATUS_RPC_SEC_PKG_ERROR) ||
+	    NT_STATUS_EQUAL(status, NT_STATUS_NETWORK_ACCESS_DENIED)) {
 		/*
 		 * This can happen if the schannel key is not
 		 * valid anymore, we need to invalidate the
@@ -1217,6 +1204,10 @@
 		 * a netlogon connection first.
 		 */
 		invalidate_cm_connection(&domain->conn);
+		if (!retried) {
+			retried = true;
+			goto connect;
+		}
 		status = NT_STATUS_ACCESS_DENIED;
 	}
 

Modified: branches/samba/upstream/source3/winbindd/winbindd_pam.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_pam.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/winbindd/winbindd_pam.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1152,6 +1152,7 @@
 					    struct netr_SamInfo3 **info3)
 {
 	int attempts = 0;
+	int netr_attempts = 0;
 	bool retry = false;
 	NTSTATUS result;
 
@@ -1166,22 +1167,47 @@
 		result = cm_connect_netlogon(domain, &netlogon_pipe);
 
 		if (!NT_STATUS_IS_OK(result)) {
-			DEBUG(3,("could not open handle to NETLOGON pipe (error: %s)\n",
-				  nt_errstr(result)));
-			if (NT_STATUS_EQUAL(result, NT_STATUS_IO_TIMEOUT)) {
-				if (attempts > 0) {
-					DEBUG(3, ("This is the second problem for this "
-						"particular call, forcing the close of "
-						"this connection\n"));
-					invalidate_cm_connection(&domain->conn);
-				} else {
-					DEBUG(3, ("First call to cm_connect_netlogon "
-						"has timed out, retrying\n"));
-					continue;
-				}
+			DEBUG(3,("Could not open handle to NETLOGON pipe "
+				 "(error: %s, attempts: %d)\n",
+				  nt_errstr(result), netr_attempts));
+
+			/* After the first retry always close the connection */
+			if (netr_attempts > 0) {
+				DEBUG(3, ("This is again a problem for this "
+					  "particular call, forcing the close "
+					  "of this connection\n"));
+				invalidate_cm_connection(&domain->conn);
 			}
+
+			/* After the second retry failover to the next DC */
+			if (netr_attempts > 1) {
+				/*
+				 * If the netlogon server is not reachable then
+				 * it is possible that the DC is rebuilding
+				 * sysvol and shutdown netlogon for that time.
+				 * We should failover to the next dc.
+				 */
+				DEBUG(3, ("This is the third problem for this "
+					  "particular call, adding DC to the "
+					  "negative cache list\n"));
+				add_failed_connection_entry(domain->name,
+							    domain->dcname,
+							    result);
+				saf_delete(domain->name);
+			}
+
+			/* Only allow 3 retries */
+			if (netr_attempts < 3) {
+				DEBUG(3, ("The connection to netlogon "
+					  "failed, retrying\n"));
+				netr_attempts++;
+				retry = true;
+				continue;
+			}
 			return result;
 		}
+		netr_attempts = 0;
+
 		auth = netlogon_pipe->auth;
 		if (netlogon_pipe->dc) {
 			neg_flags = netlogon_pipe->dc->negotiate_flags;

Modified: branches/samba/upstream/source3/winbindd/winbindd_proto.h
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_proto.h	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/winbindd/winbindd_proto.h	2012-12-12 21:11:47 UTC (rev 4179)
@@ -47,13 +47,6 @@
 			      char ***domains,
 			      char ***names,
 			      enum lsa_SidType **types);
-NTSTATUS winbindd_lookup_names(TALLOC_CTX *mem_ctx,
-			       struct winbindd_domain *domain,
-			       uint32_t num_names,
-			       const char **names,
-			       const char ***domains,
-			       struct dom_sid **sids,
-			       enum lsa_SidType **types);
 NTSTATUS rpc_lookup_sids(TALLOC_CTX *mem_ctx,
 			 struct winbindd_domain *domain,
 			 struct lsa_SidArray *sids,
@@ -170,6 +163,10 @@
 NTSTATUS cm_connect_lsa_tcp(struct winbindd_domain *domain,
 			    TALLOC_CTX *mem_ctx,
 			    struct rpc_pipe_client **cli);
+NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
+			 TALLOC_CTX *mem_ctx,
+			 struct rpc_pipe_client **cli,
+			 struct policy_handle *lsa_policy);
 NTSTATUS cm_connect_netlogon(struct winbindd_domain *domain,
 			     struct rpc_pipe_client **cli);
 bool fetch_current_dc_from_gencache(TALLOC_CTX *mem_ctx,

Modified: branches/samba/upstream/source3/winbindd/winbindd_rpc.c
===================================================================
--- branches/samba/upstream/source3/winbindd/winbindd_rpc.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/winbindd/winbindd_rpc.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -1033,6 +1033,7 @@
 
 static NTSTATUS rpc_try_lookup_sids3(TALLOC_CTX *mem_ctx,
 				     struct winbindd_domain *domain,
+				     struct rpc_pipe_client *cli,
 				     struct lsa_SidArray *sids,
 				     struct lsa_RefDomainList **pdomains,
 				     struct lsa_TransNameArray **pnames)
@@ -1040,15 +1041,8 @@
 	struct lsa_TransNameArray2 lsa_names2;
 	struct lsa_TransNameArray *names;
 	uint32_t i, count;
-	struct rpc_pipe_client *cli;
 	NTSTATUS status, result;
 
-	status = cm_connect_lsa_tcp(domain, talloc_tos(), &cli);
-	if (!NT_STATUS_IS_OK(status)) {
-		domain->can_do_ncacn_ip_tcp = false;
-		return status;
-	}
-
 	ZERO_STRUCT(lsa_names2);
 	status = dcerpc_lsa_LookupSids3(cli->binding_handle,
 					mem_ctx,
@@ -1098,19 +1092,16 @@
 	uint32_t count;
 	NTSTATUS status, result;
 
-	if (domain->can_do_ncacn_ip_tcp) {
-		status = rpc_try_lookup_sids3(mem_ctx, domain, sids,
-					      pdomains, pnames);
-		if (!NT_STATUS_IS_ERR(status)) {
-			return status;
-		}
-	}
-
-	status = cm_connect_lsa(domain, mem_ctx, &cli, &lsa_policy);
+	status = cm_connect_lsat(domain, mem_ctx, &cli, &lsa_policy);
 	if (!NT_STATUS_IS_OK(status)) {
 		return status;
 	}
 
+	if (cli->transport->transport == NCACN_IP_TCP) {
+		return rpc_try_lookup_sids3(mem_ctx, domain, cli, sids,
+					    pdomains, pnames);
+	}
+
 	names = TALLOC_ZERO_P(mem_ctx, struct lsa_TransNameArray);
 	if (names == NULL) {
 		return NT_STATUS_NO_MEMORY;

Modified: branches/samba/upstream/source3/wscript
===================================================================
--- branches/samba/upstream/source3/wscript	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source3/wscript	2012-12-12 21:11:47 UTC (rev 4179)
@@ -661,6 +661,8 @@
         conf.CHECK_VARIABLE('KV5M_KEYTAB', headers='krb5.h')
         conf.CHECK_VARIABLE('KRB5_KU_OTHER_CKSUM', headers='krb5.h')
         conf.CHECK_VARIABLE('KRB5_KEYUSAGE_APP_DATA_CKSUM', headers='krb5.h')
+	conf.CHECK_VARIABLE('ENCTYPE_AES128_CTS_HMAC_SHA1_96', headers='krb5.h')
+	conf.CHECK_VARIABLE('ENCTYPE_AES256_CTS_HMAC_SHA1_96', headers='krb5.h')
         conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'key', headers='krb5.h',
                                     define='HAVE_KRB5_KEYTAB_ENTRY_KEY')
         conf.CHECK_STRUCTURE_MEMBER('krb5_keytab_entry', 'keyblock', headers='krb5.h',

Modified: branches/samba/upstream/source4/torture/smb2/create.c
===================================================================
--- branches/samba/upstream/source4/torture/smb2/create.c	2012-11-01 17:30:22 UTC (rev 4178)
+++ branches/samba/upstream/source4/torture/smb2/create.c	2012-12-12 21:11:47 UTC (rev 4179)
@@ -444,14 +444,103 @@
 	status = smb2_util_close(tree, io.out.file.handle);
 	CHECK_STATUS(status, NT_STATUS_OK);
 
-	torture_comment(tctx, "Testing bad tag length\n");
+	torture_comment(tctx, "Testing bad tag length 0\n");
+	ZERO_STRUCT(io.in.blobs);
 	status = smb2_create_blob_add(tctx, &io.in.blobs,
-				      "xxx", data_blob(NULL, 0));
+				      "x", data_blob(NULL, 0));
 	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
 
+	torture_comment(tctx, "Testing bad tag length 1\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "x", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
 	status = smb2_create(tree, tctx, &io);
 	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
 
+	torture_comment(tctx, "Testing bad tag length 2\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+
+	torture_comment(tctx, "Testing bad tag length 3\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_INVALID_PARAMETER);
+
+	torture_comment(tctx, "Testing tag length 4\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 5\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 6\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 7\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 8\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 16\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxxxxxxxxxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 17\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxxxxxxxxxxxxx", data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
+	torture_comment(tctx, "Testing tag length 34\n");
+	ZERO_STRUCT(io.in.blobs);
+	status = smb2_create_blob_add(tctx, &io.in.blobs,
+				      "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+				      data_blob(NULL, 0));
+	CHECK_STATUS(status, NT_STATUS_OK);
+	status = smb2_create(tree, tctx, &io);
+	CHECK_STATUS(status, NT_STATUS_OK);
+
 	smb2_deltree(tree, FNAME);
 	
 	return true;



