diff options
104 files changed, 411 insertions, 287 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 4291736269..c8e7607aa4 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,60 @@ ============================== + Release Notes for Samba 3.6.18 + August 14, 2013 + ============================== + + +This is is the latest stable release of Samba 3.6. + + +Changes since 3.6.17: +--------------------- + +o Jeremy Allison <jra@samba.org> + * BUG 9777: vfs_dirsort uses non-stackable calls, dirfd(), malloc instead + of talloc and doesn't cope with directories being modified whilst reading. + + +o Gregor Beck <gbeck@sernet.de> + * BUG 9678: Windows 8 Roaming profiles fail. + + +o Alexander Bokovoy <ab@samba.org> + * BUG 9636: Fix parsing linemarkers in preprocessor output. + + +o Björn Jacke <bj@sernet.de> + * BUG 9880: Use of wrong RFC2307 primary group field. + * BUG 9983: Fix output of syslog-facility check. + + +o Ralph Wuerthner <ralphw@de.ibm.com> + * BUG 10064: Linux kernel oplock breaks can miss signals. + + +###################################################################### +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.17 August 05, 2013 ============================== @@ -50,8 +106,9 @@ database (https://bugzilla.samba.org/). == The Samba Team ====================================================================== -Release notes for older releases follow: ----------------------------------------- + +---------------------------------------------------------------------- + ============================== Release Notes for Samba 3.6.16 diff --git a/docs-xml/manpages-3/idmap_ad.8.xml b/docs-xml/manpages-3/idmap_ad.8.xml index fbadaf2d55..2f7c0f11a9 100644 --- a/docs-xml/manpages-3/idmap_ad.8.xml +++ b/docs-xml/manpages-3/idmap_ad.8.xml @@ -22,9 +22,12 @@ id mappings from an AD server that uses RFC2307/SFU schema extensions. This module implements only the "idmap" API, and is READONLY. Mappings must be provided in advance - by the administrator by adding the posixAccount/posixGroup - classes and relative attribute/value pairs to the user and - group objects in the AD.</para> + by the administrator by adding the uidNumber attributes for + users and gidNumber attributes for groups in the AD. Winbind + will only map users that have a uidNumber and whose primary + group have a gidNumber attribute set. It is however + recommended that all groups in use have gidNumber attributes + assigned, otherwise they are not working.</para> <para> Note that the idmap_ad module has changed considerably since diff --git a/docs/manpages/dbwrap_tool.1 b/docs/manpages/dbwrap_tool.1 index 216035a940..b16aae0a32 100644 --- a/docs/manpages/dbwrap_tool.1 +++ b/docs/manpages/dbwrap_tool.1 @@ -2,12 +2,12 @@ .\" Title: dbwrap_tool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "DBWRAP_TOOL" "1" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "DBWRAP_TOOL" "1" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/eventlogadm.8 b/docs/manpages/eventlogadm.8 index 4df6a977da..39709b68d2 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "EVENTLOGADM" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "EVENTLOGADM" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1 index a4ab39314a..c6ffd74e67 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "FINDSMB" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "FINDSMB" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ad.8 b/docs/manpages/idmap_ad.8 index de15a21362..d054fd69f3 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_AD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_AD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -31,7 +31,7 @@ idmap_ad \- Samba\*(Aqs idmap_ad Backend for Winbind .SH "DESCRIPTION" .PP -The idmap_ad plugin provides a way for Winbind to read id mappings from an AD server that uses RFC2307/SFU schema extensions\&. This module implements only the "idmap" API, and is READONLY\&. Mappings must be provided in advance by the administrator by adding the posixAccount/posixGroup classes and relative attribute/value pairs to the user and group objects in the AD\&. +The idmap_ad plugin provides a way for Winbind to read id mappings from an AD server that uses RFC2307/SFU schema extensions\&. This module implements only the "idmap" API, and is READONLY\&. Mappings must be provided in advance by the administrator by adding the uidNumber attributes for users and gidNumber attributes for groups in the AD\&. Winbind will only map users that have a uidNumber and whose primary group have a gidNumber attribute set\&. It is however recommended that all groups in use have gidNumber attributes assigned, otherwise they are not working\&. .PP Note that the idmap_ad module has changed considerably since Samba versions 3\&.0 and 3\&.2\&. Currently, the \fIad\fR diff --git a/docs/manpages/idmap_adex.8 b/docs/manpages/idmap_adex.8 index 723a579e95..dca99c1d2c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_ADEX" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_ADEX" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_autorid.8 b/docs/manpages/idmap_autorid.8 index 6a112e53ab..41a070187c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_AUTORID" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_AUTORID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_hash.8 b/docs/manpages/idmap_hash.8 index 63e7fbb389..60d7b186c6 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_HASH" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_HASH" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ldap.8 b/docs/manpages/idmap_ldap.8 index e75a6e765c..f66d949830 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_LDAP" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_LDAP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_nss.8 b/docs/manpages/idmap_nss.8 index 56fe54de83..f134237a6b 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_NSS" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_NSS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_rid.8 b/docs/manpages/idmap_rid.8 index 11b03406c4..75787ea8f5 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_RID" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_RID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb.8 b/docs/manpages/idmap_tdb.8 index f1bc11dece..8783b65e84 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_TDB" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb2.8 b/docs/manpages/idmap_tdb2.8 index 4da553469a..d0a76c423f 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "IDMAP_TDB2" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "IDMAP_TDB2" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/libsmbclient.7 b/docs/manpages/libsmbclient.7 index 1e029e3ceb..bdb553d3bf 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: 7 .\" Source: Samba 3.6 .\" Language: English .\" -.TH "LIBSMBCLIENT" "7" "06/19/2013" "Samba 3\&.6" "7" +.TH "LIBSMBCLIENT" "7" "08/12/2013" "Samba 3\&.6" "7" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index 749b46bc3a..024d4f6ae0 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: File Formats and Conventions .\" Source: Samba 3.6 .\" Language: English .\" -.TH "LMHOSTS" "5" "06/19/2013" "Samba 3\&.6" "File Formats and Conventions" +.TH "LMHOSTS" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/log2pcap.1 b/docs/manpages/log2pcap.1 index 0ee1318127..594028f4c8 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "LOG2PCAP" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "LOG2PCAP" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -74,7 +74,7 @@ pcap_file Name of the output file to write the pcap (or hexdump) data to\&. If this argument is not specified, output data will be written to stdout\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/net.8 b/docs/manpages/net.8 index a996138cc3..7900344353 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "NET" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "NET" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -41,7 +41,7 @@ suite\&. The Samba net utility is meant to work just like the net utility available for windows and DOS\&. The first argument should be used to specify the protocol to use when executing a certain command\&. ADS is used for ActiveDirectory, RAP is using for old (Win9x/NT3) clients and RPC can be used for NT4 and Windows 2000\&. If this argument is omitted, net will try to determine it automatically\&. Not all commands are available on all protocols\&. .SH "OPTIONS" .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index f2f790a49a..7617d8f896 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "NMBD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "NMBD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -106,7 +106,7 @@ also logs to standard output, as if the parameter had been given\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1 index 697aaaad6b..fd9e37616b 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "NMBLOOKUP" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "NMBLOOKUP" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -109,7 +109,7 @@ smb\&.conf manual page for the list of valid options\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1 index 3c857800fd..1ea539c343 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "NTLM_AUTH" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "NTLM_AUTH" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -347,7 +347,7 @@ Base directory name for log/debug files\&. The extension will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/pam_winbind.8 b/docs/manpages/pam_winbind.8 index 1f9d9090d4..9baa5df547 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: 8 .\" Source: Samba 3.6 .\" Language: English .\" -.TH "PAM_WINBIND" "8" "06/19/2013" "Samba 3\&.6" "8" +.TH "PAM_WINBIND" "8" "08/12/2013" "Samba 3\&.6" "8" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pam_winbind.conf.5 b/docs/manpages/pam_winbind.conf.5 index 87c50fefe9..a5d393dfeb 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: 5 .\" Source: Samba 3.6 .\" Language: English .\" -.TH "PAM_WINBIND\&.CONF" "5" "06/19/2013" "Samba 3\&.6" "5" +.TH "PAM_WINBIND\&.CONF" "5" "08/12/2013" "Samba 3\&.6" "5" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8 index 919a0d4363..dbf7872352 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "PDBEDIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "PDBEDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -555,7 +555,7 @@ Example: This option is currently not being used\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/profiles.1 b/docs/manpages/profiles.1 index a15ae54772..0f10b293bd 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "PROFILES" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "PROFILES" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -59,7 +59,7 @@ file by SID2\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1 index cebc9b3356..50d5f0023f 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "RPCCLIENT" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "RPCCLIENT" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -199,7 +199,7 @@ smb\&.conf manual page for the list of valid options\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7 index da9ea1f8a8..cc79adbf58 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: Miscellanea .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SAMBA" "7" "06/19/2013" "Samba 3\&.6" "Miscellanea" +.TH "SAMBA" "7" "08/12/2013" "Samba 3\&.6" "Miscellanea" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/sharesec.1 b/docs/manpages/sharesec.1 index c181896d38..0e282dcbdf 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SHARESEC" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SHARESEC" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -82,7 +82,7 @@ Remove ACEs\&. Overwrite an existing share permission ACL\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 5fd0b2f5cd..1a7ea089ed 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: File Formats and Conventions .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMB\&.CONF" "5" "06/19/2013" "Samba 3\&.6" "File Formats and Conventions" +.TH "SMB\&.CONF" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1 index 28de7e73a4..2639322774 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBCACLS" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBCACLS" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -102,7 +102,7 @@ This option displays all ACL information in numeric format\&. The default is to Don\*(Aqt actually do anything, only validate the correctness of the arguments\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index 643c4523d6..6a180e091a 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBCLIENT" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBCLIENT" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -205,7 +205,7 @@ This parameter sets the maximum protocol version announced by the client\&. Make queries to the external server using the machine account of the local server\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1 index d4239f071e..628c16430e 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBCONTROL" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBCONTROL" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -48,7 +48,7 @@ is a very small program, which sends messages to a daemon running on the system\&. .SH "OPTIONS" .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1 index 55a88e46e6..ca21eee1de 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBCQUOTAS" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBCQUOTAS" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -82,7 +82,7 @@ Don\*(Aqt actually do anything, only validate the correctness of the arguments\& Be verbose\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index db54e445d4..ee823ea93c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SMBD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -130,7 +130,7 @@ Base directory name for log/debug files\&. The extension will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbget.1 b/docs/manpages/smbget.1 index 9c47506842..194d4aa9c5 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBGET" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBGET" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbgetrc.5 b/docs/manpages/smbgetrc.5 index 6edbd79d32..24d83f6182 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: File Formats and Conventions .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBGETRC" "5" "06/19/2013" "Samba 3\&.6" "File Formats and Conventions" +.TH "SMBGETRC" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index d5354df218..28673e3dad 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: File Formats and Conventions .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBPASSWD" "5" "06/19/2013" "Samba 3\&.6" "File Formats and Conventions" +.TH "SMBPASSWD" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index b86ec0cb56..3afada1616 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBPASSWD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SMBPASSWD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8 index 51227744d2..d6c85e1716 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBSPOOL" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SMBSPOOL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index 9ab07bd2c8..13773fb692 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBSTATUS" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBSTATUS" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -114,7 +114,7 @@ processes and exit\&. Useful for scripting\&. causes smbstatus to only list shares\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/smbta-util.8 b/docs/manpages/smbta-util.8 index 0d0f4c342f..ae2918625f 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBTA\-UTIL" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SMBTA\-UTIL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index c78970c9f0..e0152d8e3e 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBTAR" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBTAR" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1 index 687ee2fb82..0fee7da205 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMBTREE" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "SMBTREE" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -153,7 +153,7 @@ rpcclient to prompt for a password and type it in directly\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index 6f9410c45c..2baf8fd08b 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SWAT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SWAT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -116,7 +116,7 @@ Base directory name for log/debug files\&. The extension will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/tdbbackup.8 b/docs/manpages/tdbbackup.8 index 8a4617cc79..06ce98423b 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBBACKUP" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "TDBBACKUP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbdump.8 b/docs/manpages/tdbdump.8 index 80c3413dce..dc07fe4f61 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBDUMP" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "TDBDUMP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbtool.8 b/docs/manpages/tdbtool.8 index e142fdfef6..ef783af44c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TDBTOOL" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "TDBTOOL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index 6f637d5305..650b50de0a 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "TESTPARM" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "TESTPARM" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -66,7 +66,7 @@ testparm will prompt for a carriage return after printing the service names and before dumping the service definitions\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/vfs_acl_tdb.8 b/docs/manpages/vfs_acl_tdb.8 index 476ca0e556..1f7d80ec51 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_ACL_TDB" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_ACL_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_acl_xattr.8 b/docs/manpages/vfs_acl_xattr.8 index 5f16bb86ec..4ab34e034b 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_ACL_XATTR" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_ACL_XATTR" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_aio_fork.8 b/docs/manpages/vfs_aio_fork.8 index 08abd38295..5772f80076 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_AIO_FORK" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_AIO_FORK" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_aio_pthread.8 b/docs/manpages/vfs_aio_pthread.8 index bad43547e9..4d38c64a96 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_AIO_PTHREAD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_AIO_PTHREAD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_audit.8 b/docs/manpages/vfs_audit.8 index c06ab2a492..a3930b51ca 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_AUDIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cacheprime.8 b/docs/manpages/vfs_cacheprime.8 index 4d97fc2140..dedf4624bf 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_CACHEPRIME" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_CACHEPRIME" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cap.8 b/docs/manpages/vfs_cap.8 index 61bf08a505..33b1290108 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_CAP" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_CAP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_catia.8 b/docs/manpages/vfs_catia.8 index 4ba60e38bd..2ff3c0f9fe 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_CATIA" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_CATIA" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_commit.8 b/docs/manpages/vfs_commit.8 index c3379a11fa..4f5131ab50 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_COMMIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_COMMIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_crossrename.8 b/docs/manpages/vfs_crossrename.8 index a642662fd8..338344d781 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_CROSSRENAME" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_CROSSRENAME" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_default_quota.8 b/docs/manpages/vfs_default_quota.8 index 305864e9df..fb7da6e3e7 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_DEFAULT_QUOTA" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_DEFAULT_QUOTA" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_dirsort.8 b/docs/manpages/vfs_dirsort.8 index cab4e936c4..a59c1bc30e 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_DIRSORT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_DIRSORT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_extd_audit.8 b/docs/manpages/vfs_extd_audit.8 index fce2da2b4b..92d005660f 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_EXTD_AUDIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_EXTD_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fake_perms.8 b/docs/manpages/vfs_fake_perms.8 index e5a5c95bd2..5258566a06 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_FAKE_PERMS" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_FAKE_PERMS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fileid.8 b/docs/manpages/vfs_fileid.8 index 508adb9e67..a865be1c9c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_FILEID" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_FILEID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_full_audit.8 b/docs/manpages/vfs_full_audit.8 index 5a2789c5c3..6b34c50384 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_FULL_AUDIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_FULL_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_gpfs.8 b/docs/manpages/vfs_gpfs.8 index 24bdc5a8b4..79c2a28c3c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_GPFS" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_GPFS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_netatalk.8 b/docs/manpages/vfs_netatalk.8 index c583a73b24..844ea4c3c2 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_NETATALK" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_NETATALK" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_notify_fam.8 b/docs/manpages/vfs_notify_fam.8 index 2720c77b5c..d1b7062abb 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_NOTIFY_FAM" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_NOTIFY_FAM" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_prealloc.8 b/docs/manpages/vfs_prealloc.8 index b1f584a0e9..6cb16029d7 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_PREALLOC" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_PREALLOC" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_preopen.8 b/docs/manpages/vfs_preopen.8 index 685f76793f..ed99e5bdff 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_PREOPEN" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_PREOPEN" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readahead.8 b/docs/manpages/vfs_readahead.8 index 5a55ef6694..f55e61f2b9 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_READAHEAD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_READAHEAD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readonly.8 b/docs/manpages/vfs_readonly.8 index b218a3b652..d0fd48f1c0 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_READONLY" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_READONLY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_recycle.8 b/docs/manpages/vfs_recycle.8 index 8f67e05f96..473e569f9f 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_RECYCLE" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_RECYCLE" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_scannedonly.8 b/docs/manpages/vfs_scannedonly.8 index d84f3d2250..bae64d0125 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_SCANNEDONLY" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_SCANNEDONLY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy.8 b/docs/manpages/vfs_shadow_copy.8 index e7ec7b03c9..267b6b6671 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_SHADOW_COPY" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_SHADOW_COPY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy2.8 b/docs/manpages/vfs_shadow_copy2.8 index c78e39ffd4..adff585ad6 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_SHADOW_COPY2" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_SHADOW_COPY2" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_smb_traffic_analyzer.8 b/docs/manpages/vfs_smb_traffic_analyzer.8 index 8e229e9503..b38d6851c9 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "SMB_TRAFFIC_ANALYZER" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "SMB_TRAFFIC_ANALYZER" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_depot.8 b/docs/manpages/vfs_streams_depot.8 index b6618acec1..71ca7ecfd9 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_STREAMS_DEPOT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_STREAMS_DEPOT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_xattr.8 b/docs/manpages/vfs_streams_xattr.8 index 676e3c3420..14fef597a3 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_STREAMS_XATTR" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_STREAMS_XATTR" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_time_audit.8 b/docs/manpages/vfs_time_audit.8 index 70604dba80..a9d95b4b35 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_TIME_AUDIT" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_TIME_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_xattr_tdb.8 b/docs/manpages/vfs_xattr_tdb.8 index baee9fab2e..526bc493a8 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFS_XATTR_TDB" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "VFS_XATTR_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1 index 1a04b1b6de..bd8b054cc2 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "VFSTEST" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "VFSTEST" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -47,7 +47,7 @@ is a small command line utility that has the ability to test dso samba VFS modul Execute the specified (colon\-separated) commands\&. See below for the commands that are available\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1 index 6198c20a33..dd52a563ca 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: User Commands .\" Source: Samba 3.6 .\" Language: English .\" -.TH "WBINFO" "1" "06/19/2013" "Samba 3\&.6" "User Commands" +.TH "WBINFO" "1" "08/12/2013" "Samba 3\&.6" "User Commands" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -355,7 +355,7 @@ then the operation will fail\&. Prints the program version number\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/docs/manpages/winbind_krb5_locator.7 b/docs/manpages/winbind_krb5_locator.7 index 4b51703f58..eca42e5520 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: 7 .\" Source: Samba 3.6 .\" Language: English .\" -.TH "WINBIND_KRB5_LOCATOR" "7" "06/19/2013" "Samba 3\&.6" "7" +.TH "WINBIND_KRB5_LOCATOR" "7" "08/12/2013" "Samba 3\&.6" "7" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8 index 1e4504c1d8..cc3a51799c 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.76.1 <http://docbook.sf.net/> -.\" Date: 06/19/2013 +.\" Date: 08/12/2013 .\" Manual: System Administration tools .\" Source: Samba 3.6 .\" Language: English .\" -.TH "WINBINDD" "8" "06/19/2013" "Samba 3\&.6" "System Administration tools" +.TH "WINBINDD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -207,7 +207,7 @@ Base directory name for log/debug files\&. The extension will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&. .RE .PP -\-h|\-\-help +\-?|\-\-help .RS 4 Print a summary of command line options\&. .RE diff --git a/lib/replace/libreplace_macros.m4 b/lib/replace/libreplace_macros.m4 index 46aedd3a83..42b88471db 100644 --- a/lib/replace/libreplace_macros.m4 +++ b/lib/replace/libreplace_macros.m4 @@ -298,7 +298,7 @@ AC_DEFUN(AC_VERIFY_C_PROTOTYPE, eval AS_TR_SH([ac_cv_c_prototype_$1])=no ]) ) -AS_IF([test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4]) +AS_IF([eval test $AS_TR_SH([ac_cv_c_prototype_$1]) = yes],[$3],[$4]) ]) AC_DEFUN(LIBREPLACE_PROVIDE_HEADER, diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl index 696d5a56fb..0ea79a32b2 100644 --- a/librpc/idl/security.idl +++ b/librpc/idl/security.idl @@ -593,6 +593,9 @@ interface security SECINFO_DACL = 0x00000004, SECINFO_SACL = 0x00000008, SECINFO_LABEL = 0x00000010, + SECINFO_ATTRIBUTE = 0x00000020, + SECINFO_SCOPE = 0x00000040, + SECINFO_BACKUP = 0x00010000, SECINFO_UNPROTECTED_SACL = 0x10000000, SECINFO_UNPROTECTED_DACL = 0x20000000, SECINFO_PROTECTED_SACL = 0x40000000, diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec index 96a15c4c12..4fe4c47efa 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.17 +Version: 3.6.18 Release: 1GITHASH Epoch: 0 License: GNU GPL version 3 diff --git a/packaging/RHEL/makerpms.sh b/packaging/RHEL/makerpms.sh index 2c46642161..b0f744599a 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.17' +VERSION='3.6.18' REVISION='' SPECFILE="samba.spec" RPMVER=`rpm --version | awk '{print $3}'` diff --git a/packaging/RHEL/samba.spec b/packaging/RHEL/samba.spec index e1d78e48fc..001e785276 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.17 +Version: 3.6.18 Release: 1 Epoch: 0 License: GNU GPL version 3 diff --git a/pidl/idl.yp b/pidl/idl.yp index b5c5185fbe..c8a65f6f62 100644 --- a/pidl/idl.yp +++ b/pidl/idl.yp @@ -610,7 +610,9 @@ again: for ($parser->YYData->{INPUT}) { if (/^\#/) { - if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { + # Linemarker format is described at + # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html + if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { $parser->YYData->{LINE} = $1-1; $parser->YYData->{FILE} = $2; goto again; diff --git a/pidl/lib/Parse/Pidl/IDL.pm b/pidl/lib/Parse/Pidl/IDL.pm index d4820ffe92..6927c89255 100644 --- a/pidl/lib/Parse/Pidl/IDL.pm +++ b/pidl/lib/Parse/Pidl/IDL.pm @@ -2576,7 +2576,9 @@ again: for ($parser->YYData->{INPUT}) { if (/^\#/) { - if (s/^\# (\d+) \"(.*?)\"( \d+|)//) { + # Linemarker format is described at + # http://gcc.gnu.org/onlinedocs/cpp/Preprocessor-Output.html + if (s/^\# (\d+) \"(.*?)\"(( \d+){1,4}|)//) { $parser->YYData->{LINE} = $1-1; $parser->YYData->{FILE} = $2; goto again; diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 864f3dc2c0..01a1c470af 100644 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -650,6 +650,8 @@ sub provision($$$$$$) print CONF " [tmp] path = $shrdir + comment = smb username is [%U] + vfs objects = $vfs_modulesdir_abs/dirsort.so [tmpguest] path = $shrdir guest ok = yes diff --git a/source3/VERSION b/source3/VERSION index 241027226f..ea6a68da7b 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=17 +SAMBA_VERSION_RELEASE=18 ######################################################## # Bug fix releases use a letter for the patch revision # diff --git a/source3/configure b/source3/configure index aa3cacad2a..edd15b7906 100755 --- a/source3/configure +++ b/source3/configure @@ -10630,7 +10630,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, int buflen)" | $as_tr_sh` = yes; then : $as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h @@ -10677,7 +10677,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_struct passwd *getpwent_r(struct passwd *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then : $as_echo "#define SOLARIS_GETPWENT_R 1" >>confdefs.h @@ -10772,7 +10772,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, int buflen)" | $as_tr_sh` = yes; then : $as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h @@ -10820,7 +10820,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_struct group *getgrent_r(struct group *src, char *buf, size_t buflen)" | $as_tr_sh` = yes; then : $as_echo "#define SOLARIS_GETGRENT_R 1" >>confdefs.h @@ -11143,7 +11143,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_void *dlopen(const char* filename, unsigned int flags)" | $as_tr_sh` = yes; then : $as_echo "#define DLOPEN_TAKES_UNSIGNED_FLAGS 1" >>confdefs.h @@ -11453,7 +11453,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_long telldir(const DIR *dir)" | $as_tr_sh` = yes; then : $as_echo "#define TELLDIR_TAKES_CONST_DIR 1" >>confdefs.h @@ -11497,7 +11497,7 @@ fi eval ac_res=\$`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -if test $`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh` = yes; then : +if eval test $`$as_echo "ac_cv_c_prototype_int seekdir(DIR *dir, long ofs)" | $as_tr_sh` = yes; then : $as_echo "#define SEEKDIR_RETURNS_INT 1" >>confdefs.h @@ -32764,6 +32764,8 @@ if test "${with_syslog_facility+set}" = set; then : if test "$withval" = "no" ; then as_fn_error $? "argument to --with-syslog-facility must be a string" "$LINENO" 5 else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $withval" >&5 +$as_echo "$withval" >&6; } if test "$withval" != "yes" ; then syslog_facility="$withval" @@ -32774,6 +32776,10 @@ _ACEOF fi fi +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi diff --git a/source3/configure.in b/source3/configure.in index 5b14a24131..42c23e37f7 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4876,12 +4876,15 @@ AC_ARG_WITH(syslog-facility, if test "$withval" = "no" ; then AC_MSG_ERROR([argument to --with-syslog-facility must be a string]) else + AC_MSG_RESULT([$withval]) if test "$withval" != "yes" ; then syslog_facility="$withval" AC_DEFINE_UNQUOTED(SYSLOG_FACILITY,$syslog_facility, [syslog facility to log to]) fi fi -]) +], +AC_MSG_RESULT(no) +) ################################################# # check for experimental disk-quotas support diff --git a/source3/include/version.h b/source3/include/version.h index 619551ff6b..dde7580034 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 17 -#define SAMBA_VERSION_OFFICIAL_STRING "3.6.17" +#define SAMBA_VERSION_RELEASE 18 +#define SAMBA_VERSION_OFFICIAL_STRING "3.6.18" #ifdef SAMBA_VERSION_VENDOR_FUNCTION # define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION #else /* SAMBA_VERSION_VENDOR_FUNCTION */ diff --git a/source3/librpc/gen_ndr/ndr_security.c b/source3/librpc/gen_ndr/ndr_security.c index 8c4db56341..92e7b91a3d 100644 --- a/source3/librpc/gen_ndr/ndr_security.c +++ b/source3/librpc/gen_ndr/ndr_security.c @@ -1117,6 +1117,9 @@ _PUBLIC_ void ndr_print_security_secinfo(struct ndr_print *ndr, const char *name ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_DACL", SECINFO_DACL, r); ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_SACL", SECINFO_SACL, r); ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_LABEL", SECINFO_LABEL, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_ATTRIBUTE", SECINFO_ATTRIBUTE, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_SCOPE", SECINFO_SCOPE, r); + ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_BACKUP", SECINFO_BACKUP, r); ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_SACL", SECINFO_UNPROTECTED_SACL, r); ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_UNPROTECTED_DACL", SECINFO_UNPROTECTED_DACL, r); ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SECINFO_PROTECTED_SACL", SECINFO_PROTECTED_SACL, r); diff --git a/source3/librpc/gen_ndr/py_security.c b/source3/librpc/gen_ndr/py_security.c index 83b94dec93..9b3b4ededb 100644 --- a/source3/librpc/gen_ndr/py_security.c +++ b/source3/librpc/gen_ndr/py_security.c @@ -1991,6 +1991,7 @@ void initsecurity(void) PyModule_AddObject(m, "SID_BUILTIN_RAS_SERVERS", PyString_FromString("S-1-5-32-553")); PyModule_AddObject(m, "GUID_DRS_VALIDATE_SPN", PyString_FromString("f3a64788-5306-11d1-a9c5-0000f80367c1")); PyModule_AddObject(m, "SID_NT_DIALUP", PyString_FromString("S-1-5-1")); + PyModule_AddObject(m, "SECINFO_BACKUP", PyInt_FromLong(SECINFO_BACKUP)); PyModule_AddObject(m, "BUILTIN_RID_BACKUP_OPERATORS", PyInt_FromLong(551)); PyModule_AddObject(m, "SEC_RIGHTS_FILE_READ", PyInt_FromLong(SEC_STD_READ_CONTROL|SEC_STD_SYNCHRONIZE|SEC_FILE_READ_DATA|SEC_FILE_READ_ATTRIBUTE|SEC_FILE_READ_EA)); PyModule_AddObject(m, "SEC_PRIV_BACKUP_BIT", PyLong_FromLongLong(SEC_PRIV_BACKUP_BIT)); @@ -2059,6 +2060,7 @@ void initsecurity(void) PyModule_AddObject(m, "GUID_DRS_BEHAVIOR_VERSION", PyString_FromString("d31a8757-2447-4545-8081-3bb610cacbf2")); PyModule_AddObject(m, "SID_NT_INTERACTIVE", PyString_FromString("S-1-5-4")); PyModule_AddObject(m, "SID_BUILTIN_POWER_USERS", PyString_FromString("S-1-5-32-547")); + PyModule_AddObject(m, "SECINFO_ATTRIBUTE", PyInt_FromLong(SECINFO_ATTRIBUTE)); PyModule_AddObject(m, "SEC_PRIV_INCREASE_BASE_PRIORITY", PyInt_FromLong(SEC_PRIV_INCREASE_BASE_PRIORITY)); PyModule_AddObject(m, "SEC_FILE_READ_EA", PyInt_FromLong(0x00000008)); PyModule_AddObject(m, "SID_WORLD_DOMAIN", PyString_FromString("S-1-1")); @@ -2117,6 +2119,7 @@ void initsecurity(void) PyModule_AddObject(m, "SID_NT_NETWORK", PyString_FromString("S-1-5-2")); PyModule_AddObject(m, "SEC_DESC_SERVER_SECURITY", PyInt_FromLong(SEC_DESC_SERVER_SECURITY)); PyModule_AddObject(m, "BUILTIN_RID_USERS", PyInt_FromLong(545)); + PyModule_AddObject(m, "SECINFO_SCOPE", PyInt_FromLong(SECINFO_SCOPE)); PyModule_AddObject(m, "SID_NT_THIS_ORGANISATION", PyString_FromString("S-1-5-15")); PyModule_AddObject(m, "SEC_ADS_DELETE_TREE", PyInt_FromLong(0x00000040)); PyModule_AddObject(m, "GUID_DRS_REPL_SYNCRONIZE", PyString_FromString("1131f6ab-9c07-11d1-f79f-00c04fc2dcd2")); diff --git a/source3/librpc/gen_ndr/security.h b/source3/librpc/gen_ndr/security.h index 3d4f0c37b9..1c781b9ef5 100644 --- a/source3/librpc/gen_ndr/security.h +++ b/source3/librpc/gen_ndr/security.h @@ -462,6 +462,9 @@ struct security_unix_token { #define SECINFO_DACL ( 0x00000004 ) #define SECINFO_SACL ( 0x00000008 ) #define SECINFO_LABEL ( 0x00000010 ) +#define SECINFO_ATTRIBUTE ( 0x00000020 ) +#define SECINFO_SCOPE ( 0x00000040 ) +#define SECINFO_BACKUP ( 0x00010000 ) #define SECINFO_UNPROTECTED_SACL ( 0x10000000 ) #define SECINFO_UNPROTECTED_DACL ( 0x20000000 ) #define SECINFO_PROTECTED_SACL ( 0x40000000 ) diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c index adeab0425d..698e96b309 100644 --- a/source3/modules/vfs_dirsort.c +++ b/source3/modules/vfs_dirsort.c @@ -30,40 +30,60 @@ static int compare_dirent (const SMB_STRUCT_DIRENT *da, const SMB_STRUCT_DIRENT struct dirsort_privates { long pos; SMB_STRUCT_DIRENT *directory_list; - long number_of_entries; - time_t mtime; + unsigned int number_of_entries; + struct timespec mtime; SMB_STRUCT_DIR *source_directory; - int fd; + files_struct *fsp; /* If open via FDOPENDIR. */ + struct smb_filename *smb_fname; /* If open via OPENDIR */ }; static void free_dirsort_privates(void **datap) { - struct dirsort_privates *data = (struct dirsort_privates *) *datap; - SAFE_FREE(data->directory_list); - SAFE_FREE(data); - *datap = NULL; - - return; + TALLOC_FREE(*datap); } -static bool open_and_sort_dir (vfs_handle_struct *handle) +static bool get_sorted_dir_mtime(vfs_handle_struct *handle, + struct dirsort_privates *data, + struct timespec *ret_mtime) { - SMB_STRUCT_DIRENT *dp; - struct stat dir_stat; - long current_pos; - struct dirsort_privates *data = NULL; + int ret; + struct timespec mtime; + + if (data->fsp) { + ret = fsp_stat(data->fsp); + mtime = data->fsp->fsp_name->st.st_ex_mtime; + } else { + ret = SMB_VFS_STAT(handle->conn, data->smb_fname); + mtime = data->smb_fname->st.st_ex_mtime; + } - SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, - return false); + if (ret == -1) { + return false; + } + + *ret_mtime = mtime; + + return true; +} + +static bool open_and_sort_dir(vfs_handle_struct *handle, + struct dirsort_privates *data) +{ + unsigned int i = 0; + unsigned int total_count = 0; data->number_of_entries = 0; - if (fstat(data->fd, &dir_stat) == 0) { - data->mtime = dir_stat.st_mtime; + if (get_sorted_dir_mtime(handle, data, &data->mtime) == false) { + return false; } while (SMB_VFS_NEXT_READDIR(handle, data->source_directory, NULL) != NULL) { - data->number_of_entries++; + total_count++; + } + + if (total_count == 0) { + return false; } /* Open the underlying directory and count the number of entries @@ -71,21 +91,26 @@ static bool open_and_sort_dir (vfs_handle_struct *handle) SMB_VFS_NEXT_REWINDDIR(handle, data->source_directory); /* Set up an array and read the directory entries into it */ - SAFE_FREE(data->directory_list); /* destroy previous cache if needed */ - data->directory_list = (SMB_STRUCT_DIRENT *)SMB_MALLOC( - data->number_of_entries * sizeof(SMB_STRUCT_DIRENT)); + TALLOC_FREE(data->directory_list); /* destroy previous cache if needed */ + data->directory_list = talloc_zero_array(data, + SMB_STRUCT_DIRENT, + total_count); if (!data->directory_list) { return false; } - current_pos = data->pos; - data->pos = 0; - while ((dp = SMB_VFS_NEXT_READDIR(handle, data->source_directory, - NULL)) != NULL) { - data->directory_list[data->pos++] = *dp; + for (i = 0; i < total_count; i++) { + SMB_STRUCT_DIRENT *dp = SMB_VFS_NEXT_READDIR(handle, + data->source_directory, + NULL); + if (dp == NULL) { + break; + } + data->directory_list[i] = *dp; } + data->number_of_entries = i; + /* Sort the directory entries by name */ - data->pos = current_pos; TYPESAFE_QSORT(data->directory_list, data->number_of_entries, compare_dirent); return true; } @@ -94,33 +119,43 @@ static SMB_STRUCT_DIR *dirsort_opendir(vfs_handle_struct *handle, const char *fname, const char *mask, uint32 attr) { + NTSTATUS status; struct dirsort_privates *data = NULL; /* set up our private data about this directory */ - data = (struct dirsort_privates *)SMB_MALLOC( - sizeof(struct dirsort_privates)); - + data = talloc_zero(handle->conn, struct dirsort_privates); if (!data) { return NULL; } - data->directory_list = NULL; - data->pos = 0; + status = create_synthetic_smb_fname(data, + fname, + NULL, + NULL, + &data->smb_fname); + if (!NT_STATUS_IS_OK(status)) { + TALLOC_FREE(data); + return NULL; + } /* Open the underlying directory and count the number of entries */ data->source_directory = SMB_VFS_NEXT_OPENDIR(handle, fname, mask, attr); - data->fd = dirfd(data->source_directory); - - SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates, - struct dirsort_privates, return NULL); + if (data->source_directory == NULL) { + TALLOC_FREE(data); + return NULL; + } - if (!open_and_sort_dir(handle)) { + if (!open_and_sort_dir(handle, data)) { SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory); + TALLOC_FREE(data); return NULL; } + SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates, + struct dirsort_privates, return NULL); + return data->source_directory; } @@ -132,37 +167,33 @@ static SMB_STRUCT_DIR *dirsort_fdopendir(vfs_handle_struct *handle, struct dirsort_privates *data = NULL; /* set up our private data about this directory */ - data = (struct dirsort_privates *)SMB_MALLOC( - sizeof(struct dirsort_privates)); - + data = talloc_zero(handle->conn, struct dirsort_privates); if (!data) { return NULL; } - data->directory_list = NULL; - data->pos = 0; + data->fsp = fsp; /* Open the underlying directory and count the number of entries */ data->source_directory = SMB_VFS_NEXT_FDOPENDIR(handle, fsp, mask, attr); if (data->source_directory == NULL) { - SAFE_FREE(data); + TALLOC_FREE(data); return NULL; } - data->fd = dirfd(data->source_directory); - - SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates, - struct dirsort_privates, return NULL); - - if (!open_and_sort_dir(handle)) { + if (!open_and_sort_dir(handle, data)) { SMB_VFS_NEXT_CLOSEDIR(handle,data->source_directory); + TALLOC_FREE(data); /* fd is now closed. */ fsp->fh->fd = -1; return NULL; } + SMB_VFS_HANDLE_SET_DATA(handle, data, free_dirsort_privates, + struct dirsort_privates, return NULL); + return data->source_directory; } @@ -171,21 +202,18 @@ static SMB_STRUCT_DIRENT *dirsort_readdir(vfs_handle_struct *handle, SMB_STRUCT_STAT *sbuf) { struct dirsort_privates *data = NULL; - time_t current_mtime; - struct stat dir_stat; + struct timespec current_mtime; SMB_VFS_HANDLE_GET_DATA(handle, data, struct dirsort_privates, return NULL); - if (fstat(data->fd, &dir_stat) == -1) { + if (get_sorted_dir_mtime(handle, data, ¤t_mtime) == false) { return NULL; } - current_mtime = dir_stat.st_mtime; - /* throw away cache and re-read the directory if we've changed */ - if (current_mtime > data->mtime) { - open_and_sort_dir(handle); + if (timespec_compare(¤t_mtime, &data->mtime) > 1) { + open_and_sort_dir(handle, data); } if (data->pos >= data->number_of_entries) { diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index 7bc2832708..4aad679347 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -97,7 +97,13 @@ static int vfs_gpfs_setlease(vfs_handle_struct *handle, files_struct *fsp, return -1; if (config->leases) { + /* + * Ensure the lease owner is root to allow + * correct delivery of lease-break signals. + */ + become_root(); ret = set_gpfs_lease(fsp->fh->fd,leasetype); + unbecome_root(); } if (ret < 0) { diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 5fc3a09784..a884b2f38f 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -885,13 +885,8 @@ NTSTATUS set_sd(files_struct *fsp, struct security_descriptor *psd, /* Ensure we have at least one thing set. */ if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) { - if (security_info_sent & SECINFO_LABEL) { - /* Only consider SECINFO_LABEL if no other - bits are set. Just like W2K3 we don't - store this. */ - return NT_STATUS_OK; - } - return NT_STATUS_INVALID_PARAMETER; + /* Just like W2K3 */ + return NT_STATUS_OK; } /* Ensure we have the rights to do this. */ diff --git a/source3/smbd/oplock_linux.c b/source3/smbd/oplock_linux.c index 02bd32a3fc..82523f2dce 100644 --- a/source3/smbd/oplock_linux.c +++ b/source3/smbd/oplock_linux.c @@ -75,26 +75,33 @@ int linux_set_lease_sighandler(int fd) int linux_setlease(int fd, int leasetype) { int ret; + int saved_errno; + + /* + * Ensure the lease owner is root to allow + * correct delivery of lease-break signals. + */ + + become_root(); /* First set the signal handler. */ if (linux_set_lease_sighandler(fd) == -1) { - return -1; + saved_errno = errno; + ret = -1; + goto out; } ret = fcntl(fd, F_SETLEASE, leasetype); - if (ret == -1 && errno == EACCES) { - set_effective_capability(LEASE_CAPABILITY); - /* - * Bug 8974 - work around Linux kernel bug - * https://bugzilla.kernel.org/show_bug.cgi?id=43336. - * "fcntl(F_SETLEASE) resets signal number when - * called multiple times" - */ - if (linux_set_lease_sighandler(fd) == -1) { - return -1; - } - ret = fcntl(fd, F_SETLEASE, leasetype); + if (ret == -1) { + saved_errno = errno; } + out: + + unbecome_root(); + + if (ret == -1) { + errno = saved_errno; + } return ret; } diff --git a/source3/winbindd/idmap_ad.c b/source3/winbindd/idmap_ad.c index cf15f038ca..2b35a4f59a 100644 --- a/source3/winbindd/idmap_ad.c +++ b/source3/winbindd/idmap_ad.c @@ -457,7 +457,7 @@ again: ctx->ad_schema->posix_gidnumber_attr, &id)) { - DEBUG(1, ("Could not get unix ID\n")); + DEBUG(1, ("Could not get SID for unix ID %u\n", (unsigned) id)); continue; } @@ -654,7 +654,8 @@ again: ctx->ad_schema->posix_gidnumber_attr, &id)) { - DEBUG(1, ("Could not get unix ID\n")); + DEBUG(1, ("Could not get unix ID for SID %s\n", + sid_string_dbg(map->sid))); continue; } if (!idmap_unix_id_is_in_range(id, dom)) { |