diff options
| author | bubulle <bubulle@alioth.debian.org> | 2011-08-04 17:59:25 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2011-08-04 17:59:25 +0000 |
| commit | 5f021ee1efe415ba8fe4281d0622204a68074ea8 (patch) | |
| tree | 9ccde4ed2f20a5e26910688cacf3293db18a8a22 | |
| parent | a0ecb11ef617c1d7de971588add58492f9cf7832 (diff) | |
| download | samba-5f021ee1efe415ba8fe4281d0622204a68074ea8.tar.gz | |
Load samba-3.5.11 into branches/samba/upstream.upstream/3.5.11_dfsg
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@3868 fc4039ab-9d04-0410-8cac-899223bdd6b0
115 files changed, 490 insertions, 228 deletions
diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 2f75a9ae43..36dfb70d95 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -1,4 +1,78 @@ ============================== + Release Notes for Samba 3.5.11 + August 4, 2011 + ============================== + + +This is the latest stable release of Samba 3.5. + +Major enhancements in Samba 3.5.11 include: + +o Fix access to Samba shares when Windows security patch KB2536276 is installed + (bug #7460). +o Fix DoS in Winbind and smbd with many file descriptors open (bug #7949). +o Fix Winbind panics if verify_idpool() fails (bug #8253). + + +Changes since 3.5.10: +-------------------- + + +o Jeremy Allison <jra@samba.org> + * BUG 7462: Make SA_RESETHAND conditional on its existance. + * BUG 8254: Make "acl check permissions = no" working in all cases. + + +o Gregor Beck <gbeck@sernet.de> + * BUG 8253: Fix Winbind panics if verify_idpool() fails. + + +o David Disseldorp <ddiss@suse.de> + * BUG 8269: Stop spamming log with "Could not find child X -- ignoring" + messages in smbd. + + +o Björn Jacke <bj@sernet.de> + * BUG 7460: Include sys/file.h only when available. + + +o Volker Lendecke <vl@samba.org> + * BUG 7841: Explicitly pass domain_sid to wbint_LookupRids(). + * BUG 8238: Fix access to Samba shares when Windows security patch + KB2536276 is installed. + * BUG 8322: Add HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR. + + +o Stefan Metzmacher <metze@samba.org> + * BUG 7841: Make WINBINDD_LOOKUPRIDS ask the right domain. + * BUG 7949: Fix DoS in Winbind and smbd with many file descriptors open. + * BUG 8276: Close all sockets attached to a subnet in close_subnet(). + + +###################################################################### +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.5 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.5.10 July 26, 2011 ============================== @@ -53,8 +127,8 @@ database (https://bugzilla.samba.org/). ====================================================================== -Release notes for older releases follow: ----------------------------------------- +---------------------------------------------------------------------- + ============================= Release Notes for Samba 3.5.9 @@ -69,7 +143,21 @@ Major enhancements in Samba 3.5.9 include: o Sgid bit lost on folder rename (bug #7996). o ACL can get lost when files are being renamed (bug #7987). o Respect "allow trusted domains = no" in Winbind (bug #6966). +o Samba now follows Windows behaviour as a Kerberos client, + requesting a CIFS/ ticket (bug #7893). + +New Kerberos behaviour +---------------------- +A new parameter 'client use spnego principal' defaults to 'no' and +mean Samba will use CIFS/hostname to obtain a kerberos ticket, acting +more like Windows when using Kerberos against a CIFS server in +smbclient, winbind and other Samba client tools. This will change +which servers we will successfully negotiate kerberos connections to. +This is due to Samba no longer trusting a server-provided hint which +is not available from Windows 2008 or later. For correct operation +with all clients, all aliases for a server should be recorded as a as +a servicePrincipalName on the server's record in AD. Changes since 3.5.8: -------------------- diff --git a/docs-xml/Makefile b/docs-xml/Makefile index 40a6c7b610..40aa16108b 100644 --- a/docs-xml/Makefile +++ b/docs-xml/Makefile @@ -181,7 +181,15 @@ $(TEXINFODIR)/%.info: $(TEXINFODIR)/%.texi $(MAKEINFO) --no-validate --force -o $@ "$<" # Manpages -$(MANPAGEDIR3)/smb.conf.5.xml: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml +$(MANPAGEDIR3)/smb.conf.5.xml: parameters + +# The phony parameters target exists in order to always create the +# the parameters xml files. Otherwise, when parameters.*.xml does not exist +# yet, the parameters are not generated when smb.conf.5.xml is newer than +# any smbdotconf/*/*.xml file ... +.PHONY: parameters + +parameters: $(SMBDOTCONFDOC)/parameters.all.xml $(SMBDOTCONFDOC)/parameters.service.xml $(SMBDOTCONFDOC)/parameters.global.xml $(SMBDOTCONFDOC)/parameters.all.xml: $(wildcard $(SMBDOTCONFDOC)/*/*.xml) $(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC)/generate-file-list.sh $(SMBDOTCONFDOC) > $@ diff --git a/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml new file mode 100644 index 0000000000..6ec1eb1116 --- /dev/null +++ b/docs-xml/smbdotconf/security/clientusepsnegoprincipal.xml @@ -0,0 +1,28 @@ +<samba:parameter name="client use spnego principal" + context="G" + type="boolean" + advanced="1" developer="1" + xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> +<description> + <para>This parameter determines whether or not + <citerefentry><refentrytitle>smbclient</refentrytitle> + <manvolnum>8</manvolnum></citerefentry> and other samba components + acting as a client will attempt to use the server-supplied + principal sometimes given in the SPNEGO exchange.</para> + + <para>If enabled, Samba can attempt to use Kerberos to contact + servers known only by IP address. Kerberos relies on names, so + ordinarily cannot function in this situation. </para> + + <para>If disabled, Samba will use the name used to look up the + server when asking the KDC for a ticket. This avoids situations + where a server may impersonate another, soliciting authentication + as one principal while being known on the network as another. + </para> + + <para>Note that Windows XP SP2 and later versions already follow + this behaviour, and Windows Vista and later servers no longer + supply this 'rfc4178 hint' principal on the server side.</para> +</description> +<value type="default">no</value> +</samba:parameter> diff --git a/docs/manpages/cifs.upcall.8 b/docs/manpages/cifs.upcall.8 index 136eabd333..caa8b3eb6c 100644 --- a/docs/manpages/cifs.upcall.8 +++ b/docs/manpages/cifs.upcall.8 @@ -2,12 +2,12 @@ .\" Title: cifs.upcall .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "CIFS\&.UPCALL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "CIFS\&.UPCALL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/eventlogadm.8 b/docs/manpages/eventlogadm.8 index 5445683d32..19e4b514d4 100644 --- a/docs/manpages/eventlogadm.8 +++ b/docs/manpages/eventlogadm.8 @@ -2,12 +2,12 @@ .\" Title: eventlogadm .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "EVENTLOGADM" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "EVENTLOGADM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1 index 8d5f4c67e7..a265746790 100644 --- a/docs/manpages/findsmb.1 +++ b/docs/manpages/findsmb.1 @@ -2,12 +2,12 @@ .\" Title: findsmb .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "FINDSMB" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "FINDSMB" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ad.8 b/docs/manpages/idmap_ad.8 index 33b4940654..7a67bad04e 100644 --- a/docs/manpages/idmap_ad.8 +++ b/docs/manpages/idmap_ad.8 @@ -2,12 +2,12 @@ .\" Title: idmap_ad .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_AD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_AD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_adex.8 b/docs/manpages/idmap_adex.8 index 19eaceaa91..f94183469e 100644 --- a/docs/manpages/idmap_adex.8 +++ b/docs/manpages/idmap_adex.8 @@ -2,12 +2,12 @@ .\" Title: idmap_adex .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_ADEX" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_ADEX" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_hash.8 b/docs/manpages/idmap_hash.8 index b6c38854ed..2e36895c6e 100644 --- a/docs/manpages/idmap_hash.8 +++ b/docs/manpages/idmap_hash.8 @@ -2,12 +2,12 @@ .\" Title: idmap_hash .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_HASH" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_HASH" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_ldap.8 b/docs/manpages/idmap_ldap.8 index 5e36d8c077..2591f02ace 100644 --- a/docs/manpages/idmap_ldap.8 +++ b/docs/manpages/idmap_ldap.8 @@ -2,12 +2,12 @@ .\" Title: idmap_ldap .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_LDAP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_LDAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_nss.8 b/docs/manpages/idmap_nss.8 index 09db9f80de..41edda29ca 100644 --- a/docs/manpages/idmap_nss.8 +++ b/docs/manpages/idmap_nss.8 @@ -2,12 +2,12 @@ .\" Title: idmap_nss .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_NSS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_NSS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_rid.8 b/docs/manpages/idmap_rid.8 index 7ca57dddf8..e4de6bfeed 100644 --- a/docs/manpages/idmap_rid.8 +++ b/docs/manpages/idmap_rid.8 @@ -2,12 +2,12 @@ .\" Title: idmap_rid .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_RID" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_RID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb.8 b/docs/manpages/idmap_tdb.8 index a1658b1d68..e3a5a96f0b 100644 --- a/docs/manpages/idmap_tdb.8 +++ b/docs/manpages/idmap_tdb.8 @@ -2,12 +2,12 @@ .\" Title: idmap_tdb .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/idmap_tdb2.8 b/docs/manpages/idmap_tdb2.8 index b00bf7b565..77655bd8a2 100644 --- a/docs/manpages/idmap_tdb2.8 +++ b/docs/manpages/idmap_tdb2.8 @@ -2,12 +2,12 @@ .\" Title: idmap_tdb2 .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "IDMAP_TDB2" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "IDMAP_TDB2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldb.3 b/docs/manpages/ldb.3 index 2d67fb1548..321bb24fcc 100644 --- a/docs/manpages/ldb.3 +++ b/docs/manpages/ldb.3 @@ -2,12 +2,12 @@ .\" Title: ldb .\" Author: [see the "Author" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: C Library Functions .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDB" "3" "06/14/2011" "Samba 3\&.5" "C Library Functions" +.TH "LDB" "3" "08/02/2011" "Samba 3\&.5" "C Library Functions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbadd.1 b/docs/manpages/ldbadd.1 index e45b7e8653..a9cc5b7c7a 100644 --- a/docs/manpages/ldbadd.1 +++ b/docs/manpages/ldbadd.1 @@ -2,12 +2,12 @@ .\" Title: ldbadd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBADD" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBADD" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbdel.1 b/docs/manpages/ldbdel.1 index e8abbb9420..82bb03539b 100644 --- a/docs/manpages/ldbdel.1 +++ b/docs/manpages/ldbdel.1 @@ -2,12 +2,12 @@ .\" Title: ldbdel .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBDEL" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBDEL" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbedit.1 b/docs/manpages/ldbedit.1 index bfb4e8d733..6bde727a36 100644 --- a/docs/manpages/ldbedit.1 +++ b/docs/manpages/ldbedit.1 @@ -2,12 +2,12 @@ .\" Title: ldbedit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBEDIT" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBEDIT" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbmodify.1 b/docs/manpages/ldbmodify.1 index c7fb86a8e4..fbd36b0052 100644 --- a/docs/manpages/ldbmodify.1 +++ b/docs/manpages/ldbmodify.1 @@ -2,12 +2,12 @@ .\" Title: ldbmodify .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBMODIFY" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBMODIFY" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbrename.1 b/docs/manpages/ldbrename.1 index cbc3b2144f..38b7794ce5 100644 --- a/docs/manpages/ldbrename.1 +++ b/docs/manpages/ldbrename.1 @@ -2,12 +2,12 @@ .\" Title: ldbrename .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBRENAME" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBRENAME" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ldbsearch.1 b/docs/manpages/ldbsearch.1 index 3b07b8da7c..de375bfdc7 100644 --- a/docs/manpages/ldbsearch.1 +++ b/docs/manpages/ldbsearch.1 @@ -2,12 +2,12 @@ .\" Title: ldbsearch .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LDBSEARCH" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LDBSEARCH" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/libsmbclient.7 b/docs/manpages/libsmbclient.7 index e635594075..c0eb5735b2 100644 --- a/docs/manpages/libsmbclient.7 +++ b/docs/manpages/libsmbclient.7 @@ -2,12 +2,12 @@ .\" Title: libsmbclient .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: 7 .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LIBSMBCLIENT" "7" "06/14/2011" "Samba 3\&.5" "7" +.TH "LIBSMBCLIENT" "7" "08/02/2011" "Samba 3\&.5" "7" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5 index 87510e5f9b..8308610a40 100644 --- a/docs/manpages/lmhosts.5 +++ b/docs/manpages/lmhosts.5 @@ -2,12 +2,12 @@ .\" Title: lmhosts .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: File Formats and Conventions .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LMHOSTS" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions" +.TH "LMHOSTS" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/log2pcap.1 b/docs/manpages/log2pcap.1 index 77a656546d..b2f4ac114c 100644 --- a/docs/manpages/log2pcap.1 +++ b/docs/manpages/log2pcap.1 @@ -2,12 +2,12 @@ .\" Title: log2pcap .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "LOG2PCAP" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "LOG2PCAP" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/mount.cifs.8 b/docs/manpages/mount.cifs.8 index ce79f31633..81cf3fae00 100644 --- a/docs/manpages/mount.cifs.8 +++ b/docs/manpages/mount.cifs.8 @@ -2,12 +2,12 @@ .\" Title: mount.cifs .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "MOUNT\&.CIFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "MOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/net.8 b/docs/manpages/net.8 index 5d59d55cc0..49bdc19008 100644 --- a/docs/manpages/net.8 +++ b/docs/manpages/net.8 @@ -2,12 +2,12 @@ .\" Title: net .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "NET" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "NET" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8 index 934e2a7e29..21e823d4f6 100644 --- a/docs/manpages/nmbd.8 +++ b/docs/manpages/nmbd.8 @@ -2,12 +2,12 @@ .\" Title: nmbd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "NMBD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "NMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1 index 8f767a104d..b2b4382880 100644 --- a/docs/manpages/nmblookup.1 +++ b/docs/manpages/nmblookup.1 @@ -2,12 +2,12 @@ .\" Title: nmblookup .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "NMBLOOKUP" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "NMBLOOKUP" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1 index 4723edc3c7..b4eb1f290d 100644 --- a/docs/manpages/ntlm_auth.1 +++ b/docs/manpages/ntlm_auth.1 @@ -2,12 +2,12 @@ .\" Title: ntlm_auth .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "NTLM_AUTH" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "NTLM_AUTH" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pam_winbind.8 b/docs/manpages/pam_winbind.8 index 5935531077..4ccb16ddee 100644 --- a/docs/manpages/pam_winbind.8 +++ b/docs/manpages/pam_winbind.8 @@ -2,12 +2,12 @@ .\" Title: pam_winbind .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: 8 .\" Source: Samba 3.5 .\" Language: English .\" -.TH "PAM_WINBIND" "8" "06/14/2011" "Samba 3\&.5" "8" +.TH "PAM_WINBIND" "8" "08/02/2011" "Samba 3\&.5" "8" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pam_winbind.conf.5 b/docs/manpages/pam_winbind.conf.5 index 68049679dc..7dc8a73aba 100644 --- a/docs/manpages/pam_winbind.conf.5 +++ b/docs/manpages/pam_winbind.conf.5 @@ -2,12 +2,12 @@ .\" Title: pam_winbind.conf .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: 5 .\" Source: Samba 3.6 .\" Language: English .\" -.TH "PAM_WINBIND\&.CONF" "5" "06/14/2011" "Samba 3\&.6" "5" +.TH "PAM_WINBIND\&.CONF" "5" "08/02/2011" "Samba 3\&.6" "5" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8 index 8e258098c6..ae4333cebf 100644 --- a/docs/manpages/pdbedit.8 +++ b/docs/manpages/pdbedit.8 @@ -2,12 +2,12 @@ .\" Title: pdbedit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "PDBEDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "PDBEDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/profiles.1 b/docs/manpages/profiles.1 index 3a15d10a81..abc46a7945 100644 --- a/docs/manpages/profiles.1 +++ b/docs/manpages/profiles.1 @@ -2,12 +2,12 @@ .\" Title: profiles .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "PROFILES" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "PROFILES" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1 index 6c290627de..54b3b6241b 100644 --- a/docs/manpages/rpcclient.1 +++ b/docs/manpages/rpcclient.1 @@ -2,12 +2,12 @@ .\" Title: rpcclient .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "RPCCLIENT" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "RPCCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7 index 260ee79ffa..96a52295df 100644 --- a/docs/manpages/samba.7 +++ b/docs/manpages/samba.7 @@ -2,12 +2,12 @@ .\" Title: samba .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: Miscellanea .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SAMBA" "7" "06/14/2011" "Samba 3\&.5" "Miscellanea" +.TH "SAMBA" "7" "08/02/2011" "Samba 3\&.5" "Miscellanea" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/sharesec.1 b/docs/manpages/sharesec.1 index f52688fafd..f376bc2402 100644 --- a/docs/manpages/sharesec.1 +++ b/docs/manpages/sharesec.1 @@ -2,12 +2,12 @@ .\" Title: sharesec .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SHARESEC" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SHARESEC" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5 index 27311d2399..a43ac4cecb 100644 --- a/docs/manpages/smb.conf.5 +++ b/docs/manpages/smb.conf.5 @@ -2,12 +2,12 @@ .\" Title: smb.conf .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: File Formats and Conventions .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMB\&.CONF" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions" +.TH "SMB\&.CONF" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- @@ -1900,6 +1900,24 @@ Default: \fI\fIclient signing\fR\fR\fI = \fR\fIauto\fR\fI \fR .RE +client use spnego principal (G) +.\" client use spnego principal +.PP +.RS 4 +This parameter determines whether or not +\fBsmbclient\fR(8) +and other samba components acting as a client will attempt to use the server\-supplied principal sometimes given in the SPNEGO exchange\&. +.sp +If enabled, Samba can attempt to use Kerberos to contact servers known only by IP address\&. Kerberos relies on names, so ordinarily cannot function in this situation\&. +.sp +If disabled, Samba will use the name used to look up the server when asking the KDC for a ticket\&. This avoids situations where a server may impersonate another, soliciting authentication as one principal while being known on the network as another\&. +.sp +Note that Windows XP SP2 and later versions already follow this behaviour, and Windows Vista and later servers no longer supply this \'rfc4178 hint\' principal on the server side\&. +.sp +Default: +\fI\fIclient use spnego principal\fR\fR\fI = \fR\fIno\fR\fI \fR +.RE + client use spnego (G) .\" client use spnego .PP diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1 index cf4386a8e7..b4cab791c8 100644 --- a/docs/manpages/smbcacls.1 +++ b/docs/manpages/smbcacls.1 @@ -2,12 +2,12 @@ .\" Title: smbcacls .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBCACLS" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBCACLS" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1 index cb1a721d04..bd8ac13175 100644 --- a/docs/manpages/smbclient.1 +++ b/docs/manpages/smbclient.1 @@ -2,12 +2,12 @@ .\" Title: smbclient .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBCLIENT" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBCLIENT" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1 index 4a59754d09..8df5462596 100644 --- a/docs/manpages/smbcontrol.1 +++ b/docs/manpages/smbcontrol.1 @@ -2,12 +2,12 @@ .\" Title: smbcontrol .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBCONTROL" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBCONTROL" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1 index 19a6011f7a..ab06826d98 100644 --- a/docs/manpages/smbcquotas.1 +++ b/docs/manpages/smbcquotas.1 @@ -2,12 +2,12 @@ .\" Title: smbcquotas .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBCQUOTAS" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBCQUOTAS" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8 index 113a1ec277..8ab4f94922 100644 --- a/docs/manpages/smbd.8 +++ b/docs/manpages/smbd.8 @@ -2,12 +2,12 @@ .\" Title: smbd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "SMBD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbget.1 b/docs/manpages/smbget.1 index 9027415bdb..863dbe6740 100644 --- a/docs/manpages/smbget.1 +++ b/docs/manpages/smbget.1 @@ -2,12 +2,12 @@ .\" Title: smbget .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBGET" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBGET" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbgetrc.5 b/docs/manpages/smbgetrc.5 index 09ded0c083..8784b6a7d4 100644 --- a/docs/manpages/smbgetrc.5 +++ b/docs/manpages/smbgetrc.5 @@ -2,12 +2,12 @@ .\" Title: smbgetrc .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: File Formats and Conventions .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBGETRC" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions" +.TH "SMBGETRC" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5 index 8c35b6833e..1d86913f0c 100644 --- a/docs/manpages/smbpasswd.5 +++ b/docs/manpages/smbpasswd.5 @@ -2,12 +2,12 @@ .\" Title: smbpasswd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: File Formats and Conventions .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBPASSWD" "5" "06/14/2011" "Samba 3\&.5" "File Formats and Conventions" +.TH "SMBPASSWD" "5" "08/02/2011" "Samba 3\&.5" "File Formats and Conventions" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8 index d23cbb07d2..c7b06f0485 100644 --- a/docs/manpages/smbpasswd.8 +++ b/docs/manpages/smbpasswd.8 @@ -2,12 +2,12 @@ .\" Title: smbpasswd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBPASSWD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "SMBPASSWD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8 index 3e675b3d6c..858b87f5db 100644 --- a/docs/manpages/smbspool.8 +++ b/docs/manpages/smbspool.8 @@ -2,12 +2,12 @@ .\" Title: smbspool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBSPOOL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "SMBSPOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1 index 284260c2de..23370dbde3 100644 --- a/docs/manpages/smbstatus.1 +++ b/docs/manpages/smbstatus.1 @@ -2,12 +2,12 @@ .\" Title: smbstatus .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBSTATUS" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBSTATUS" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1 index 1c3b818f3e..571ddbf471 100644 --- a/docs/manpages/smbtar.1 +++ b/docs/manpages/smbtar.1 @@ -2,12 +2,12 @@ .\" Title: smbtar .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBTAR" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBTAR" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1 index 16721bcbdc..1275e7aa27 100644 --- a/docs/manpages/smbtree.1 +++ b/docs/manpages/smbtree.1 @@ -2,12 +2,12 @@ .\" Title: smbtree .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMBTREE" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "SMBTREE" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8 index 8775b7e3fc..579180e947 100644 --- a/docs/manpages/swat.8 +++ b/docs/manpages/swat.8 @@ -2,12 +2,12 @@ .\" Title: swat .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SWAT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "SWAT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbbackup.8 b/docs/manpages/tdbbackup.8 index 6eb72895a1..5cd42a99ff 100644 --- a/docs/manpages/tdbbackup.8 +++ b/docs/manpages/tdbbackup.8 @@ -2,12 +2,12 @@ .\" Title: tdbbackup .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "TDBBACKUP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "TDBBACKUP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbdump.8 b/docs/manpages/tdbdump.8 index 2ec1fbc7b9..9065d24f09 100644 --- a/docs/manpages/tdbdump.8 +++ b/docs/manpages/tdbdump.8 @@ -2,12 +2,12 @@ .\" Title: tdbdump .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "TDBDUMP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "TDBDUMP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/tdbtool.8 b/docs/manpages/tdbtool.8 index c827eb2812..29e1866b58 100644 --- a/docs/manpages/tdbtool.8 +++ b/docs/manpages/tdbtool.8 @@ -2,12 +2,12 @@ .\" Title: tdbtool .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "TDBTOOL" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "TDBTOOL" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1 index 5b72960bf9..6dbbd92ffd 100644 --- a/docs/manpages/testparm.1 +++ b/docs/manpages/testparm.1 @@ -2,12 +2,12 @@ .\" Title: testparm .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "TESTPARM" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "TESTPARM" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/umount.cifs.8 b/docs/manpages/umount.cifs.8 index b0909eb5dc..bf7008d918 100644 --- a/docs/manpages/umount.cifs.8 +++ b/docs/manpages/umount.cifs.8 @@ -2,12 +2,12 @@ .\" Title: umount.cifs .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "UMOUNT\&.CIFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "UMOUNT\&.CIFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_acl_tdb.8 b/docs/manpages/vfs_acl_tdb.8 index 300ae8b2e6..736f65e9f0 100644 --- a/docs/manpages/vfs_acl_tdb.8 +++ b/docs/manpages/vfs_acl_tdb.8 @@ -2,12 +2,12 @@ .\" Title: vfs_acl_tdb .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_ACL_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_ACL_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_acl_xattr.8 b/docs/manpages/vfs_acl_xattr.8 index 7ba4d6f9ca..2387edcba7 100644 --- a/docs/manpages/vfs_acl_xattr.8 +++ b/docs/manpages/vfs_acl_xattr.8 @@ -2,12 +2,12 @@ .\" Title: vfs_acl_xattr .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_ACL_XATTR" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_ACL_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_audit.8 b/docs/manpages/vfs_audit.8 index 44c6dbca8c..6b802d7b3a 100644 --- a/docs/manpages/vfs_audit.8 +++ b/docs/manpages/vfs_audit.8 @@ -2,12 +2,12 @@ .\" Title: vfs_audit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cacheprime.8 b/docs/manpages/vfs_cacheprime.8 index 32be6c9f2d..e9aea3c766 100644 --- a/docs/manpages/vfs_cacheprime.8 +++ b/docs/manpages/vfs_cacheprime.8 @@ -2,12 +2,12 @@ .\" Title: vfs_cacheprime .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_CACHEPRIME" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_CACHEPRIME" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_cap.8 b/docs/manpages/vfs_cap.8 index 23a9e48a4a..edcd96216a 100644 --- a/docs/manpages/vfs_cap.8 +++ b/docs/manpages/vfs_cap.8 @@ -2,12 +2,12 @@ .\" Title: vfs_cap .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_CAP" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_CAP" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_catia.8 b/docs/manpages/vfs_catia.8 index f4c217b4b4..c697fb915f 100644 --- a/docs/manpages/vfs_catia.8 +++ b/docs/manpages/vfs_catia.8 @@ -2,12 +2,12 @@ .\" Title: vfs_catia .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_CATIA" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_CATIA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_commit.8 b/docs/manpages/vfs_commit.8 index e962861b78..5eb28fa306 100644 --- a/docs/manpages/vfs_commit.8 +++ b/docs/manpages/vfs_commit.8 @@ -2,12 +2,12 @@ .\" Title: vfs_commit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_COMMIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_COMMIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_default_quota.8 b/docs/manpages/vfs_default_quota.8 index 766461c73b..0977c2b854 100644 --- a/docs/manpages/vfs_default_quota.8 +++ b/docs/manpages/vfs_default_quota.8 @@ -2,12 +2,12 @@ .\" Title: vfs_default_quota .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_DEFAULT_QUOTA" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_DEFAULT_QUOTA" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_dirsort.8 b/docs/manpages/vfs_dirsort.8 index 95563f1e85..ca52664f1d 100644 --- a/docs/manpages/vfs_dirsort.8 +++ b/docs/manpages/vfs_dirsort.8 @@ -2,12 +2,12 @@ .\" Title: vfs_dirsort .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_DIRSORT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_DIRSORT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_extd_audit.8 b/docs/manpages/vfs_extd_audit.8 index cccbe9734d..ec63a54433 100644 --- a/docs/manpages/vfs_extd_audit.8 +++ b/docs/manpages/vfs_extd_audit.8 @@ -2,12 +2,12 @@ .\" Title: vfs_extd_audit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_EXTD_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_EXTD_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fake_perms.8 b/docs/manpages/vfs_fake_perms.8 index df8d2bc1a2..9381202754 100644 --- a/docs/manpages/vfs_fake_perms.8 +++ b/docs/manpages/vfs_fake_perms.8 @@ -2,12 +2,12 @@ .\" Title: vfs_fake_perms .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_FAKE_PERMS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_FAKE_PERMS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_fileid.8 b/docs/manpages/vfs_fileid.8 index 2cfdb63ac7..895c6390e1 100644 --- a/docs/manpages/vfs_fileid.8 +++ b/docs/manpages/vfs_fileid.8 @@ -2,12 +2,12 @@ .\" Title: vfs_fileid .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_FILEID" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_FILEID" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_full_audit.8 b/docs/manpages/vfs_full_audit.8 index f3ba7c74ac..0e4fd3de0b 100644 --- a/docs/manpages/vfs_full_audit.8 +++ b/docs/manpages/vfs_full_audit.8 @@ -2,12 +2,12 @@ .\" Title: vfs_full_audit .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_FULL_AUDIT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_FULL_AUDIT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_gpfs.8 b/docs/manpages/vfs_gpfs.8 index 82640b02c4..e137ca4375 100644 --- a/docs/manpages/vfs_gpfs.8 +++ b/docs/manpages/vfs_gpfs.8 @@ -2,12 +2,12 @@ .\" Title: vfs_gpfs .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_GPFS" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_GPFS" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_netatalk.8 b/docs/manpages/vfs_netatalk.8 index fd2b70d92e..1ef0dd13eb 100644 --- a/docs/manpages/vfs_netatalk.8 +++ b/docs/manpages/vfs_netatalk.8 @@ -2,12 +2,12 @@ .\" Title: vfs_netatalk .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_NETATALK" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_NETATALK" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_notify_fam.8 b/docs/manpages/vfs_notify_fam.8 index 29afd3827e..cb8e49b490 100644 --- a/docs/manpages/vfs_notify_fam.8 +++ b/docs/manpages/vfs_notify_fam.8 @@ -2,12 +2,12 @@ .\" Title: vfs_notify_fam .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_NOTIFY_FAM" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_NOTIFY_FAM" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_prealloc.8 b/docs/manpages/vfs_prealloc.8 index 359d8fcae5..025034328d 100644 --- a/docs/manpages/vfs_prealloc.8 +++ b/docs/manpages/vfs_prealloc.8 @@ -2,12 +2,12 @@ .\" Title: vfs_prealloc .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_PREALLOC" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_PREALLOC" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_preopen.8 b/docs/manpages/vfs_preopen.8 index 039cdfbf8d..282cad89f3 100644 --- a/docs/manpages/vfs_preopen.8 +++ b/docs/manpages/vfs_preopen.8 @@ -2,12 +2,12 @@ .\" Title: vfs_preopen .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_PREOPEN" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_PREOPEN" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readahead.8 b/docs/manpages/vfs_readahead.8 index 0555c907f7..2e406c34d7 100644 --- a/docs/manpages/vfs_readahead.8 +++ b/docs/manpages/vfs_readahead.8 @@ -2,12 +2,12 @@ .\" Title: vfs_readahead .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_READAHEAD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_READAHEAD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_readonly.8 b/docs/manpages/vfs_readonly.8 index b0bb4e1b38..8eccf2ab4c 100644 --- a/docs/manpages/vfs_readonly.8 +++ b/docs/manpages/vfs_readonly.8 @@ -2,12 +2,12 @@ .\" Title: vfs_readonly .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_READONLY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_READONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_recycle.8 b/docs/manpages/vfs_recycle.8 index 54245a8a85..dd913a01d4 100644 --- a/docs/manpages/vfs_recycle.8 +++ b/docs/manpages/vfs_recycle.8 @@ -2,12 +2,12 @@ .\" Title: vfs_recycle .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_RECYCLE" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_RECYCLE" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_scannedonly.8 b/docs/manpages/vfs_scannedonly.8 index 1c083161c9..19a0fe7ff0 100644 --- a/docs/manpages/vfs_scannedonly.8 +++ b/docs/manpages/vfs_scannedonly.8 @@ -2,12 +2,12 @@ .\" Title: vfs_scannedonly .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_SCANNEDONLY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_SCANNEDONLY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy.8 b/docs/manpages/vfs_shadow_copy.8 index 7cf595de8e..65ba062c89 100644 --- a/docs/manpages/vfs_shadow_copy.8 +++ b/docs/manpages/vfs_shadow_copy.8 @@ -2,12 +2,12 @@ .\" Title: vfs_shadow_copy .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_SHADOW_COPY" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_SHADOW_COPY" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_shadow_copy2.8 b/docs/manpages/vfs_shadow_copy2.8 index c4ca0e7cfa..404dd80eb2 100644 --- a/docs/manpages/vfs_shadow_copy2.8 +++ b/docs/manpages/vfs_shadow_copy2.8 @@ -2,12 +2,12 @@ .\" Title: vfs_shadow_copy2 .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_SHADOW_COPY2" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_SHADOW_COPY2" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_smb_traffic_analyzer.8 b/docs/manpages/vfs_smb_traffic_analyzer.8 index c2b20df93a..def1140233 100644 --- a/docs/manpages/vfs_smb_traffic_analyzer.8 +++ b/docs/manpages/vfs_smb_traffic_analyzer.8 @@ -2,12 +2,12 @@ .\" Title: smb_traffic_analyzer .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "SMB_TRAFFIC_ANALYZER" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "SMB_TRAFFIC_ANALYZER" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_depot.8 b/docs/manpages/vfs_streams_depot.8 index 6e3ad6ebe3..5485d9fa58 100644 --- a/docs/manpages/vfs_streams_depot.8 +++ b/docs/manpages/vfs_streams_depot.8 @@ -2,12 +2,12 @@ .\" Title: vfs_streams_depot .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_STREAMS_DEPOT" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_STREAMS_DEPOT" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_streams_xattr.8 b/docs/manpages/vfs_streams_xattr.8 index 9f9cae02c8..89566cc344 100644 --- a/docs/manpages/vfs_streams_xattr.8 +++ b/docs/manpages/vfs_streams_xattr.8 @@ -2,12 +2,12 @@ .\" Title: vfs_streams_xattr .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_STREAMS_XATTR" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_STREAMS_XATTR" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfs_xattr_tdb.8 b/docs/manpages/vfs_xattr_tdb.8 index 936ae7e409..5626b0001b 100644 --- a/docs/manpages/vfs_xattr_tdb.8 +++ b/docs/manpages/vfs_xattr_tdb.8 @@ -2,12 +2,12 @@ .\" Title: vfs_xattr_tdb .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFS_XATTR_TDB" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "VFS_XATTR_TDB" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1 index 3c39ed253f..f630e03f33 100644 --- a/docs/manpages/vfstest.1 +++ b/docs/manpages/vfstest.1 @@ -2,12 +2,12 @@ .\" Title: vfstest .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "VFSTEST" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "VFSTEST" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1 index b9153b82c4..72ddbceee3 100644 --- a/docs/manpages/wbinfo.1 +++ b/docs/manpages/wbinfo.1 @@ -2,12 +2,12 @@ .\" Title: wbinfo .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: User Commands .\" Source: Samba 3.5 .\" Language: English .\" -.TH "WBINFO" "1" "06/14/2011" "Samba 3\&.5" "User Commands" +.TH "WBINFO" "1" "08/02/2011" "Samba 3\&.5" "User Commands" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/winbind_krb5_locator.7 b/docs/manpages/winbind_krb5_locator.7 index 45cbd0eef8..d0c34f2f3d 100644 --- a/docs/manpages/winbind_krb5_locator.7 +++ b/docs/manpages/winbind_krb5_locator.7 @@ -2,12 +2,12 @@ .\" Title: winbind_krb5_locator .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: 7 .\" Source: Samba 3.5 .\" Language: English .\" -.TH "WINBIND_KRB5_LOCATOR" "7" "06/14/2011" "Samba 3\&.5" "7" +.TH "WINBIND_KRB5_LOCATOR" "7" "08/02/2011" "Samba 3\&.5" "7" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8 index ab6ce57948..0e74f560cb 100644 --- a/docs/manpages/winbindd.8 +++ b/docs/manpages/winbindd.8 @@ -2,12 +2,12 @@ .\" Title: winbindd .\" Author: [see the "AUTHOR" section] .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/> -.\" Date: 06/14/2011 +.\" Date: 08/02/2011 .\" Manual: System Administration tools .\" Source: Samba 3.5 .\" Language: English .\" -.TH "WINBINDD" "8" "06/14/2011" "Samba 3\&.5" "System Administration tools" +.TH "WINBINDD" "8" "08/02/2011" "Samba 3\&.5" "System Administration tools" .\" ----------------------------------------------------------------- .\" * set default formatting .\" ----------------------------------------------------------------- diff --git a/lib/replace/system/config.m4 b/lib/replace/system/config.m4 index 39c2f58283..b8568a5165 100644 --- a/lib/replace/system/config.m4 +++ b/lib/replace/system/config.m4 @@ -1,7 +1,7 @@ # filesys AC_HEADER_DIRENT AC_CHECK_HEADERS(fcntl.h sys/fcntl.h sys/resource.h sys/ioctl.h sys/mode.h sys/filio.h sys/fs/s5param.h sys/filsys.h) -AC_CHECK_HEADERS(sys/acl.h acl/libacl.h) +AC_CHECK_HEADERS(sys/acl.h acl/libacl.h sys/file.h) # select AC_CHECK_HEADERS(sys/select.h) diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h index 22e3d23f3e..6cf2dd287a 100644 --- a/lib/replace/system/filesys.h +++ b/lib/replace/system/filesys.h @@ -77,7 +77,9 @@ #include <sys/filio.h> #endif +#ifdef HAVE_SYS_FILE_H #include <sys/file.h> +#endif #ifdef HAVE_FCNTL_H #include <fcntl.h> diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h index 79583ad2ab..497f5597a7 100644 --- a/lib/replace/system/wait.h +++ b/lib/replace/system/wait.h @@ -44,10 +44,6 @@ #include <setjmp.h> #endif -#ifndef SA_RESETHAND -#define SA_RESETHAND SA_ONESHOT -#endif - #if !defined(HAVE_SIG_ATOMIC_T_TYPE) typedef int sig_atomic_t; #endif diff --git a/lib/tevent/testsuite.c b/lib/tevent/testsuite.c index f9aca91aa1..41f7345721 100644 --- a/lib/tevent/testsuite.c +++ b/lib/tevent/testsuite.c @@ -101,7 +101,9 @@ static bool test_event_context(struct torture_context *test, #ifdef SA_RESTART se1 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESTART, count_handler, &alarm_count); #endif +#ifdef SA_RESETHAND se2 = event_add_signal(ev_ctx, ev_ctx, SIGALRM, SA_RESETHAND, count_handler, &alarm_count); +#endif #ifdef SA_SIGINFO se3 = event_add_signal(ev_ctx, ev_ctx, SIGUSR1, SA_SIGINFO, count_handler, &info_count); #endif diff --git a/lib/tevent/tevent_signal.c b/lib/tevent/tevent_signal.c index 45f65cf6dd..2e9f20a671 100644 --- a/lib/tevent/tevent_signal.c +++ b/lib/tevent/tevent_signal.c @@ -355,16 +355,20 @@ int tevent_common_check_signal(struct tevent_context *ev) (void*)&sig_state->sig_info[i][ofs], se->private_data); } +#ifdef SA_RESETHAND if (se->sa_flags & SA_RESETHAND) { talloc_free(se); } +#endif continue; } #endif se->handler(ev, se, i, count, NULL, se->private_data); +#ifdef SA_RESETHAND if (se->sa_flags & SA_RESETHAND) { talloc_free(se); } +#endif } #ifdef SA_SIGINFO diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec index efb7572b56..cce1ee0988 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.5.10 +Version: 3.5.11 Release: 1GITHASH Epoch: 0 License: GNU GPL version 3 diff --git a/packaging/RHEL/makerpms.sh b/packaging/RHEL/makerpms.sh index cb72f5205b..06679ce06b 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.5.10' +VERSION='3.5.11' REVISION='' SPECFILE="samba.spec" RPMVER=`rpm --version | awk '{print $3}'` diff --git a/packaging/RHEL/samba.spec b/packaging/RHEL/samba.spec index 3c70de6810..0a528dfc9b 100644 --- a/packaging/RHEL/samba.spec +++ b/packaging/RHEL/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.5.10 +Version: 3.5.11 Release: 1 Epoch: 0 License: GNU GPL version 3 diff --git a/source3/VERSION b/source3/VERSION index b6c1cd139d..3558afcd37 100644 --- a/source3/VERSION +++ b/source3/VERSION @@ -25,7 +25,7 @@ ######################################################## SAMBA_VERSION_MAJOR=3 SAMBA_VERSION_MINOR=5 -SAMBA_VERSION_RELEASE=10 +SAMBA_VERSION_RELEASE=11 ######################################################## # Bug fix releases use a letter for the patch revision # diff --git a/source3/configure b/source3/configure index 1df2d8bb04..3fbf2ecabd 100755 --- a/source3/configure +++ b/source3/configure @@ -9621,7 +9621,7 @@ fi done -for ac_header in sys/acl.h acl/libacl.h +for ac_header in sys/acl.h acl/libacl.h sys/file.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -16332,6 +16332,34 @@ $as_echo "#define HAVE_STAT_DOS_FLAGS 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can compile with __attribute__((destructor))" >&5 +$as_echo_n "checking whether we can compile with __attribute__((destructor))... " >&6; } +if test "${samba_cv_function_attribute_destructor+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + __attribute__((destructor)) + static void cleanup(void) { } + +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + samba_cv_function_attribute_destructor=yes +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $samba_cv_function_attribute_destructor" >&5 +$as_echo "$samba_cv_function_attribute_destructor" >&6; } + +if test x"$samba_cv_function_attribute_destructor" = xyes ; then + +$as_echo "#define HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR 1" >>confdefs.h + +fi + ##################################### # needed for SRV lookups { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dn_expand in -lresolv" >&5 diff --git a/source3/configure.in b/source3/configure.in index 2c9fe1e7c4..24945936d9 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1331,6 +1331,22 @@ if test x"$samba_cv_stat_dos_flags" = x"yes" ; then AC_DEFINE(HAVE_STAT_DOS_FLAGS, 1, [whether there is DOS flags support in the stat struct]) fi +AC_CACHE_CHECK([whether we can compile with __attribute__((destructor))], + samba_cv_function_attribute_destructor, + [ + AC_COMPILE_IFELSE( + [ + __attribute__((destructor)) + static void cleanup(void) { } + ], + samba_cv_function_attribute_destructor=yes) + ]) + +if test x"$samba_cv_function_attribute_destructor" = xyes ; then + AC_DEFINE(HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR, 1, + [whether we can compile with __attribute__((destructor))]) +fi + ##################################### # needed for SRV lookups AC_CHECK_LIB(resolv, dn_expand) diff --git a/source3/include/config.h.in b/source3/include/config.h.in index b7bd8929c8..0352821548 100644 --- a/source3/include/config.h.in +++ b/source3/include/config.h.in @@ -707,6 +707,9 @@ /* Truncate extend */ #undef HAVE_FTRUNCATE_EXTEND +/* whether we can compile with __attribute__((destructor)) */ +#undef HAVE_FUNCTION_ATTRIBUTE_DESTRUCTOR + /* Whether there is a __FUNCTION__ macro */ #undef HAVE_FUNCTION_MACRO diff --git a/source3/include/version.h b/source3/include/version.h index e1296ee0c2..465755c9e8 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 5 -#define SAMBA_VERSION_RELEASE 10 -#define SAMBA_VERSION_OFFICIAL_STRING "3.5.10" +#define SAMBA_VERSION_RELEASE 11 +#define SAMBA_VERSION_OFFICIAL_STRING "3.5.11" #ifdef SAMBA_VERSION_VENDOR_FUNCTION # define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION #else /* SAMBA_VERSION_VENDOR_FUNCTION */ diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c index 7aa36bac0b..c2ac343273 100644 --- a/source3/lib/smbldap.c +++ b/source3/lib/smbldap.c @@ -1093,8 +1093,9 @@ static int rebindproc_connect (LDAP * ld, LDAP_CONST char *url, int request, /******************************************************************* connect to the ldap server under system privilege. ******************************************************************/ -static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_struct) +static int smbldap_connect_system(struct smbldap_state *ldap_state) { + LDAP *ldap_struct = ldap_state->ldap_struct; int rc; int version; @@ -1105,7 +1106,8 @@ static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_ /* get the default dn and password only if they are not set already */ if (!fetch_ldap_pw(&bind_dn, &bind_secret)) { DEBUG(0, ("ldap_connect_system: Failed to retrieve password from secrets.tdb\n")); - return LDAP_INVALID_CREDENTIALS; + rc = LDAP_INVALID_CREDENTIALS; + goto done; } smbldap_set_creds(ldap_state, false, bind_dn, bind_secret); SAFE_FREE(bind_dn); @@ -1151,7 +1153,7 @@ static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_ ld_error ? ld_error : "(unknown)")); SAFE_FREE(ld_error); ldap_state->num_failures++; - return rc; + goto done; } ldap_state->num_failures = 0; @@ -1166,6 +1168,11 @@ static int smbldap_connect_system(struct smbldap_state *ldap_state, LDAP * ldap_ DEBUG(3, ("ldap_connect_system: successful connection to the LDAP server\n")); DEBUGADD(10, ("ldap_connect_system: LDAP server %s support paged results\n", ldap_state->paged_results ? "does" : "does not")); +done: + if (rc != 0) { + ldap_unbind(ldap_struct); + ldap_state->ldap_struct = NULL; + } return rc; } @@ -1220,9 +1227,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) return rc; } - if ((rc = smbldap_connect_system(ldap_state, ldap_state->ldap_struct))) { - ldap_unbind(ldap_state->ldap_struct); - ldap_state->ldap_struct = NULL; + if ((rc = smbldap_connect_system(ldap_state))) { return rc; } @@ -1234,7 +1239,7 @@ static int smbldap_open(struct smbldap_state *ldap_state) if (ldap_state->event_context != NULL) { ldap_state->idle_event = event_add_timed( - ldap_state->event_context, NULL, + ldap_state->event_context, ldap_state, timeval_current_ofs(SMBLDAP_IDLE_TIME, 0), smbldap_idle_fn, ldap_state); } @@ -1259,6 +1264,8 @@ static NTSTATUS smbldap_close(struct smbldap_state *ldap_state) smbldap_delete_state(ldap_state); + TALLOC_FREE(ldap_state->idle_event); + DEBUG(5,("The connection to the LDAP server was closed\n")); /* maybe free the results here --metze */ @@ -1745,7 +1752,7 @@ static void smbldap_idle_fn(struct event_context *event_ctx, DEBUG(10,("ldap connection not idle...\n")); state->idle_event = event_add_timed( - event_ctx, NULL, + event_ctx, state, timeval_add(&now, SMBLDAP_IDLE_TIME, 0), smbldap_idle_fn, private_data); @@ -1771,13 +1778,17 @@ void smbldap_free_struct(struct smbldap_state **ldap_state) SAFE_FREE((*ldap_state)->bind_dn); SAFE_FREE((*ldap_state)->bind_secret); - TALLOC_FREE((*ldap_state)->idle_event); - - *ldap_state = NULL; + TALLOC_FREE(*ldap_state); /* No need to free any further, as it is talloc()ed */ } +static int smbldap_state_destructor(struct smbldap_state *state) +{ + smbldap_free_struct(&state); + return 0; +} + /********************************************************************** Intitalise the 'general' ldap structures, on which ldap operations may be conducted @@ -1801,6 +1812,7 @@ NTSTATUS smbldap_init(TALLOC_CTX *mem_ctx, struct event_context *event_ctx, (*smbldap_state)->event_context = event_ctx; + talloc_set_destructor(*smbldap_state, smbldap_state_destructor); return NT_STATUS_OK; } diff --git a/source3/librpc/gen_ndr/cli_wbint.c b/source3/librpc/gen_ndr/cli_wbint.c index 7200d2ac94..bf6b04b504 100644 --- a/source3/librpc/gen_ndr/cli_wbint.c +++ b/source3/librpc/gen_ndr/cli_wbint.c @@ -2508,6 +2508,7 @@ static void rpccli_wbint_LookupRids_done(struct tevent_req *subreq); struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct rpc_pipe_client *cli, + struct dom_sid *_domain_sid /* [in] [ref] */, struct wbint_RidArray *_rids /* [in] [ref] */, const char **_domain_name /* [out] [ref,charset(UTF8)] */, struct wbint_Principals *_names /* [out] [ref] */) @@ -2525,6 +2526,7 @@ struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx, state->dispatch_recv = cli->dispatch_recv; /* In parameters */ + state->orig.in.domain_sid = _domain_sid; state->orig.in.rids = _rids; /* Out parameters */ @@ -2614,6 +2616,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req, NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, + struct dom_sid *domain_sid /* [in] [ref] */, struct wbint_RidArray *rids /* [in] [ref] */, const char **domain_name /* [out] [ref,charset(UTF8)] */, struct wbint_Principals *names /* [out] [ref] */) @@ -2622,6 +2625,7 @@ NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli, NTSTATUS status; /* In parameters */ + r.in.domain_sid = domain_sid; r.in.rids = rids; status = cli->dispatch(cli, diff --git a/source3/librpc/gen_ndr/cli_wbint.h b/source3/librpc/gen_ndr/cli_wbint.h index c4f9a813bb..64708169f9 100644 --- a/source3/librpc/gen_ndr/cli_wbint.h +++ b/source3/librpc/gen_ndr/cli_wbint.h @@ -223,6 +223,7 @@ NTSTATUS rpccli_wbint_DsGetDcName(struct rpc_pipe_client *cli, struct tevent_req *rpccli_wbint_LookupRids_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct rpc_pipe_client *cli, + struct dom_sid *_domain_sid /* [in] [ref] */, struct wbint_RidArray *_rids /* [in] [ref] */, const char **_domain_name /* [out] [ref,charset(UTF8)] */, struct wbint_Principals *_names /* [out] [ref] */); @@ -231,6 +232,7 @@ NTSTATUS rpccli_wbint_LookupRids_recv(struct tevent_req *req, NTSTATUS *result); NTSTATUS rpccli_wbint_LookupRids(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, + struct dom_sid *domain_sid /* [in] [ref] */, struct wbint_RidArray *rids /* [in] [ref] */, const char **domain_name /* [out] [ref,charset(UTF8)] */, struct wbint_Principals *names /* [out] [ref] */); diff --git a/source3/librpc/gen_ndr/ndr_wbint.c b/source3/librpc/gen_ndr/ndr_wbint.c index 5bb68324f1..27c668ea98 100644 --- a/source3/librpc/gen_ndr/ndr_wbint.c +++ b/source3/librpc/gen_ndr/ndr_wbint.c @@ -2076,6 +2076,10 @@ _PUBLIC_ void ndr_print_wbint_DsGetDcName(struct ndr_print *ndr, const char *nam static enum ndr_err_code ndr_push_wbint_LookupRids(struct ndr_push *ndr, int flags, const struct wbint_LookupRids *r) { if (flags & NDR_IN) { + if (r->in.domain_sid == NULL) { + return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); + } + NDR_CHECK(ndr_push_dom_sid(ndr, NDR_SCALARS, r->in.domain_sid)); if (r->in.rids == NULL) { return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer"); } @@ -2104,6 +2108,7 @@ static enum ndr_err_code ndr_push_wbint_LookupRids(struct ndr_push *ndr, int fla static enum ndr_err_code ndr_pull_wbint_LookupRids(struct ndr_pull *ndr, int flags, struct wbint_LookupRids *r) { uint32_t _ptr_domain_name; + TALLOC_CTX *_mem_save_domain_sid_0; TALLOC_CTX *_mem_save_rids_0; TALLOC_CTX *_mem_save_domain_name_0; TALLOC_CTX *_mem_save_domain_name_1; @@ -2112,6 +2117,13 @@ static enum ndr_err_code ndr_pull_wbint_LookupRids(struct ndr_pull *ndr, int fla ZERO_STRUCT(r->out); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { + NDR_PULL_ALLOC(ndr, r->in.domain_sid); + } + _mem_save_domain_sid_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->in.domain_sid, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_dom_sid(ndr, NDR_SCALARS, r->in.domain_sid)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_domain_sid_0, LIBNDR_FLAG_REF_ALLOC); + if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->in.rids); } _mem_save_rids_0 = NDR_PULL_GET_MEM_CTX(ndr); @@ -2170,6 +2182,10 @@ _PUBLIC_ void ndr_print_wbint_LookupRids(struct ndr_print *ndr, const char *name if (flags & NDR_IN) { ndr_print_struct(ndr, "in", "wbint_LookupRids"); ndr->depth++; + ndr_print_ptr(ndr, "domain_sid", r->in.domain_sid); + ndr->depth++; + ndr_print_dom_sid(ndr, "domain_sid", r->in.domain_sid); + ndr->depth--; ndr_print_ptr(ndr, "rids", r->in.rids); ndr->depth++; ndr_print_wbint_RidArray(ndr, "rids", r->in.rids); diff --git a/source3/librpc/gen_ndr/wbint.h b/source3/librpc/gen_ndr/wbint.h index 2add7fc7e3..4ba45ad783 100644 --- a/source3/librpc/gen_ndr/wbint.h +++ b/source3/librpc/gen_ndr/wbint.h @@ -276,6 +276,7 @@ struct wbint_DsGetDcName { struct wbint_LookupRids { struct { + struct dom_sid *domain_sid;/* [ref] */ struct wbint_RidArray *rids;/* [ref] */ } in; diff --git a/source3/librpc/idl/wbint.idl b/source3/librpc/idl/wbint.idl index d12fae8a83..3258a3286a 100644 --- a/source3/librpc/idl/wbint.idl +++ b/source3/librpc/idl/wbint.idl @@ -140,6 +140,7 @@ interface wbint ); NTSTATUS wbint_LookupRids( + [in] dom_sid *domain_sid, [in] wbint_RidArray *rids, [out,string,charset(UTF8)] char **domain_name, [out] wbint_Principals *names diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c index 0eafb2cabe..e53eebb006 100644 --- a/source3/nmbd/nmbd_packets.c +++ b/source3/nmbd/nmbd_packets.c @@ -1729,19 +1729,23 @@ only use %d.\n", count, FD_SETSIZE)); for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) { if (subrec->nmb_sock < 0 || subrec->nmb_sock >= FD_SETSIZE) { /* We have to ignore sockets outside FD_SETSIZE. */ - continue; + sock_array[num++] = -1; + } else { + FD_SET(subrec->nmb_sock,pset); + sock_array[num++] = subrec->nmb_sock; + *maxfd = MAX( *maxfd, subrec->nmb_sock); } - FD_SET(subrec->nmb_sock,pset); - sock_array[num++] = subrec->nmb_sock; - *maxfd = MAX( *maxfd, subrec->nmb_sock); if (subrec->nmb_bcast < 0 || subrec->nmb_bcast >= FD_SETSIZE) { /* We have to ignore sockets outside FD_SETSIZE. */ - continue; + sock_array[num++] = -1; + } else { + sock_array[num++] = subrec->nmb_bcast; + if (subrec->nmb_bcast != -1) { + FD_SET(subrec->nmb_bcast,pset); + *maxfd = MAX( *maxfd, subrec->nmb_bcast); + } } - sock_array[num++] = subrec->nmb_bcast; - FD_SET(subrec->nmb_bcast,pset); - *maxfd = MAX( *maxfd, subrec->nmb_bcast); } /* Add in the lp_socket_address() interface on 138. */ @@ -1761,23 +1765,27 @@ only use %d.\n", count, FD_SETSIZE)); for (subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec)) { if (subrec->dgram_sock < 0 || subrec->dgram_sock >= FD_SETSIZE) { /* We have to ignore sockets outside FD_SETSIZE. */ - continue; + sock_array[num++] = -1; + } else { + FD_SET(subrec->dgram_sock,pset); + sock_array[num++] = subrec->dgram_sock; + *maxfd = MAX( *maxfd, subrec->dgram_sock); } - FD_SET(subrec->dgram_sock,pset); - sock_array[num++] = subrec->dgram_sock; - *maxfd = MAX( *maxfd, subrec->dgram_sock); if (subrec->dgram_bcast < 0 || subrec->dgram_bcast >= FD_SETSIZE) { /* We have to ignore sockets outside FD_SETSIZE. */ - continue; - } - sock_array[num++] = subrec->dgram_bcast; - if (subrec->dgram_bcast != -1) { - FD_SET(subrec->dgram_bcast,pset); - *maxfd = MAX( *maxfd, subrec->dgram_bcast); + sock_array[num++] = -1; + } else { + sock_array[num++] = subrec->dgram_bcast; + if (subrec->dgram_bcast != -1) { + FD_SET(subrec->dgram_bcast,pset); + *maxfd = MAX( *maxfd, subrec->dgram_bcast); + } } } + SMB_ASSERT(count == num); + *listen_number = count; SAFE_FREE(*ppset); diff --git a/source3/nmbd/nmbd_subnetdb.c b/source3/nmbd/nmbd_subnetdb.c index 703e229052..48dbe66e30 100644 --- a/source3/nmbd/nmbd_subnetdb.c +++ b/source3/nmbd/nmbd_subnetdb.c @@ -55,13 +55,21 @@ yet and it may be in use by a response record void close_subnet(struct subnet_record *subrec) { + if (subrec->nmb_sock != -1) { + close(subrec->nmb_sock); + subrec->nmb_sock = -1; + } + if (subrec->nmb_bcast != -1) { + close(subrec->nmb_bcast); + subrec->nmb_bcast = -1; + } if (subrec->dgram_sock != -1) { close(subrec->dgram_sock); subrec->dgram_sock = -1; } - if (subrec->nmb_sock != -1) { - close(subrec->nmb_sock); - subrec->nmb_sock = -1; + if (subrec->dgram_bcast != -1) { + close(subrec->dgram_bcast); + subrec->dgram_bcast = -1; } DLIST_REMOVE(subnetlist, subrec); diff --git a/source3/smbd/file_access.c b/source3/smbd/file_access.c index 7d0a552956..8b669fecb8 100644 --- a/source3/smbd/file_access.c +++ b/source3/smbd/file_access.c @@ -77,6 +77,11 @@ bool can_delete_file_in_directory(connection_struct *conn, return False; } + if (!lp_acl_check_permissions(SNUM(conn))) { + /* This option means don't check. */ + return true; + } + /* Get the parent directory permission mask and owners. */ if (!parent_dirname(ctx, smb_fname->base_name, &dname, NULL)) { return False; diff --git a/source3/smbd/negprot.c b/source3/smbd/negprot.c index 81d29d90f9..51ad80d648 100644 --- a/source3/smbd/negprot.c +++ b/source3/smbd/negprot.c @@ -382,6 +382,7 @@ static void reply_nt1(struct smb_request *req, uint16 choice) reply_nterror(req, NT_STATUS_NO_MEMORY); return; } + p += ret; DEBUG(3,("not using SPNEGO\n")); } else { DATA_BLOB spnego_blob = negprot_spnego(); diff --git a/source3/smbd/open.c b/source3/smbd/open.c index aac6e9c7a8..f0b92713d7 100644 --- a/source3/smbd/open.c +++ b/source3/smbd/open.c @@ -86,6 +86,16 @@ NTSTATUS smbd_check_open_rights(struct connection_struct *conn, NTSTATUS status; struct security_descriptor *sd = NULL; + if ((access_mask & DELETE_ACCESS) && !lp_acl_check_permissions(SNUM(conn))) { + *access_granted = access_mask; + + DEBUG(10,("smbd_check_open_rights: not checking ACL " + "on DELETE_ACCESS on file %s. Granting 0x%x\n", + smb_fname_str_dbg(smb_fname), + (unsigned int)*access_granted )); + return NT_STATUS_OK; + } + status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name, (OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | @@ -2967,8 +2977,7 @@ static NTSTATUS create_file_unixpath(connection_struct *conn, /* Setting FILE_SHARE_DELETE is the hint. */ - if (lp_acl_check_permissions(SNUM(conn)) - && (create_disposition != FILE_CREATE) + if ((create_disposition != FILE_CREATE) && (access_mask & DELETE_ACCESS) && (!(can_delete_file_in_directory(conn, smb_fname) || can_access_file_acl(conn, smb_fname, DELETE_ACCESS)))) { diff --git a/source3/smbd/server.c b/source3/smbd/server.c index 11040bc6bd..201e301c1f 100644 --- a/source3/smbd/server.c +++ b/source3/smbd/server.c @@ -278,7 +278,8 @@ static void remove_child_pid(pid_t pid, bool unclean_shutdown) } } - DEBUG(0, ("Could not find child %d -- ignoring\n", (int)pid)); + /* not all forked child processes are added to the children list */ + DEBUG(1, ("Could not find child %d -- ignoring\n", (int)pid)); } /**************************************************************************** diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index b4232a90cf..b95e08e59a 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -373,7 +373,7 @@ NTSTATUS _wbint_LookupRids(pipes_struct *p, struct wbint_LookupRids *r) } status = domain->methods->rids_to_names( - domain, talloc_tos(), &domain->sid, r->in.rids->rids, + domain, talloc_tos(), r->in.domain_sid, r->in.rids->rids, r->in.rids->num_rids, &domain_name, &names, &types); if (!NT_STATUS_IS_OK(status)) { return status; @@ -388,7 +388,8 @@ NTSTATUS _wbint_LookupRids(pipes_struct *p, struct wbint_LookupRids *r) } for (i=0; i<r->in.rids->num_rids; i++) { - sid_compose(&result[i].sid, &domain->sid, r->in.rids->rids[i]); + sid_compose(&result[i].sid, r->in.domain_sid, + r->in.rids->rids[i]); result[i].type = types[i]; result[i].name = talloc_move(result, &names[i]); } diff --git a/source3/winbindd/winbindd_lookuprids.c b/source3/winbindd/winbindd_lookuprids.c index e1ac26cf29..b5e9f03e48 100644 --- a/source3/winbindd/winbindd_lookuprids.c +++ b/source3/winbindd/winbindd_lookuprids.c @@ -23,6 +23,7 @@ struct winbindd_lookuprids_state { struct tevent_context *ev; + struct dom_sid domain_sid; const char *domain_name; struct wbint_RidArray rids; struct wbint_Principals names; @@ -41,7 +42,6 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX *mem_ctx, struct tevent_req *req, *subreq; struct winbindd_lookuprids_state *state; struct winbindd_domain *domain; - struct dom_sid sid; req = tevent_req_create(mem_ctx, &state, struct winbindd_lookuprids_state); @@ -55,16 +55,16 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX *mem_ctx, DEBUG(3, ("lookuprids (%s)\n", request->data.sid)); - if (!string_to_sid(&sid, request->data.sid)) { + if (!string_to_sid(&state->domain_sid, request->data.sid)) { DEBUG(5, ("%s not a SID\n", request->data.sid)); tevent_req_nterror(req, NT_STATUS_INVALID_PARAMETER); return tevent_req_post(req, ev); } - domain = find_lookup_domain_from_sid(&sid); + domain = find_lookup_domain_from_sid(&state->domain_sid); if (domain == NULL) { DEBUG(5, ("Domain for sid %s not found\n", - sid_string_dbg(&sid))); + sid_string_dbg(&state->domain_sid))); tevent_req_nterror(req, NT_STATUS_NO_SUCH_DOMAIN); return tevent_req_post(req, ev); } @@ -83,8 +83,8 @@ struct tevent_req *winbindd_lookuprids_send(TALLOC_CTX *mem_ctx, } subreq = rpccli_wbint_LookupRids_send( - state, ev, domain->child.rpccli, &state->rids, - &state->domain_name, &state->names); + state, ev, domain->child.rpccli, &state->domain_sid, + &state->rids, &state->domain_name, &state->names); if (tevent_req_nomem(subreq, req)) { return tevent_req_post(req, ev); } |