[Pkg-samba-maint] r4198 - in branches/samba/upstream: . docs/manpages docs-xml/manpages-3 lib/replace lib/replace/system lib/tevent lib/util packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/smbd source3/web

Sat Feb 16 17:48:57 UTC 2013

Author: idd-guest
Date: 2013-02-16 17:48:56 +0000 (Sat, 16 Feb 2013)
New Revision: 4198

Modified:
   branches/samba/upstream/WHATSNEW.txt
   branches/samba/upstream/docs-xml/manpages-3/ntlm_auth.1.xml
   branches/samba/upstream/docs/manpages/eventlogadm.8
   branches/samba/upstream/docs/manpages/findsmb.1
   branches/samba/upstream/docs/manpages/idmap_ad.8
   branches/samba/upstream/docs/manpages/idmap_adex.8
   branches/samba/upstream/docs/manpages/idmap_autorid.8
   branches/samba/upstream/docs/manpages/idmap_hash.8
   branches/samba/upstream/docs/manpages/idmap_ldap.8
   branches/samba/upstream/docs/manpages/idmap_nss.8
   branches/samba/upstream/docs/manpages/idmap_rid.8
   branches/samba/upstream/docs/manpages/idmap_tdb.8
   branches/samba/upstream/docs/manpages/idmap_tdb2.8
   branches/samba/upstream/docs/manpages/libsmbclient.7
   branches/samba/upstream/docs/manpages/lmhosts.5
   branches/samba/upstream/docs/manpages/log2pcap.1
   branches/samba/upstream/docs/manpages/net.8
   branches/samba/upstream/docs/manpages/nmbd.8
   branches/samba/upstream/docs/manpages/nmblookup.1
   branches/samba/upstream/docs/manpages/ntlm_auth.1
   branches/samba/upstream/docs/manpages/pam_winbind.8
   branches/samba/upstream/docs/manpages/pam_winbind.conf.5
   branches/samba/upstream/docs/manpages/pdbedit.8
   branches/samba/upstream/docs/manpages/profiles.1
   branches/samba/upstream/docs/manpages/rpcclient.1
   branches/samba/upstream/docs/manpages/samba.7
   branches/samba/upstream/docs/manpages/sharesec.1
   branches/samba/upstream/docs/manpages/smb.conf.5
   branches/samba/upstream/docs/manpages/smbcacls.1
   branches/samba/upstream/docs/manpages/smbclient.1
   branches/samba/upstream/docs/manpages/smbcontrol.1
   branches/samba/upstream/docs/manpages/smbcquotas.1
   branches/samba/upstream/docs/manpages/smbd.8
   branches/samba/upstream/docs/manpages/smbget.1
   branches/samba/upstream/docs/manpages/smbgetrc.5
   branches/samba/upstream/docs/manpages/smbpasswd.5
   branches/samba/upstream/docs/manpages/smbpasswd.8
   branches/samba/upstream/docs/manpages/smbspool.8
   branches/samba/upstream/docs/manpages/smbstatus.1
   branches/samba/upstream/docs/manpages/smbta-util.8
   branches/samba/upstream/docs/manpages/smbtar.1
   branches/samba/upstream/docs/manpages/smbtree.1
   branches/samba/upstream/docs/manpages/swat.8
   branches/samba/upstream/docs/manpages/tdbbackup.8
   branches/samba/upstream/docs/manpages/tdbdump.8
   branches/samba/upstream/docs/manpages/tdbtool.8
   branches/samba/upstream/docs/manpages/testparm.1
   branches/samba/upstream/docs/manpages/vfs_acl_tdb.8
   branches/samba/upstream/docs/manpages/vfs_acl_xattr.8
   branches/samba/upstream/docs/manpages/vfs_aio_fork.8
   branches/samba/upstream/docs/manpages/vfs_aio_pthread.8
   branches/samba/upstream/docs/manpages/vfs_audit.8
   branches/samba/upstream/docs/manpages/vfs_cacheprime.8
   branches/samba/upstream/docs/manpages/vfs_cap.8
   branches/samba/upstream/docs/manpages/vfs_catia.8
   branches/samba/upstream/docs/manpages/vfs_commit.8
   branches/samba/upstream/docs/manpages/vfs_crossrename.8
   branches/samba/upstream/docs/manpages/vfs_default_quota.8
   branches/samba/upstream/docs/manpages/vfs_dirsort.8
   branches/samba/upstream/docs/manpages/vfs_extd_audit.8
   branches/samba/upstream/docs/manpages/vfs_fake_perms.8
   branches/samba/upstream/docs/manpages/vfs_fileid.8
   branches/samba/upstream/docs/manpages/vfs_full_audit.8
   branches/samba/upstream/docs/manpages/vfs_gpfs.8
   branches/samba/upstream/docs/manpages/vfs_netatalk.8
   branches/samba/upstream/docs/manpages/vfs_notify_fam.8
   branches/samba/upstream/docs/manpages/vfs_prealloc.8
   branches/samba/upstream/docs/manpages/vfs_preopen.8
   branches/samba/upstream/docs/manpages/vfs_readahead.8
   branches/samba/upstream/docs/manpages/vfs_readonly.8
   branches/samba/upstream/docs/manpages/vfs_recycle.8
   branches/samba/upstream/docs/manpages/vfs_scannedonly.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy.8
   branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8
   branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8
   branches/samba/upstream/docs/manpages/vfs_streams_depot.8
   branches/samba/upstream/docs/manpages/vfs_streams_xattr.8
   branches/samba/upstream/docs/manpages/vfs_time_audit.8
   branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8
   branches/samba/upstream/docs/manpages/vfstest.1
   branches/samba/upstream/docs/manpages/wbinfo.1
   branches/samba/upstream/docs/manpages/winbind_krb5_locator.7
   branches/samba/upstream/docs/manpages/winbindd.8
   branches/samba/upstream/lib/replace/libreplace.m4
   branches/samba/upstream/lib/replace/system/wait.h
   branches/samba/upstream/lib/tevent/tevent_signal.c
   branches/samba/upstream/lib/util/debug.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/configure
   branches/samba/upstream/source3/configure.in
   branches/samba/upstream/source3/include/config.h.in
   branches/samba/upstream/source3/include/version.h
   branches/samba/upstream/source3/smbd/smb2_create.c
   branches/samba/upstream/source3/web/cgi.c
   branches/samba/upstream/source3/web/swat.c
   branches/samba/upstream/source3/web/swat_proto.h
Log:
Load samba-3.6.12 into branches/samba/upstream.

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

--- branches/samba/upstream/WHATSNEW.txt	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/WHATSNEW.txt	2013-02-16 17:48:56 UTC (rev 4198)
@@ -1,4 +1,127 @@
                    ==============================
+                   Release Notes for Samba 3.6.12
+                          January 30, 2013
+                   ==============================
+
+
+This is a security release in order to address
+CVE-2013-0213 (Clickjacking issue in SWAT) and
+CVE-2013-0214 (Potential XSRF in SWAT).
+
+o  CVE-2013-0213:
+   All current released versions of Samba are vulnerable to clickjacking in the
+   Samba Web Administration Tool (SWAT). When the SWAT pages are integrated into
+   a malicious web page via a frame or iframe and then overlaid by other content,
+   an attacker could trick an administrator to potentially change Samba settings.
+
+   In order to be vulnerable, SWAT must have been installed and enabled
+   either as a standalone server launched from inetd or xinetd, or as a
+   CGI plugin to Apache. If SWAT has not been installed or enabled (which
+   is the default install state for Samba) this advisory can be ignored.
+
+o  CVE-2013-0214:
+   All current released versions of Samba are vulnerable to a cross-site
+   request forgery in the Samba Web Administration Tool (SWAT). By guessing a
+   user's password and then tricking a user who is authenticated with SWAT into
+   clicking a manipulated URL on a different web page, it is possible to manipulate
+   SWAT.
+
+   In order to be vulnerable, the attacker needs to know the victim's password.
+   Additionally SWAT must have been installed and enabled either as a standalone
+   server launched from inetd or xinetd, or as a CGI plugin to Apache. If SWAT has
+   not been installed or enabled (which is the default install state for Samba)
+   this advisory can be ignored.
+
+
+Changes since 3.6.11:
+--------------------
+
+o   Kai Blin <kai at samba.org>
+    * BUG 9576: CVE-2013-0213: Fix clickjacking issue in SWAT.
+    * BUG 9577: CVE-2013-0214: Fix potential XSRF in SWAT.
+
+
+######################################################################
+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.11
+                         January 21, 2013
+                   ==============================
+
+
+This is is the latest stable release of Samba 3.6.
+
+Major enhancements in Samba 3.6.11 include:
+
+o   defer_open is triggered multiple times on the same request (bug #9196).
+o   Fix SEGV wh_n using second vfs module (bug #9471).
+
+
+Changes since 3.6.10:
+--------------------
+
+o   Jeremy Allison <jra at samba.org>
+    * BUG 9196: defer_open is triggered multiple times on the same request.
+    * BUG 9550: Mask off signals the correct way from the signal handler.
+
+
+o   Björn Baumbach <bb at sernet.de>
+    * BUG 9569: ntlm_auth.1: Fix format and make examples visible.
+
+
+o   Tsukasa Hamano <hamano at osstech.co.jp>
+    * BUG 9471: Fix SEGV when using second vfs module.
+
+
+o   Volker Lendecke <vl at samba.org>
+    * BUG 9548: Correctly detect O_DIRECT.
+    * BUG 9546: Fix aio_suspend detection on FreeBSD.
+
+
+######################################################################
+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 Samba 3.6.10
                          December 10, 2012
                    ==============================
@@ -89,9 +212,10 @@
 == The Samba Team
 ======================================================================
 
-Release notes for older releases follow:
-----------------------------------------
 
+----------------------------------------------------------------------
+
+
                    =============================
                    Release Notes for Samba 3.6.9
                          October 29, 2012

Modified: branches/samba/upstream/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/upstream/docs/manpages/eventlogadm.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/eventlogadm.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: eventlogadm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "EVENTLOGADM" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/findsmb.1
===================================================================
--- branches/samba/upstream/docs/manpages/findsmb.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/findsmb.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: findsmb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "FINDSMB" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_ad.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ad
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_adex.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_adex
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_ADEX" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_autorid.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_autorid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_AUTORID" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_hash.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_hash
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_HASH" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_ldap.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_ldap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_LDAP" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_nss.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_nss
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_NSS" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_rid.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_rid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_RID" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_tdb.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/idmap_tdb2.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: idmap_tdb2
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "IDMAP_TDB2" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba/upstream/docs/manpages/libsmbclient.7	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/libsmbclient.7	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: libsmbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LIBSMBCLIENT" "7" "12/06/2012" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "01/18/2013" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/upstream/docs/manpages/lmhosts.5	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/lmhosts.5	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: lmhosts
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LMHOSTS" "5" "12/06/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/log2pcap.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: log2pcap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "LOG2PCAP" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/net.8
===================================================================
--- branches/samba/upstream/docs/manpages/net.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/net.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: net
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NET" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/nmbd.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/nmbd.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: nmbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/upstream/docs/manpages/nmblookup.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/nmblookup.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: nmblookup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NMBLOOKUP" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/upstream/docs/manpages/ntlm_auth.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/ntlm_auth.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: ntlm_auth
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "NTLM_AUTH" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -117,17 +117,27 @@
 .RS 4
 The username, expected to be in Samba\'s
 \m[blue]\fBunix charset\fR\m[]\&.
-.PP \fBExample\ \&1.\ \&\fR Username: bob
-.PP \fBExample\ \&2.\ \&\fR Username:: Ym9i
+.PP
+Examples:
+.RS 4
+Username: bob
+.sp
+Username:: Ym9i
 .RE
+.RE
 .PP
 NT\-Domain
 .RS 4
 The user\'s domain, expected to be in Samba\'s
 \m[blue]\fBunix charset\fR\m[]\&.
-.PP \fBExample\ \&3.\ \&\fR NT\-Domain: WORKGROUP
-.PP \fBExample\ \&4.\ \&\fR NT\-Domain:: V09SS0dST1VQ
+.PP
+Examples:
+.RS 4
+NT\-Domain: WORKGROUP
+.sp
+NT\-Domain:: V09SS0dST1VQ
 .RE
+.RE
 .PP
 Full\-Username
 .RS 4
@@ -135,17 +145,26 @@
 \m[blue]\fBunix charset\fR\m[]
 and qualified with the
 \m[blue]\fBwinbind separator\fR\m[]\&.
-.PP \fBExample\ \&5.\ \&\fR Full\-Username: WORKGROUP\ebob
-.PP \fBExample\ \&6.\ \&\fR Full\-Username:: V09SS0dST1VQYm9i
+.PP
+Examples:
+.RS 4
+Full\-Username: WORKGROUP\ebob
+.sp
+Full\-Username:: V09SS0dST1VQYm9i
 .RE
+.RE
 .PP
 LANMAN\-Challenge
 .RS 4
 The 8 byte
 LANMAN Challenge
 value, generated randomly by the server, or (in cases such as MSCHAPv2) generated in some way by both the server and the client\&.
-.PP \fBExample\ \&7.\ \&\fR LANMAN\-Challenge: 0102030405060708
+.PP
+Examples:
+.RS 4
+LANMAN\-Challenge: 0102030405060708
 .RE
+.RE
 .PP
 LANMAN\-Response
 .RS 4
@@ -153,8 +172,12 @@
 LANMAN Response
 value, calculated from the user\'s password and the supplied
 LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
-.PP \fBExample\ \&8.\ \&\fR LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+.PP
+Examples:
+.RS 4
+LANMAN\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
 .RE
+.RE
 .PP
 NT\-Response
 .RS 4
@@ -162,27 +185,46 @@
 NT Response
 calculated from the user\'s password and the supplied
 LANMAN Challenge\&. Typically, this is provided over the network by a client wishing to authenticate\&.
-.PP \fBExample\ \&9.\ \&\fR NT\-Response: 0102030405060708090A0B0C0D0E0F101112131415161718
+.PP
+Examples:
+.RS 4
+NT\-Response: 0102030405060708090A0B0C0D0E0F10111213141516171
 .RE
+.RE
 .PP
 Password
 .RS 4
 The user\'s password\&. This would be provided by a network client, if the helper is being used in a legacy situation that exposes plaintext passwords in this way\&.
-.PP \fBExample\ \&10.\ \&\fR Password: samba2
-.PP \fBExample\ \&11.\ \&\fR Password:: c2FtYmEy
+.PP
+Examples:
+.RS 4
+Password: samba2
+.sp
+Password:: c2FtYmEy
 .RE
+.RE
 .PP
 Request\-User\-Session\-Key
 .RS 4
 Upon successful authenticaiton, return the user session key associated with the login\&.
-.PP \fBExample\ \&12.\ \&\fR Request\-User\-Session\-Key: Yes
+.PP
+Examples:
+.RS 4
+Request\-User\-Session\-Key: Yes
 .RE
+.RE
 .PP
 Request\-LanMan\-Session\-Key
 .RS 4
 Upon successful authenticaiton, return the LANMAN session key associated with the login\&.
-.PP \fBExample\ \&13.\ \&\fR Request\-LanMan\-Session\-Key: Yes
+.PP
+Examples:
+.RS 4
+Request\-LanMan\-Session\-Key: Yes
 .RE
+.RE
+.RE
+.sp
 .if n \{\
 .sp
 .\}
@@ -195,13 +237,10 @@
 \fBWarning\fR
 .ps -1
 .br
-Implementers should take care to base64 encode
-		any data (such as usernames/passwords) that may contain malicous user data, such as
-		a newline\&.  They may also need to decode strings from
-		the helper, which likewise may have been base64 encoded\&..sp .5v
+Implementers should take care to base64 encode any data (such as usernames/passwords) that may contain malicous user data, such as a newline\&. They may also need to decode strings from the helper, which likewise may have been base64 encoded\&.
+.sp .5v
 .RE
 .RE
-.RE
 .PP
 \-\-username=USERNAME
 .RS 4

Modified: branches/samba/upstream/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/upstream/docs/manpages/pam_winbind.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/pam_winbind.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: pam_winbind
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: 8
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND" "8" "12/06/2012" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/pam_winbind.conf.5	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: 5
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PAM_WINBIND\&.CONF" "5" "12/06/2012" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "01/18/2013" "Samba 3\&.6" "5"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/upstream/docs/manpages/pdbedit.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/pdbedit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: pdbedit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PDBEDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/profiles.1
===================================================================
--- branches/samba/upstream/docs/manpages/profiles.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/profiles.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: profiles
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "PROFILES" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/rpcclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/rpcclient.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/rpcclient.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: rpcclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "RPCCLIENT" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/samba.7
===================================================================
--- branches/samba/upstream/docs/manpages/samba.7	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/samba.7	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: samba
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: Miscellanea
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SAMBA" "7" "12/06/2012" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "01/18/2013" "Samba 3\&.6" "Miscellanea"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/sharesec.1
===================================================================
--- branches/samba/upstream/docs/manpages/sharesec.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/sharesec.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: sharesec
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SHARESEC" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/upstream/docs/manpages/smb.conf.5	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smb.conf.5	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smb.conf
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB\&.CONF" "5" "12/06/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbcacls.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbcacls
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCACLS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbclient.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbclient.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbclient.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbclient
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCLIENT" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcontrol.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbcontrol.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbcontrol
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCONTROL" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbcquotas.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbcquotas.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbcquotas
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBCQUOTAS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbd.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbd.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbd.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbget.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbget.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbget.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbget
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGET" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba/upstream/docs/manpages/smbgetrc.5	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbgetrc.5	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbgetrc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBGETRC" "5" "12/06/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbpasswd.5	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: File Formats and Conventions
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "5" "12/06/2012" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbpasswd.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbpasswd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBPASSWD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbspool.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbspool.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbspool.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbspool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSPOOL" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbstatus.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbstatus.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbstatus.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbstatus
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBSTATUS" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbta-util.8
===================================================================
--- branches/samba/upstream/docs/manpages/smbta-util.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbta-util.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbta-util
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTA\-UTIL" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtar.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtar.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbtar.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbtar
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTAR" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/smbtree.1
===================================================================
--- branches/samba/upstream/docs/manpages/smbtree.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/smbtree.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: smbtree
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMBTREE" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/swat.8
===================================================================
--- branches/samba/upstream/docs/manpages/swat.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/swat.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: swat
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SWAT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbbackup.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/tdbbackup.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: tdbbackup
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBBACKUP" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbdump.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbdump.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/tdbdump.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: tdbdump
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBDUMP" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/tdbtool.8
===================================================================
--- branches/samba/upstream/docs/manpages/tdbtool.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/tdbtool.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: tdbtool
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TDBTOOL" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/testparm.1
===================================================================
--- branches/samba/upstream/docs/manpages/testparm.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/testparm.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: testparm
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "TESTPARM" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_acl_tdb.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_TDB" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_acl_xattr.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_ACL_XATTR" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_aio_fork.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_FORK" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_aio_pthread.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AIO_PTHREAD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_audit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_audit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_AUDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_cacheprime.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cacheprime
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CACHEPRIME" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_cap.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_cap
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CAP" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_catia.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_catia
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CATIA" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_commit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_commit
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_COMMIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_crossrename.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_crossrename
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_CROSSRENAME" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_default_quota.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DEFAULT_QUOTA" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_dirsort.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_dirsort
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_DIRSORT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_extd_audit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_EXTD_AUDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_fake_perms.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FAKE_PERMS" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_fileid.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_fileid
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FILEID" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_full_audit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_FULL_AUDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_gpfs.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_gpfs
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_GPFS" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_netatalk.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_netatalk
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NETATALK" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_notify_fam.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_NOTIFY_FAM" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_prealloc.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_prealloc
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREALLOC" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_preopen.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_preopen
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_PREOPEN" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_readahead.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readahead
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READAHEAD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_readonly.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_readonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_READONLY" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_recycle.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_recycle
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_RECYCLE" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_scannedonly.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfs_scannedonly
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SCANNEDONLY" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_shadow_copy2.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_SHADOW_COPY2" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_smb_traffic_analyzer.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_streams_depot.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_DEPOT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_streams_xattr.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_STREAMS_XATTR" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_time_audit.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_TIME_AUDIT" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfs_xattr_tdb.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFS_XATTR_TDB" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/vfstest.1
===================================================================
--- branches/samba/upstream/docs/manpages/vfstest.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/vfstest.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: vfstest
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "VFSTEST" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "01/18/2013" "Samba 3\&.6" "User Commands"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/upstream/docs/manpages/wbinfo.1	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/wbinfo.1	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: wbinfo
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: User Commands
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WBINFO" "1" "12/06/2012" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "01/18/2013" "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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/winbind_krb5_locator.7	2013-02-16 17:48:56 UTC (rev 4198)
@@ -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: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: 7
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "12/06/2012" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "01/18/2013" "Samba 3\&.6" "7"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs/manpages/winbindd.8
===================================================================
--- branches/samba/upstream/docs/manpages/winbindd.8	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs/manpages/winbindd.8	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2,12 +2,12 @@
 .\"     Title: winbindd
 .\"    Author: [see the "AUTHOR" section]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 12/06/2012
+.\"      Date: 01/18/2013
 .\"    Manual: System Administration tools
 .\"    Source: Samba 3.6
 .\"  Language: English
 .\"
-.TH "WINBINDD" "8" "12/06/2012" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "01/18/2013" "Samba 3\&.6" "System Administration tools"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

Modified: branches/samba/upstream/docs-xml/manpages-3/ntlm_auth.1.xml
===================================================================
--- branches/samba/upstream/docs-xml/manpages-3/ntlm_auth.1.xml	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/docs-xml/manpages-3/ntlm_auth.1.xml	2013-02-16 17:48:56 UTC (rev 4198)
@@ -160,111 +160,132 @@
 		external program to the helper are:</para>
 		<variablelist>
 		  <varlistentry>
-		  <term>Username</term>
-		  
-                <listitem><para>The username, expected to be in
-                Samba's <smbconfoption name="unix charset"/>.
-                </para>
+		    <term>Username</term>
+		    <listitem><para>The username, expected to be in
+		    Samba's <smbconfoption name="unix charset"/>.
+		    </para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>Username: bob</para>
+		      <para>Username:: Ym9i</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		      <para><example>Username: bob</example></para>
-		      <para><example>Username:: Ym9i</example></para>
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>NT-Domain</term>
-                <listitem><para>The user's domain, expected to be in
-                Samba's <smbconfoption name="unix charset"/>.
-                </para>
+		    <term>NT-Domain</term>
+		    <listitem><para>The user's domain, expected to be in
+		    Samba's <smbconfoption name="unix charset"/>.
+		    </para>
 
-		      <para><example>NT-Domain: WORKGROUP</example></para>
-		      <para><example>NT-Domain:: V09SS0dST1VQ</example></para>
-		    </listitem></varlistentry>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>NT-Domain: WORKGROUP</para>
+		      <para>NT-Domain:: V09SS0dST1VQ</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
 		  <varlistentry>
-		  <term>Full-Username</term>
-                <listitem><para>The fully qualified username, expected to be in
-                Samba's <smbconfoption name="unix charset"/> and qualified with the
-                <smbconfoption name="winbind separator"/>.
-                </para>
+		    <term>Full-Username</term>
+		    <listitem><para>The fully qualified username, expected to be
+		    in Samba's <smbconfoption name="unix charset"/> and qualified
+		    with the <smbconfoption name="winbind separator"/>.</para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>Full-Username: WORKGROUP\bob</para>
+		      <para>Full-Username:: V09SS0dST1VQYm9i</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		      <para><example>Full-Username: WORKGROUP\bob</example></para>
-		      <para><example>Full-Username:: V09SS0dST1VQYm9i</example></para>
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>LANMAN-Challenge</term>
-		  
-                <listitem><para>The 8 byte <command>LANMAN Challenge</command> value,
-                generated randomly by the server, or (in cases such as
-                MSCHAPv2) generated in some way by both the server and
-                the client.
-                </para>	
-		      <para><example>LANMAN-Challenge: 0102030405060708</example></para>
-		    </listitem></varlistentry>
+		    <term>LANMAN-Challenge</term>
+		    <listitem><para>The 8 byte <command>LANMAN Challenge</command>
+		    value, generated randomly by the server, or (in cases such
+		    as MSCHAPv2) generated in some way by both the server and
+		    the client.</para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>LANMAN-Challenge: 0102030405060708</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
 		  <varlistentry>
-		  <term>LANMAN-Response</term>
-		  
-                <listitem><para>The 24 byte <command>LANMAN Response</command> value,
-                calculated from the user's password and the supplied
-                <command>LANMAN Challenge</command>.  Typically, this
-                is provided over the network by a client wishing to authenticate.
-                </para>	
-		      <para><example>LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
+		    <term>LANMAN-Response</term>
+		    <listitem><para>The 24 byte <command>LANMAN Response</command> value,
+		    calculated from the user's password and the supplied
+		    <command>LANMAN Challenge</command>.  Typically, this
+		    is provided over the network by a client wishing to authenticate.
+		    </para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>NT-Response</term>
-                <listitem><para>The >= 24 byte <command>NT Response</command>
-                calculated from the user's password and the supplied
-                <command>LANMAN Challenge</command>.  Typically, this is 
-                provided over the network by a client wishing to authenticate.
-                 </para>	
-		      <para><example>NT-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</example></para>
+		    <term>NT-Response</term>
+		    <listitem><para>The >= 24 byte <command>NT Response</command>
+		    calculated from the user's password and the supplied
+		    <command>LANMAN Challenge</command>.  Typically, this is
+		    provided over the network by a client wishing to authenticate.
+		    </para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>NT-Response: 0102030405060708090A0B0C0D0E0F10111213141516171</para>
+		      </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>Password</term>
-                <listitem><para>The user's password.  This would be
-                provided by a network client, if the helper is being
-                used in a legacy situation that exposes plaintext
-                passwords in this way.
-                 </para>	
-		      <para><example>Password: samba2</example></para>
-		      <para><example>Password:: c2FtYmEy</example></para>
+		    <term>Password</term>
+		    <listitem><para>The user's password.  This would be
+		    provided by a network client, if the helper is being
+		    used in a legacy situation that exposes plaintext
+		    passwords in this way.</para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>Password: samba2</para>
+		      <para>Password:: c2FtYmEy</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>Request-User-Session-Key</term>
-                <listitem><para>Upon successful authenticaiton, return
-                the user session key associated with the login.
-                 </para>	
-		      <para><example>Request-User-Session-Key: Yes</example></para>
+		    <term>Request-User-Session-Key</term>
+		    <listitem><para>Upon successful authenticaiton, return
+		    the user session key associated with the login.</para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>Request-User-Session-Key: Yes</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		    </listitem></varlistentry>
-
 		  <varlistentry>
-		  <term>Request-LanMan-Session-Key</term>
-                <listitem><para>Upon successful authenticaiton, return
-                the LANMAN session key associated with the login.
-                 </para>	
-		      <para><example>Request-LanMan-Session-Key: Yes</example></para>
+		    <term>Request-LanMan-Session-Key</term>
+		    <listitem><para>Upon successful authenticaiton, return
+		    the LANMAN session key associated with the login.
+		    </para>
+		    <varlistentry>
+		      <term>Examples:</term>
+		      <para>Request-LanMan-Session-Key: Yes</para>
+		    </varlistentry>
+		    </listitem>
+		  </varlistentry>
 
-		    </listitem></varlistentry>
-
-		<para><warning>Implementers should take care to base64 encode
-		any data (such as usernames/passwords) that may contain malicous user data, such as
-		a newline.  They may also need to decode strings from
-		the helper, which likewise may have been base64 encoded.</warning></para>
-	</variablelist>
-
+		</variablelist>
                 </listitem>
 		</varlistentry>
-	</variablelist>
-	</listitem>
+		</variablelist>
+		  <warning><para>Implementers should take care to base64 encode
+		  any data (such as usernames/passwords) that may contain malicous user data, such as
+		  a newline. They may also need to decode strings from
+		  the helper, which likewise may have been base64 encoded.</para></warning>
+		</listitem>
       </varlistentry>
       
       <varlistentry>

Modified: branches/samba/upstream/lib/replace/libreplace.m4
===================================================================
--- branches/samba/upstream/lib/replace/libreplace.m4	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/lib/replace/libreplace.m4	2013-02-16 17:48:56 UTC (rev 4198)
@@ -66,7 +66,7 @@
 AC_CHECK_FUNCS([pipe strftime srandom random srand rand usleep setbuffer lstat getpgrp utime utimes])
 
 AC_CHECK_HEADERS(stdbool.h stdint.h sys/select.h)
-AC_CHECK_HEADERS(setjmp.h utime.h)
+AC_CHECK_HEADERS(setjmp.h utime.h sys/wait.h)
 
 LIBREPLACE_PROVIDE_HEADER([stdint.h])
 LIBREPLACE_PROVIDE_HEADER([stdbool.h])
@@ -105,6 +105,7 @@
 AC_CHECK_HEADERS(sys/mount.h mntent.h)
 AC_CHECK_HEADERS(stropts.h)
 AC_CHECK_HEADERS(unix.h)
+AC_CHECK_HEADERS(sys/ucontext.h)
 
 AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror strerror_r)
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
@@ -266,6 +267,16 @@
 fi
 
 
+dnl Check if the C compiler understands volatile (it should, being ANSI).
+AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [
+	AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
+		libreplace_cv_volatile=yes,libreplace_cv_volatile=no)])
+if test x"$libreplace_cv_volatile" = x"yes"; then
+	AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
+fi
+
+m4_include(system/config.m4)
+
 AC_CACHE_CHECK([for O_DIRECT flag to open(2)],libreplace_cv_HAVE_OPEN_O_DIRECT,[
 AC_TRY_COMPILE([
 #include <unistd.h>
@@ -278,17 +289,6 @@
     AC_DEFINE(HAVE_OPEN_O_DIRECT,1,[Whether the open(2) accepts O_DIRECT])
 fi
 
-
-dnl Check if the C compiler understands volatile (it should, being ANSI).
-AC_CACHE_CHECK([that the C compiler understands volatile],libreplace_cv_volatile, [
-	AC_TRY_COMPILE([#include <sys/types.h>],[volatile int i = 0],
-		libreplace_cv_volatile=yes,libreplace_cv_volatile=no)])
-if test x"$libreplace_cv_volatile" = x"yes"; then
-	AC_DEFINE(HAVE_VOLATILE, 1, [Whether the C compiler understands volatile])
-fi
-
-m4_include(system/config.m4)
-
 m4_include(dlfcn.m4)
 m4_include(getpass.m4)
 m4_include(strptime.m4)
@@ -326,6 +326,18 @@
    AC_DEFINE(HAVE_STRUCT_TIMESPEC,1,[Whether we have struct timespec])
 fi
 
+AC_CACHE_CHECK([for ucontext_t type],libreplace_cv_ucontext_t, [
+    AC_TRY_COMPILE([
+#include <signal.h>
+#if HAVE_SYS_UCONTEXT_H
+#include <sys/ucontext.h>
+# endif
+],[ucontext_t uc; sigaddset(&uc.uc_sigmask, SIGUSR1);],
+    libreplace_cv_ucontext_t=yes,libreplace_cv_ucontext_t=no)])
+if test x"$libreplace_cv_ucontext_t" = x"yes"; then
+    AC_DEFINE(HAVE_UCONTEXT_T,1,[Whether we have ucontext_t])
+fi
+
 AC_CHECK_FUNCS([printf memset memcpy],,[AC_MSG_ERROR([Required function not found])])
 
 echo "LIBREPLACE_BROKEN_CHECKS: END"

Modified: branches/samba/upstream/lib/replace/system/wait.h
===================================================================
--- branches/samba/upstream/lib/replace/system/wait.h	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/lib/replace/system/wait.h	2013-02-16 17:48:56 UTC (rev 4198)
@@ -40,6 +40,10 @@
 #include <setjmp.h>
 #endif
 
+#ifdef HAVE_SYS_UCONTEXT_H
+#include <sys/ucontext.h>
+#endif
+
 #if !defined(HAVE_SIG_ATOMIC_T_TYPE)
 typedef int sig_atomic_t;
 #endif

Modified: branches/samba/upstream/lib/tevent/tevent_signal.c
===================================================================
--- branches/samba/upstream/lib/tevent/tevent_signal.c	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/lib/tevent/tevent_signal.c	2013-02-16 17:48:56 UTC (rev 4198)
@@ -122,10 +122,39 @@
 	if (count+1 == TEVENT_SA_INFO_QUEUE_COUNT) {
 		/* we've filled the info array - block this signal until
 		   these ones are delivered */
+#ifdef HAVE_UCONTEXT_T
+		/*
+		 * This is the only way for this to work.
+		 * By default signum is blocked inside this
+		 * signal handler using a temporary mask,
+		 * but what we really need to do now is
+		 * block it in the callers mask, so it
+		 * stays blocked when the temporary signal
+		 * handler mask is replaced when we return
+		 * from here. The callers mask can be found
+		 * in the ucontext_t passed in as the
+		 * void *uctx argument.
+		 */
+		ucontext_t *ucp = (ucontext_t *)uctx;
+		sigaddset(&ucp->uc_sigmask, signum);
+#else
+		/*
+		 * WARNING !!! WARNING !!!!
+		 *
+		 * This code doesn't work.
+		 * By default signum is blocked inside this
+		 * signal handler, but calling sigprocmask
+		 * modifies the temporary signal mask being
+		 * used *inside* this handler, which will be
+		 * replaced by the callers signal mask once
+		 * we return from here. See Samba
+		 * bug #9550 for details.
+		 */
 		sigset_t set;
 		sigemptyset(&set);
 		sigaddset(&set, signum);
 		sigprocmask(SIG_BLOCK, &set, NULL);
+#endif
 		TEVENT_SIG_INCREMENT(sig_state->sig_blocked[signum]);
 	}
 }

Modified: branches/samba/upstream/lib/util/debug.c
===================================================================
--- branches/samba/upstream/lib/util/debug.c	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/lib/util/debug.c	2013-02-16 17:48:56 UTC (rev 4198)
@@ -953,7 +953,7 @@
 			slprintf(header_str + hs_len,
 				 sizeof(header_str) -1 - hs_len,
 				 ", class=%s",
-				 default_classname_table[cls]);
+				 classname_table[cls]);
 		}
 
 		/* Print it all out at once to prevent split syslog output. */

Modified: branches/samba/upstream/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/upstream/packaging/RHEL/makerpms.sh	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/packaging/RHEL/makerpms.sh	2013-02-16 17:48:56 UTC (rev 4198)
@@ -20,7 +20,7 @@
 
 USERID=`id -u`
 GRPID=`id -g`
-VERSION='3.6.10'
+VERSION='3.6.12'
 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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/packaging/RHEL/samba.spec	2013-02-16 17:48:56 UTC (rev 4198)
@@ -11,7 +11,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.10
+Version:      3.6.12
 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	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/packaging/RHEL-CTDB/samba.spec	2013-02-16 17:48:56 UTC (rev 4198)
@@ -5,7 +5,7 @@
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name:         samba
-Version:      3.6.10
+Version:      3.6.12
 Release:      1GITHASH
 Epoch:        0
 License: GNU GPL version 3

Modified: branches/samba/upstream/source3/VERSION
===================================================================
--- branches/samba/upstream/source3/VERSION	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/VERSION	2013-02-16 17:48:56 UTC (rev 4198)
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=10
+SAMBA_VERSION_RELEASE=12
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #

Modified: branches/samba/upstream/source3/configure
===================================================================
--- branches/samba/upstream/source3/configure	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/configure	2013-02-16 17:48:56 UTC (rev 4198)
@@ -9033,7 +9033,7 @@
 
 done
 
-for ac_header in setjmp.h utime.h
+for ac_header in setjmp.h utime.h sys/wait.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -9221,7 +9221,19 @@
 
 done
 
+for ac_header in sys/ucontext.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "sys/ucontext.h" "ac_cv_header_sys_ucontext_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_ucontext_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SYS_UCONTEXT_H 1
+_ACEOF
 
+fi
+
+done
+
+
 for ac_func in seteuid setresuid setegid setresgid chroot bzero strerror strerror_r
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -10043,43 +10055,6 @@
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
-$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
-if ${libreplace_cv_HAVE_OPEN_O_DIRECT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#include <unistd.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
-int
-main ()
-{
-int fd = open("/dev/null", O_DIRECT);
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
-else
-  libreplace_cv_HAVE_OPEN_O_DIRECT=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
-$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
-if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
-
-$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
-
-fi
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking that the C compiler understands volatile" >&5
 $as_echo_n "checking that the C compiler understands volatile... " >&6; }
 if ${libreplace_cv_volatile+:} false; then :
@@ -10949,6 +10924,42 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for O_DIRECT flag to open(2)" >&5
+$as_echo_n "checking for O_DIRECT flag to open(2)... " >&6; }
+if ${libreplace_cv_HAVE_OPEN_O_DIRECT+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <unistd.h>
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+int
+main ()
+{
+int fd = open("/dev/null", O_DIRECT);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  libreplace_cv_HAVE_OPEN_O_DIRECT=yes
+else
+  libreplace_cv_HAVE_OPEN_O_DIRECT=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_HAVE_OPEN_O_DIRECT" >&5
+$as_echo "$libreplace_cv_HAVE_OPEN_O_DIRECT" >&6; }
+if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then
+
+$as_echo "#define HAVE_OPEN_O_DIRECT 1" >>confdefs.h
+
+fi
+
 save_LIBS="$LIBS"
 LIBS=""
 
@@ -11907,6 +11918,43 @@
 
 fi
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucontext_t type" >&5
+$as_echo_n "checking for ucontext_t type... " >&6; }
+if ${libreplace_cv_ucontext_t+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#include <signal.h>
+#if HAVE_SYS_UCONTEXT_H
+#include <sys/ucontext.h>
+# endif
+
+int
+main ()
+{
+ucontext_t uc; sigaddset(&uc.uc_sigmask, SIGUSR1);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  libreplace_cv_ucontext_t=yes
+else
+  libreplace_cv_ucontext_t=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libreplace_cv_ucontext_t" >&5
+$as_echo "$libreplace_cv_ucontext_t" >&6; }
+if test x"$libreplace_cv_ucontext_t" = x"yes"; then
+
+$as_echo "#define HAVE_UCONTEXT_T 1" >>confdefs.h
+
+fi
+
 for ac_func in printf memset memcpy
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -34701,7 +34749,7 @@
 			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <aio.h>
-int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }
+int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 

Modified: branches/samba/upstream/source3/configure.in
===================================================================
--- branches/samba/upstream/source3/configure.in	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/configure.in	2013-02-16 17:48:56 UTC (rev 4198)
@@ -5877,7 +5877,7 @@
 
 			AC_MSG_CHECKING(for aio_suspend)
 			AC_LINK_IFELSE([#include <aio.h>
-int main() { struct aiocb a; return aio_suspend(&a, 1, NULL); }],
+int main() { struct aiocb a; struct timespec t; return aio_suspend(&a, 1, &t); }],
 [AC_DEFINE(HAVE_AIO_SUSPEND, 1, [Have aio_suspend]) AC_MSG_RESULT(yes)],
 [AC_MSG_RESULT(no)])
 		fi

Modified: branches/samba/upstream/source3/include/config.h.in
===================================================================
--- branches/samba/upstream/source3/include/config.h.in	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/include/config.h.in	2013-02-16 17:48:56 UTC (rev 4198)
@@ -2305,6 +2305,9 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
 
+/* Define to 1 if you have the <sys/ucontext.h> header file. */
+#undef HAVE_SYS_UCONTEXT_H
+
 /* Define to 1 if you have the <sys/uio.h> header file. */
 #undef HAVE_SYS_UIO_H
 
@@ -2353,6 +2356,9 @@
 /* Whether crypt needs truncated salt */
 #undef HAVE_TRUNCATED_SALT
 
+/* Whether we have ucontext_t */
+#undef HAVE_UCONTEXT_T
+
 /* Whether uint16 typedef is included by rpc/rpc.h */
 #undef HAVE_UINT16_FROM_RPC_RPC_H
 

Modified: branches/samba/upstream/source3/include/version.h
===================================================================
--- branches/samba/upstream/source3/include/version.h	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/include/version.h	2013-02-16 17:48:56 UTC (rev 4198)
@@ -1,8 +1,8 @@
 /* Autogenerated by script/mkversion.sh */
 #define SAMBA_VERSION_MAJOR 3
 #define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 10
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.10"
+#define SAMBA_VERSION_RELEASE 12
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.12"
 #ifdef SAMBA_VERSION_VENDOR_FUNCTION
 #  define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
 #else /* SAMBA_VERSION_VENDOR_FUNCTION */

Modified: branches/samba/upstream/source3/smbd/smb2_create.c
===================================================================
--- branches/samba/upstream/source3/smbd/smb2_create.c	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/smbd/smb2_create.c	2013-02-16 17:48:56 UTC (rev 4198)
@@ -893,9 +893,6 @@
 	if (!smb2req) {
 		return false;
 	}
-	if (!smb2req->async) {
-		return false;
-	}
 	req = smb2req->subreq;
 	if (!req) {
 		return false;
@@ -904,6 +901,9 @@
 	if (!state) {
 		return false;
 	}
+	if (!state->open_was_deferred) {
+		return false;
+	}
 	if (p_request_time) {
 		*p_request_time = state->request_time;
 	}

Modified: branches/samba/upstream/source3/web/cgi.c
===================================================================
--- branches/samba/upstream/source3/web/cgi.c	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/web/cgi.c	2013-02-16 17:48:56 UTC (rev 4198)
@@ -48,6 +48,7 @@
 static char *pathinfo;
 static char *C_user;
 static char *C_pass;
+static char *C_nonce;
 static bool inetd_server;
 static bool got_request;
 
@@ -329,20 +330,7 @@
 	C_user = SMB_STRDUP(user);
 
 	if (!setuid(0)) {
-		C_pass = secrets_fetch_generic("root", "SWAT");
-		if (C_pass == NULL) {
-			char *tmp_pass = NULL;
-			tmp_pass = generate_random_password(talloc_tos(),
-							    16, 16);
-			if (tmp_pass == NULL) {
-				printf("%sFailed to create random nonce for "
-				       "SWAT session\n<br>%s\n", head, tail);
-				exit(0);
-			}
-			secrets_store_generic("root", "SWAT", tmp_pass);
-			C_pass = SMB_STRDUP(tmp_pass);
-			TALLOC_FREE(tmp_pass);
-		}
+		C_pass = SMB_STRDUP(cgi_nonce());
 	}
 	setuid(pwd->pw_uid);
 	if (geteuid() != pwd->pw_uid || getuid() != pwd->pw_uid) {
@@ -459,6 +447,30 @@
 }
 
 /***************************************************************************
+return a ptr to the nonce
+  ***************************************************************************/
+char *cgi_nonce(void)
+{
+	const char *head = "Content-Type: text/html\r\n\r\n<HTML><BODY><H1>SWAT installation Error</H1>\n";
+	const char *tail = "</BODY></HTML>\r\n";
+	C_nonce = secrets_fetch_generic("root", "SWAT");
+	if (C_nonce == NULL) {
+		char *tmp_pass = NULL;
+		tmp_pass = generate_random_password(talloc_tos(),
+						    16, 16);
+		if (tmp_pass == NULL) {
+			printf("%sFailed to create random nonce for "
+			       "SWAT session\n<br>%s\n", head, tail);
+			exit(0);
+		}
+		secrets_store_generic("root", "SWAT", tmp_pass);
+		C_nonce = SMB_STRDUP(tmp_pass);
+		TALLOC_FREE(tmp_pass);
+	}
+        return(C_nonce);
+}
+
+/***************************************************************************
 handle a file download
   ***************************************************************************/
 static void cgi_download(char *file)

Modified: branches/samba/upstream/source3/web/swat.c
===================================================================
--- branches/samba/upstream/source3/web/swat.c	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/web/swat.c	2013-02-16 17:48:56 UTC (rev 4198)
@@ -154,6 +154,7 @@
 	MD5_CTX md5_ctx;
 	uint8_t token[16];
 	int i;
+	char *nonce = cgi_nonce();
 
 	token_str[0] = '\0';
 	ZERO_STRUCT(md5_ctx);
@@ -167,6 +168,7 @@
 	if (pass != NULL) {
 		MD5Update(&md5_ctx, (uint8_t *)pass, strlen(pass));
 	}
+	MD5Update(&md5_ctx, (uint8_t *)nonce, strlen(nonce));
 
 	MD5Final(token, &md5_ctx);
 
@@ -266,7 +268,8 @@
 	if (!cgi_waspost()) {
 		printf("Expires: 0\r\n");
 	}
-	printf("Content-type: text/html\r\n\r\n");
+	printf("Content-type: text/html\r\n");
+	printf("X-Frame-Options: DENY\r\n\r\n");
 
 	if (!include_html("include/header.html")) {
 		printf("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n");

Modified: branches/samba/upstream/source3/web/swat_proto.h
===================================================================
--- branches/samba/upstream/source3/web/swat_proto.h	2013-02-03 16:45:27 UTC (rev 4197)
+++ branches/samba/upstream/source3/web/swat_proto.h	2013-02-16 17:48:56 UTC (rev 4198)
@@ -32,6 +32,7 @@
 bool am_root(void);
 char *cgi_user_name(void);
 char *cgi_user_pass(void);
+char *cgi_nonce(void);
 void cgi_setup(const char *rootdir, int auth_required);
 const char *cgi_baseurl(void);
 const char *cgi_pathinfo(void);



