diff options
| author | idd-guest <idd-guest@alioth.debian.org> | 2013-02-16 17:48:56 +0000 |
|---|---|---|
| committer | idd-guest <idd-guest@alioth.debian.org> | 2013-02-16 17:48:56 +0000 |
| commit | 529e6f89d41310a2ad916be0c5bf9fc11ed445cf (patch) | |
| tree | 938b1adda71231fcb65a7b08aea535b72eef402e | |
| parent | 63f07bb10f08040c39530bdc6aaea46c7c0ac9dd (diff) | |
| download | samba-upstream/3.6.12.tar.gz | |
Load samba-3.6.12 into branches/samba/upstream.upstream/3.6.12
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@4198 fc4039ab-9d04-0410-8cac-899223bdd6b0
99 files changed, 645 insertions, 346 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 45c3b4be4b..8d058e3b8f 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -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@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@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@sernet.de> + * BUG 9569: ntlm_auth.1: Fix format and make examples visible. + + +o Tsukasa Hamano <hamano@osstech.co.jp> + * BUG 9471: Fix SEGV when using second vfs module. + + +o Volker Lendecke <vl@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,8 +212,9 @@ database (https://bugzilla.samba.org/). == The Samba Team ====================================================================== -Release notes for older releases follow: ----------------------------------------- + +---------------------------------------------------------------------- + ============================= Release Notes for Samba 3.6.9 diff --git a/docs-xml/manpages-3/ntlm_auth.1.xml b/docs-xml/manpages-3/ntlm_auth.1.xml index dcf9b42503..ffbbf05160 100644 --- a/docs-xml/manpages-3/ntlm_auth.1.xml +++ b/docs-xml/manpages-3/ntlm_auth.1.xml @@ -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> - - <para><example>Username: bob</example></para> - <para><example>Username:: Ym9i</example></para> - </listitem></varlistentry> + <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> <varlistentry> - <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> + <term>NT-Domain</term> + <listitem><para>The user's domain, expected to be in + Samba's <smbconfoption name="unix charset"/>. + </para> + + <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> - - <para><example>Full-Username: WORKGROUP\bob</example></para> - <para><example>Full-Username:: V09SS0dST1VQYm9i</example></para> - </listitem></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> + <varlistentry> + <term>Examples:</term> + <para>Full-Username: WORKGROUP\bob</para> + <para>Full-Username:: V09SS0dST1VQYm9i</para> + </varlistentry> + </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> - - </listitem></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> + <varlistentry> + <term>Examples:</term> + <para>LANMAN-Response: 0102030405060708090A0B0C0D0E0F101112131415161718</para> + </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> - - </listitem></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> + <varlistentry> + <term>Examples:</term> + <para>NT-Response: 0102030405060708090A0B0C0D0E0F10111213141516171</para> + </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> - - </listitem></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> + <varlistentry> + <term>Examples:</term> + <para>Password: samba2</para> + <para>Password:: c2FtYmEy</para> + </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> - - </listitem></varlistentry> + <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> <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> - - </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> - + <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> + + </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> diff --git a/docs/manpages/eventlogadm.8 b/docs/manpages/eventlogadm.8 index 33d07fdd25..d0548a005f 100644 --- a/docs/manpages/eventlogadm.8 +++ b/docs/manpages/eventlogadm.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1 index 9a3917b43b..8e3916e1c0 100644 --- a/docs/manpages/findsmb.1 +++ b/docs/manpages/findsmb.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ad.8 b/docs/manpages/idmap_ad.8 index 420019e68a..e14a592942 100644 --- a/docs/manpages/idmap_ad.8 +++ b/docs/manpages/idmap_ad.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_adex.8 b/docs/manpages/idmap_adex.8 index c4940182f8..d9878bfdc6 100644 --- a/docs/manpages/idmap_adex.8 +++ b/docs/manpages/idmap_adex.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_autorid.8 b/docs/manpages/idmap_autorid.8 index b9c8ecc6c6..c63549c5c8 100644 --- a/docs/manpages/idmap_autorid.8 +++ b/docs/manpages/idmap_autorid.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_hash.8 b/docs/manpages/idmap_hash.8 index 53805b4d90..2777ca55a9 100644 --- a/docs/manpages/idmap_hash.8 +++ b/docs/manpages/idmap_hash.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ldap.8 b/docs/manpages/idmap_ldap.8 index 71cffde508..6de39ebcde 100644 --- a/docs/manpages/idmap_ldap.8 +++ b/docs/manpages/idmap_ldap.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_nss.8 b/docs/manpages/idmap_nss.8 index 0842050498..61db074183 100644 --- a/docs/manpages/idmap_nss.8 +++ b/docs/manpages/idmap_nss.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_rid.8 b/docs/manpages/idmap_rid.8 index 725e8af715..72a9103d92 100644 --- a/docs/manpages/idmap_rid.8 +++ b/docs/manpages/idmap_rid.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb.8 b/docs/manpages/idmap_tdb.8 index b8ee14a880..2e62c42324 100644 --- a/docs/manpages/idmap_tdb.8 +++ b/docs/manpages/idmap_tdb.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb2.8 b/docs/manpages/idmap_tdb2.8 index e8ac88b544..1e588fe036 100644 --- a/docs/manpages/idmap_tdb2.8 +++ b/docs/manpages/idmap_tdb2.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/libsmbclient.7 b/docs/manpages/libsmbclient.7 index 13ea97d5f2..9a11849d5b 100644 --- a/docs/manpages/libsmbclient.7 +++ b/docs/manpages/libsmbclient.7 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index 6e273460ed..c6e2d039e7 100644 --- a/docs/manpages/lmhosts.5 +++ b/docs/manpages/lmhosts.5 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/log2pcap.1 b/docs/manpages/log2pcap.1 index b1666d0efa..540167ccb9 100644 --- a/docs/manpages/log2pcap.1 +++ b/docs/manpages/log2pcap.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/net.8 b/docs/manpages/net.8 index caaa003e63..40baf659c3 100644 --- a/docs/manpages/net.8 +++ b/docs/manpages/net.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index e242e52b6e..b18a6b945d 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1 index 0424d00be7..9331ade8a7 100644 --- a/docs/manpages/nmblookup.1 +++ b/docs/manpages/nmblookup.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1 index b8658ed944..f6e28da641 100644 --- a/docs/manpages/ntlm_auth.1 +++ b/docs/manpages/ntlm_auth.1 @@ -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,16 +117,26 @@ Username .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 @@ -135,8 +145,13 @@ The fully qualified username, expected to be in Samba\'s \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 @@ -144,7 +159,11 @@ LANMAN\-Challenge 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 @@ -153,7 +172,11 @@ The 24 byte 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 @@ -162,27 +185,46 @@ The >= 24 byte 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,11 +237,8 @@ Upon successful authenticaiton, return the LANMAN session key associated with th \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 -.RE +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 .PP diff --git a/docs/manpages/pam_winbind.8 b/docs/manpages/pam_winbind.8 index c554206315..fdbd0b7a22 100644 --- a/docs/manpages/pam_winbind.8 +++ b/docs/manpages/pam_winbind.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pam_winbind.conf.5 b/docs/manpages/pam_winbind.conf.5 index 7c0c4dd501..b22690bb57 100644 --- a/docs/manpages/pam_winbind.conf.5 +++ b/docs/manpages/pam_winbind.conf.5 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8 index 0dc82d5f57..2f0b9da45f 100644 --- a/docs/manpages/pdbedit.8 +++ b/docs/manpages/pdbedit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/profiles.1 b/docs/manpages/profiles.1 index e34135058a..eb4707d6fb 100644 --- a/docs/manpages/profiles.1 +++ b/docs/manpages/profiles.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1 index 931f6b63dd..30967206bf 100644 --- a/docs/manpages/rpcclient.1 +++ b/docs/manpages/rpcclient.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7 index 167b0c11e9..137f15f22d 100644 --- a/docs/manpages/samba.7 +++ b/docs/manpages/samba.7 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/sharesec.1 b/docs/manpages/sharesec.1 index 57dec4c418..aef19d15d4 100644 --- a/docs/manpages/sharesec.1 +++ b/docs/manpages/sharesec.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 03df9bd848..0d3034afaa 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1 index 6c53f91a34..608d0b58a2 100644 --- a/docs/manpages/smbcacls.1 +++ b/docs/manpages/smbcacls.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index 125cc87610..1c690ee95d 100644 --- a/docs/manpages/smbclient.1 +++ b/docs/manpages/smbclient.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1 index 740e5f4090..4ca5df0075 100644 --- a/docs/manpages/smbcontrol.1 +++ b/docs/manpages/smbcontrol.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1 index c57a9d5f45..339696991f 100644 --- a/docs/manpages/smbcquotas.1 +++ b/docs/manpages/smbcquotas.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index 639c312a69..10d29423c7 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbget.1 b/docs/manpages/smbget.1 index e4c136724d..dcad3dedd7 100644 --- a/docs/manpages/smbget.1 +++ b/docs/manpages/smbget.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbgetrc.5 b/docs/manpages/smbgetrc.5 index be7fe59f87..c2373c4446 100644 --- a/docs/manpages/smbgetrc.5 +++ b/docs/manpages/smbgetrc.5 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index f914db86dd..47f9c1fd5a 100644 --- a/docs/manpages/smbpasswd.5 +++ b/docs/manpages/smbpasswd.5 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index 458be15ee0..c211e0a9b2 100644 --- a/docs/manpages/smbpasswd.8 +++ b/docs/manpages/smbpasswd.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8 index cd9fc6bb99..876bc41d3d 100644 --- a/docs/manpages/smbspool.8 +++ b/docs/manpages/smbspool.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index 0d38b85d99..1698acde24 100644 --- a/docs/manpages/smbstatus.1 +++ b/docs/manpages/smbstatus.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbta-util.8 b/docs/manpages/smbta-util.8 index 7df4ee6707..805ec9043e 100644 --- a/docs/manpages/smbta-util.8 +++ b/docs/manpages/smbta-util.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index 711949dec5..cf47e05e20 100644 --- a/docs/manpages/smbtar.1 +++ b/docs/manpages/smbtar.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1 index 9b4c977f96..292ef0160a 100644 --- a/docs/manpages/smbtree.1 +++ b/docs/manpages/smbtree.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index 0713bdf9da..0a5262f5c0 100644 --- a/docs/manpages/swat.8 +++ b/docs/manpages/swat.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbbackup.8 b/docs/manpages/tdbbackup.8 index 086a066015..9ab753c323 100644 --- a/docs/manpages/tdbbackup.8 +++ b/docs/manpages/tdbbackup.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbdump.8 b/docs/manpages/tdbdump.8 index ebf1800423..4bd8b8a9a4 100644 --- a/docs/manpages/tdbdump.8 +++ b/docs/manpages/tdbdump.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbtool.8 b/docs/manpages/tdbtool.8 index 548df34644..5ff4d2a10e 100644 --- a/docs/manpages/tdbtool.8 +++ b/docs/manpages/tdbtool.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index e457d35ea8..04da39c339 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_acl_tdb.8 b/docs/manpages/vfs_acl_tdb.8 index b7122b3e57..a64fe264b8 100644 --- a/docs/manpages/vfs_acl_tdb.8 +++ b/docs/manpages/vfs_acl_tdb.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_acl_xattr.8 b/docs/manpages/vfs_acl_xattr.8 index a916c588a5..00446a7077 100644 --- a/docs/manpages/vfs_acl_xattr.8 +++ b/docs/manpages/vfs_acl_xattr.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_aio_fork.8 b/docs/manpages/vfs_aio_fork.8 index 7d97583381..deee0560d0 100644 --- a/docs/manpages/vfs_aio_fork.8 +++ b/docs/manpages/vfs_aio_fork.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_aio_pthread.8 b/docs/manpages/vfs_aio_pthread.8 index c9f952b3dd..4ccb3baaf8 100644 --- a/docs/manpages/vfs_aio_pthread.8 +++ b/docs/manpages/vfs_aio_pthread.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_audit.8 b/docs/manpages/vfs_audit.8 index 1e01ceac89..68378467d4 100644 --- a/docs/manpages/vfs_audit.8 +++ b/docs/manpages/vfs_audit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cacheprime.8 b/docs/manpages/vfs_cacheprime.8 index d489c44ed1..933833817e 100644 --- a/docs/manpages/vfs_cacheprime.8 +++ b/docs/manpages/vfs_cacheprime.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cap.8 b/docs/manpages/vfs_cap.8 index 4fbf3d69f6..8c44588917 100644 --- a/docs/manpages/vfs_cap.8 +++ b/docs/manpages/vfs_cap.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_catia.8 b/docs/manpages/vfs_catia.8 index 86466f8a10..548a256299 100644 --- a/docs/manpages/vfs_catia.8 +++ b/docs/manpages/vfs_catia.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_commit.8 b/docs/manpages/vfs_commit.8 index 2067a1d3c2..ca0c148c39 100644 --- a/docs/manpages/vfs_commit.8 +++ b/docs/manpages/vfs_commit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_crossrename.8 b/docs/manpages/vfs_crossrename.8 index a7b9eb6af3..673b6de530 100644 --- a/docs/manpages/vfs_crossrename.8 +++ b/docs/manpages/vfs_crossrename.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_default_quota.8 b/docs/manpages/vfs_default_quota.8 index 59c57de680..b0fb0fd79f 100644 --- a/docs/manpages/vfs_default_quota.8 +++ b/docs/manpages/vfs_default_quota.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_dirsort.8 b/docs/manpages/vfs_dirsort.8 index e839997122..a5f283cc70 100644 --- a/docs/manpages/vfs_dirsort.8 +++ b/docs/manpages/vfs_dirsort.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_extd_audit.8 b/docs/manpages/vfs_extd_audit.8 index f01793a6cd..67c04d9d60 100644 --- a/docs/manpages/vfs_extd_audit.8 +++ b/docs/manpages/vfs_extd_audit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fake_perms.8 b/docs/manpages/vfs_fake_perms.8 index 3a3e2f9fc2..ad490526fe 100644 --- a/docs/manpages/vfs_fake_perms.8 +++ b/docs/manpages/vfs_fake_perms.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fileid.8 b/docs/manpages/vfs_fileid.8 index 0f2b7c0be0..08490df09e 100644 --- a/docs/manpages/vfs_fileid.8 +++ b/docs/manpages/vfs_fileid.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_full_audit.8 b/docs/manpages/vfs_full_audit.8 index ae009047d2..74e069477b 100644 --- a/docs/manpages/vfs_full_audit.8 +++ b/docs/manpages/vfs_full_audit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_gpfs.8 b/docs/manpages/vfs_gpfs.8 index 1107c22bc8..2725d42f09 100644 --- a/docs/manpages/vfs_gpfs.8 +++ b/docs/manpages/vfs_gpfs.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_netatalk.8 b/docs/manpages/vfs_netatalk.8 index 89f7432d22..98afc2a39d 100644 --- a/docs/manpages/vfs_netatalk.8 +++ b/docs/manpages/vfs_netatalk.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_notify_fam.8 b/docs/manpages/vfs_notify_fam.8 index 30e9d8c390..15852d27d7 100644 --- a/docs/manpages/vfs_notify_fam.8 +++ b/docs/manpages/vfs_notify_fam.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_prealloc.8 b/docs/manpages/vfs_prealloc.8 index 7a3df78daf..313f0474ca 100644 --- a/docs/manpages/vfs_prealloc.8 +++ b/docs/manpages/vfs_prealloc.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_preopen.8 b/docs/manpages/vfs_preopen.8 index 1b910b8bcc..c7a75ae599 100644 --- a/docs/manpages/vfs_preopen.8 +++ b/docs/manpages/vfs_preopen.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readahead.8 b/docs/manpages/vfs_readahead.8 index e1f13cc982..3b7c436243 100644 --- a/docs/manpages/vfs_readahead.8 +++ b/docs/manpages/vfs_readahead.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readonly.8 b/docs/manpages/vfs_readonly.8 index 42bf2f17b6..90cd091ef1 100644 --- a/docs/manpages/vfs_readonly.8 +++ b/docs/manpages/vfs_readonly.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_recycle.8 b/docs/manpages/vfs_recycle.8 index ad5594ee05..f06736651a 100644 --- a/docs/manpages/vfs_recycle.8 +++ b/docs/manpages/vfs_recycle.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_scannedonly.8 b/docs/manpages/vfs_scannedonly.8 index c917c602e0..53d9b07955 100644 --- a/docs/manpages/vfs_scannedonly.8 +++ b/docs/manpages/vfs_scannedonly.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy.8 b/docs/manpages/vfs_shadow_copy.8 index 9ec97b5098..e4e0a27bd0 100644 --- a/docs/manpages/vfs_shadow_copy.8 +++ b/docs/manpages/vfs_shadow_copy.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy2.8 b/docs/manpages/vfs_shadow_copy2.8 index 5eea1279ce..3c3b8a0575 100644 --- a/docs/manpages/vfs_shadow_copy2.8 +++ b/docs/manpages/vfs_shadow_copy2.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_smb_traffic_analyzer.8 b/docs/manpages/vfs_smb_traffic_analyzer.8 index 44774e76c6..ca0afac37e 100644 --- a/docs/manpages/vfs_smb_traffic_analyzer.8 +++ b/docs/manpages/vfs_smb_traffic_analyzer.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_depot.8 b/docs/manpages/vfs_streams_depot.8 index bd21c82aa2..a2f3dad1af 100644 --- a/docs/manpages/vfs_streams_depot.8 +++ b/docs/manpages/vfs_streams_depot.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_xattr.8 b/docs/manpages/vfs_streams_xattr.8 index 3f5998d567..a4aed7014d 100644 --- a/docs/manpages/vfs_streams_xattr.8 +++ b/docs/manpages/vfs_streams_xattr.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_time_audit.8 b/docs/manpages/vfs_time_audit.8 index 3d2ad105e4..247f7ffea2 100644 --- a/docs/manpages/vfs_time_audit.8 +++ b/docs/manpages/vfs_time_audit.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_xattr_tdb.8 b/docs/manpages/vfs_xattr_tdb.8 index e416b544b6..1424218b9d 100644 --- a/docs/manpages/vfs_xattr_tdb.8 +++ b/docs/manpages/vfs_xattr_tdb.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1 index 758377962b..6ec9b4ace6 100644 --- a/docs/manpages/vfstest.1 +++ b/docs/manpages/vfstest.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1 index ee65c16f80..02d6884f52 100644 --- a/docs/manpages/wbinfo.1 +++ b/docs/manpages/wbinfo.1 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/winbind_krb5_locator.7 b/docs/manpages/winbind_krb5_locator.7 index 7a19b535e5..a9ed8433c3 100644 --- a/docs/manpages/winbind_krb5_locator.7 +++ b/docs/manpages/winbind_krb5_locator.7 @@ -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 .\" ----------------------------------------------------------------- diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8 index f9da787ce1..ff199f9148 100644 --- a/docs/manpages/winbindd.8 +++ b/docs/manpages/winbindd.8 @@ -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 .\" ----------------------------------------------------------------- diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4 index 808d5d1c06..67f8e3fbef 100644 --- a/lib/replace/libreplace.m4 +++ b/lib/replace/libreplace.m4 @@ -66,7 +66,7 @@ AC_FUNC_MEMCMP 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(stdarg.h vararg.h) 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 @@ if test x"$libreplace_cv_sig_atomic_t" = x"yes"; then 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 @@ if test x"$libreplace_cv_HAVE_OPEN_O_DIRECT" = x"yes"; then 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 @@ if test x"$libreplace_cv_struct_timespec" = x"yes"; then 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" diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h index f0c3bdccab..146c61a094 100644 --- a/lib/replace/system/wait.h +++ b/lib/replace/system/wait.h @@ -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 diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index b7908593f0..cc7fb0aab1 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -122,10 +122,39 @@ static void tevent_common_signal_handler_info(int signum, siginfo_t *info, 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]); } } diff --git a/lib/util/debug.c b/lib/util/debug.c index 108161edf5..efe6988d1c 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -953,7 +953,7 @@ bool dbghdrclass(int level, int cls, const char *location, const char *func) 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. */ diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec index 3223f38dc9..71c837f342 100644 --- a/packaging/RHEL-CTDB/samba.spec +++ b/packaging/RHEL-CTDB/samba.spec @@ -5,7 +5,7 @@ Summary: Samba SMB client and server Vendor: Samba Team Packager: Samba Team <samba@samba.org> Name: samba -Version: 3.6.10 +Version: 3.6.12 Release: 1GITHASH Epoch: 0 License: GNU GPL version 3 diff --git a/packaging/RHEL/makerpms.sh b/packaging/RHEL/makerpms.sh index 50872c7b7a..4cb0b8110c 100644 --- a/packaging/RHEL/makerpms.sh +++ b/packaging/RHEL/makerpms.sh @@ -20,7 +20,7 @@ SRCDIR=`rpm --eval %_sourcedir` USERID=`id -u` GRPID=`id -g` -VERSION='3.6.10' +VERSION='3.6.12' REVISION='' SPECFILE="samba.spec" RPMVER=`rpm --version | awk '{print $3}'` diff --git a/packaging/RHEL/samba.spec b/packaging/RHEL/samba.spec index 1d3a20f539..e83bc50648 100644 --- a/packaging/RHEL/samba.spec +++ b/packaging/RHEL/samba.spec @@ -11,7 +11,7 @@ Summary: Samba SMB client and server Vendor: Samba Team Packager: Samba Team <samba@samba.org> Name: samba -Version: 3.6.10 +Version: 3.6.12 Release: 1 Epoch: 0 License: GNU GPL version 3 diff --git a/source3/VERSION b/source3/VERSION index fd054c710b..c36d47456c 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -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 # diff --git a/source3/configure b/source3/configure index 5982975ed6..a482f4ae62 100755 --- a/source3/configure +++ b/source3/configure @@ -9033,7 +9033,7 @@ fi 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,6 +9221,18 @@ fi 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 : @@ -10043,43 +10055,6 @@ $as_echo "#define HAVE_SIG_ATOMIC_T_TYPE 1" >>confdefs.h 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 @@ done +{ $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 @@ $as_echo "#define HAVE_STRUCT_TIMESPEC 1" >>confdefs.h 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 @@ $as_echo_n "checking for aio_suspend... " >&6; } 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 : diff --git a/source3/configure.in b/source3/configure.in index a29818362c..0f805ee503 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5877,7 +5877,7 @@ int main() { struct aiocb a; return aio_cancel(1, &a); }], 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 diff --git a/source3/include/config.h.in b/source3/include/config.h.in index f0234ca883..6b7ba5ff7f 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -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 diff --git a/source3/include/version.h b/source3/include/version.h index 09ffa743c7..44625f6b95 100644 --- a/source3/include/version.h +++ b/source3/include/version.h @@ -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 */ diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c index 5a9044d8d7..5b81099928 100644 --- a/source3/smbd/smb2_create.c +++ b/source3/smbd/smb2_create.c @@ -893,9 +893,6 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req, if (!smb2req) { return false; } - if (!smb2req->async) { - return false; - } req = smb2req->subreq; if (!req) { return false; @@ -904,6 +901,9 @@ bool get_deferred_open_message_state_smb2(struct smbd_smb2_request *smb2req, if (!state) { return false; } + if (!state->open_was_deferred) { + return false; + } if (p_request_time) { *p_request_time = state->request_time; } diff --git a/source3/web/cgi.c b/source3/web/cgi.c index ef1b8562fa..861bc84a28 100644 --- a/source3/web/cgi.c +++ b/source3/web/cgi.c @@ -48,6 +48,7 @@ static const char *baseurl; 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 @@ static void cgi_web_auth(void) 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 @@ char *cgi_user_pass(void) } /*************************************************************************** +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) diff --git a/source3/web/swat.c b/source3/web/swat.c index 1f6eb6c4d4..f8933d21c8 100644 --- a/source3/web/swat.c +++ b/source3/web/swat.c @@ -154,6 +154,7 @@ void get_xsrf_token(const char *username, const char *pass, 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 @@ void get_xsrf_token(const char *username, const char *pass, 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 @@ static void print_header(void) 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"); diff --git a/source3/web/swat_proto.h b/source3/web/swat_proto.h index 424a3af545..fe51b1f80a 100644 --- a/source3/web/swat_proto.h +++ b/source3/web/swat_proto.h @@ -32,6 +32,7 @@ const char *cgi_variable_nonull(const char *name); 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); |