[Pkg-samba-maint] r3877 - in branches/samba/experimental: . docs/manpages docs-xml/manpages-3 docs-xml/smbdotconf/protocol lib/replace/system lib/tevent librpc/idl packaging/RHEL packaging/RHEL-CTDB source3 source3/include source3/lib source3/librpc/gen_ndr source3/libsmb source3/modules source3/param source3/smbd source3/torture source3/web source3/winbindd
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Wed Aug 10 06:40:14 UTC 2011
Author: bubulle
Date: 2011-08-10 06:40:13 +0000 (Wed, 10 Aug 2011)
New Revision: 3877
Removed:
branches/samba/experimental/source3/torture/test_notify_online.c
Modified:
branches/samba/experimental/WHATSNEW.txt
branches/samba/experimental/docs-xml/manpages-3/idmap_tdb2.8.xml
branches/samba/experimental/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
branches/samba/experimental/docs/manpages/eventlogadm.8
branches/samba/experimental/docs/manpages/findsmb.1
branches/samba/experimental/docs/manpages/idmap_ad.8
branches/samba/experimental/docs/manpages/idmap_adex.8
branches/samba/experimental/docs/manpages/idmap_autorid.8
branches/samba/experimental/docs/manpages/idmap_hash.8
branches/samba/experimental/docs/manpages/idmap_ldap.8
branches/samba/experimental/docs/manpages/idmap_nss.8
branches/samba/experimental/docs/manpages/idmap_rid.8
branches/samba/experimental/docs/manpages/idmap_tdb.8
branches/samba/experimental/docs/manpages/idmap_tdb2.8
branches/samba/experimental/docs/manpages/libsmbclient.7
branches/samba/experimental/docs/manpages/lmhosts.5
branches/samba/experimental/docs/manpages/log2pcap.1
branches/samba/experimental/docs/manpages/net.8
branches/samba/experimental/docs/manpages/nmbd.8
branches/samba/experimental/docs/manpages/nmblookup.1
branches/samba/experimental/docs/manpages/ntlm_auth.1
branches/samba/experimental/docs/manpages/pam_winbind.8
branches/samba/experimental/docs/manpages/pam_winbind.conf.5
branches/samba/experimental/docs/manpages/pdbedit.8
branches/samba/experimental/docs/manpages/profiles.1
branches/samba/experimental/docs/manpages/rpcclient.1
branches/samba/experimental/docs/manpages/samba.7
branches/samba/experimental/docs/manpages/sharesec.1
branches/samba/experimental/docs/manpages/smb.conf.5
branches/samba/experimental/docs/manpages/smbcacls.1
branches/samba/experimental/docs/manpages/smbclient.1
branches/samba/experimental/docs/manpages/smbcontrol.1
branches/samba/experimental/docs/manpages/smbcquotas.1
branches/samba/experimental/docs/manpages/smbd.8
branches/samba/experimental/docs/manpages/smbget.1
branches/samba/experimental/docs/manpages/smbgetrc.5
branches/samba/experimental/docs/manpages/smbpasswd.5
branches/samba/experimental/docs/manpages/smbpasswd.8
branches/samba/experimental/docs/manpages/smbspool.8
branches/samba/experimental/docs/manpages/smbstatus.1
branches/samba/experimental/docs/manpages/smbta-util.8
branches/samba/experimental/docs/manpages/smbtar.1
branches/samba/experimental/docs/manpages/smbtree.1
branches/samba/experimental/docs/manpages/swat.8
branches/samba/experimental/docs/manpages/tdbbackup.8
branches/samba/experimental/docs/manpages/tdbdump.8
branches/samba/experimental/docs/manpages/tdbtool.8
branches/samba/experimental/docs/manpages/testparm.1
branches/samba/experimental/docs/manpages/vfs_acl_tdb.8
branches/samba/experimental/docs/manpages/vfs_acl_xattr.8
branches/samba/experimental/docs/manpages/vfs_audit.8
branches/samba/experimental/docs/manpages/vfs_cacheprime.8
branches/samba/experimental/docs/manpages/vfs_cap.8
branches/samba/experimental/docs/manpages/vfs_catia.8
branches/samba/experimental/docs/manpages/vfs_commit.8
branches/samba/experimental/docs/manpages/vfs_crossrename.8
branches/samba/experimental/docs/manpages/vfs_default_quota.8
branches/samba/experimental/docs/manpages/vfs_dirsort.8
branches/samba/experimental/docs/manpages/vfs_extd_audit.8
branches/samba/experimental/docs/manpages/vfs_fake_perms.8
branches/samba/experimental/docs/manpages/vfs_fileid.8
branches/samba/experimental/docs/manpages/vfs_full_audit.8
branches/samba/experimental/docs/manpages/vfs_gpfs.8
branches/samba/experimental/docs/manpages/vfs_netatalk.8
branches/samba/experimental/docs/manpages/vfs_notify_fam.8
branches/samba/experimental/docs/manpages/vfs_prealloc.8
branches/samba/experimental/docs/manpages/vfs_preopen.8
branches/samba/experimental/docs/manpages/vfs_readahead.8
branches/samba/experimental/docs/manpages/vfs_readonly.8
branches/samba/experimental/docs/manpages/vfs_recycle.8
branches/samba/experimental/docs/manpages/vfs_scannedonly.8
branches/samba/experimental/docs/manpages/vfs_shadow_copy.8
branches/samba/experimental/docs/manpages/vfs_shadow_copy2.8
branches/samba/experimental/docs/manpages/vfs_smb_traffic_analyzer.8
branches/samba/experimental/docs/manpages/vfs_streams_depot.8
branches/samba/experimental/docs/manpages/vfs_streams_xattr.8
branches/samba/experimental/docs/manpages/vfs_time_audit.8
branches/samba/experimental/docs/manpages/vfs_xattr_tdb.8
branches/samba/experimental/docs/manpages/vfstest.1
branches/samba/experimental/docs/manpages/wbinfo.1
branches/samba/experimental/docs/manpages/winbind_krb5_locator.7
branches/samba/experimental/docs/manpages/winbindd.8
branches/samba/experimental/lib/replace/system/wait.h
branches/samba/experimental/lib/tevent/testsuite.c
branches/samba/experimental/lib/tevent/tevent_signal.c
branches/samba/experimental/librpc/idl/nbt.idl
branches/samba/experimental/packaging/RHEL-CTDB/samba.spec
branches/samba/experimental/packaging/RHEL/makerpms.sh
branches/samba/experimental/packaging/RHEL/samba.spec
branches/samba/experimental/source3/VERSION
branches/samba/experimental/source3/include/local.h
branches/samba/experimental/source3/include/version.h
branches/samba/experimental/source3/lib/dbwrap_ctdb.c
branches/samba/experimental/source3/lib/events.c
branches/samba/experimental/source3/librpc/gen_ndr/nbt.h
branches/samba/experimental/source3/librpc/gen_ndr/ndr_nbt.c
branches/samba/experimental/source3/libsmb/clifsinfo.c
branches/samba/experimental/source3/libsmb/clilist.c
branches/samba/experimental/source3/modules/nfs4_acls.c
branches/samba/experimental/source3/param/loadparm.c
branches/samba/experimental/source3/smbd/aio.c
branches/samba/experimental/source3/smbd/smb2_server.c
branches/samba/experimental/source3/web/swat.c
branches/samba/experimental/source3/winbindd/idmap_tdb2.c
Log:
Merge upstreal 3.6.0
Modified: branches/samba/experimental/WHATSNEW.txt
===================================================================
--- branches/samba/experimental/WHATSNEW.txt 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/WHATSNEW.txt 2011-08-10 06:40:13 UTC (rev 3877)
@@ -1,15 +1,11 @@
- ================================
- Release Notes for Samba 3.6.0rc3
- July , 2011
- ================================
+ =============================
+ Release Notes for Samba 3.6.0
+ August 9, 2011
+ =============================
-This is the third release candidate of Samba 3.6.0. This is *not*
-intended for production environments and is designed for testing
-purposes only. Please report any defects via the Samba bug reporting
-system at https://bugzilla.samba.org/.
+This is the first release of Samba 3.6.0.
-
Major enhancements in Samba 3.6.0 include:
@@ -253,6 +249,51 @@
* Add an Endpoint Mapper daemon.
+Changes since 3.6.0rc3
+----------------------
+
+o Michael Adam <obnox at samba.org>
+ * BUG 8327: Fix the reload of the configuration, also reload activated
+ registry shares.
+ * BUG 8328: Cleanup of idmap_tdb2 code.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 7462: Make SA_RESETHAND conditional on its existance.
+ * BUG 8324: smbclient cannot list directories from a big-endian machine.
+ * BUG 8335: File copy aborts with smb2_validate_message_id: bad message_id.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8330: Fix NFSv4 ACL merging logic.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 8326: WinXP cannot join a Samba3 domain with a 'even' hostname.
+
+
+o Björn Baumbach <bb at sernet.de>
+ * BUG 8303: db_ctdb_send_schedule_for_deletion() is not defined.
+
+
+o Alban Browaeys <prahal at yahoo.com>
+ * BUG 8341: Fix segfault in libsmbclient.
+
+
+o Björn Jacke <bj at sernet.de>
+ * BUG 8362: Fix build issue on old glibc systems.
+
+
+o Volker Lendecke <vlendec at samba.org>
+ * BUG 8343: Fix SMB2 crash reading with aio_fork beyond the end of file.
+
+
+o Stefan Metzmacher <metze at samba.org>
+ * BUG 8347: Fix regression for HP-UX, AIX and OSF.
+ * BUG 8357: Make sure we grant credits on async read/write operations.
+ * BUG 8358: Fix a bug in run_poll_events().
+
+
Changes since 3.6.0rc2
----------------------
Modified: branches/samba/experimental/docs/manpages/eventlogadm.8
===================================================================
--- branches/samba/experimental/docs/manpages/eventlogadm.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/eventlogadm.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: eventlogadm
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "EVENTLOGADM" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/findsmb.1
===================================================================
--- branches/samba/experimental/docs/manpages/findsmb.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/findsmb.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: findsmb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "FINDSMB" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_ad.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_ad.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_ad.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_ad
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_AD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_adex.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_adex.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_adex.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_adex
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_ADEX" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_autorid.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_autorid.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_autorid.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_autorid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_AUTORID" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_hash.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_hash.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_hash.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_hash
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_HASH" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_ldap.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_ldap.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_ldap.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_ldap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_LDAP" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_nss.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_nss.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_nss.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_nss
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_NSS" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_rid.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_rid.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_rid.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_rid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_RID" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_tdb.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_tdb.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_tdb.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_tdb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_TDB" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/idmap_tdb2.8
===================================================================
--- branches/samba/experimental/docs/manpages/idmap_tdb2.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/idmap_tdb2.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: idmap_tdb2
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_TDB2" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -31,10 +31,21 @@
.RS 4
Defines the available matching uid and gid range for which the backend is authoritative\&.
.RE
+.PP
+script
+.RS 4
+This option can be used to configure an external program for performing id mappings instead of using the tdb counter\&. The mappings are then stored int tdb2 idmap database\&. For details see the section on IDMAP SCRIPT below\&.
+.RE
.SH "IDMAP SCRIPT"
.PP
-The tdb2 idmap backend supports a script for performing id mappings through the smb\&.conf option
-\fIidmap : script\fR\&. The script should accept the following command line options\&.
+The tdb2 idmap backend supports an external program for performing id mappings through the smb\&.conf option
+\fIidmap config * : script\fR
+or its deprecated legacy form
+\fIidmap : script\fR\&.
+.PP
+The mappings obtained by the script are then stored in the idmap tdb2 database instead of mappings created by the incrementing id counters\&. It is therefore important that the script covers the complete range of SIDs that can be passed in for SID to Unix ID mapping, since otherwise SIDs unmapped by the script might get mapped to IDs that had previously been mapped by the script\&.
+.PP
+The script should accept the following command line options\&.
.sp
.if n \{\
.RS 4
@@ -64,11 +75,9 @@
.if n \{\
.RE
.\}
-.PP
-Note that the script should cover the complete range of SIDs that can be passed in for SID to Unix ID mapping, since otherwise SIDs unmapped by the script might get mapped to IDs that had previously been mapped by the script\&.
.SH "EXAMPLES"
.PP
-This example shows how tdb2 is used as a the default idmap backend\&. It configures the idmap range through the global options for all domains encountered\&.
+This example shows how tdb2 is used as a the default idmap backend\&.
.sp
.if n \{\
.RS 4
@@ -82,6 +91,22 @@
.if n \{\
.RE
.\}
+.PP
+This example shows how tdb2 is used as a the default idmap backend using an external program via the script parameter:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+ [global]
+ idmap config * : backend = tdb2
+ idmap config * : range = 1000000\-2000000
+ idmap config * : script = /usr/local/samba/bin/idmap_script\&.sh
+
+.fi
+.if n \{\
+.RE
+.\}
.SH "AUTHOR"
.PP
The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&.
Modified: branches/samba/experimental/docs/manpages/libsmbclient.7
===================================================================
--- branches/samba/experimental/docs/manpages/libsmbclient.7 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/libsmbclient.7 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: libsmbclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: 7
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LIBSMBCLIENT" "7" "07/26/2011" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "08/08/2011" "Samba 3\&.6" "7"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/lmhosts.5
===================================================================
--- branches/samba/experimental/docs/manpages/lmhosts.5 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/lmhosts.5 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: lmhosts
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LMHOSTS" "5" "07/26/2011" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "08/08/2011" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/log2pcap.1
===================================================================
--- branches/samba/experimental/docs/manpages/log2pcap.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/log2pcap.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: log2pcap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LOG2PCAP" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/net.8
===================================================================
--- branches/samba/experimental/docs/manpages/net.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/net.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: net
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NET" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/nmbd.8
===================================================================
--- branches/samba/experimental/docs/manpages/nmbd.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/nmbd.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: nmbd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NMBD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/nmblookup.1
===================================================================
--- branches/samba/experimental/docs/manpages/nmblookup.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/nmblookup.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: nmblookup
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NMBLOOKUP" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/ntlm_auth.1
===================================================================
--- branches/samba/experimental/docs/manpages/ntlm_auth.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/ntlm_auth.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: ntlm_auth
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NTLM_AUTH" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/pam_winbind.8
===================================================================
--- branches/samba/experimental/docs/manpages/pam_winbind.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/pam_winbind.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: pam_winbind
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: 8
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PAM_WINBIND" "8" "07/26/2011" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "08/08/2011" "Samba 3\&.6" "8"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/pam_winbind.conf.5
===================================================================
--- branches/samba/experimental/docs/manpages/pam_winbind.conf.5 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/pam_winbind.conf.5 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: 5
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PAM_WINBIND\&.CONF" "5" "07/26/2011" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "08/08/2011" "Samba 3\&.6" "5"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/pdbedit.8
===================================================================
--- branches/samba/experimental/docs/manpages/pdbedit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/pdbedit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: pdbedit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PDBEDIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/profiles.1
===================================================================
--- branches/samba/experimental/docs/manpages/profiles.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/profiles.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: profiles
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PROFILES" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/rpcclient.1
===================================================================
--- branches/samba/experimental/docs/manpages/rpcclient.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/rpcclient.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: rpcclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "RPCCLIENT" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/samba.7
===================================================================
--- branches/samba/experimental/docs/manpages/samba.7 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/samba.7 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: samba
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: Miscellanea
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SAMBA" "7" "07/26/2011" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "08/08/2011" "Samba 3\&.6" "Miscellanea"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/sharesec.1
===================================================================
--- branches/samba/experimental/docs/manpages/sharesec.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/sharesec.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: sharesec
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SHARESEC" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smb.conf.5
===================================================================
--- branches/samba/experimental/docs/manpages/smb.conf.5 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smb.conf.5 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smb.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMB\&.CONF" "5" "07/26/2011" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "08/08/2011" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -9263,7 +9263,7 @@
\m[blue]\fBmax mux\fR\m[]
parameter for SMB1\&. You should never need to set this parameter\&.
.sp
-The default is 128 credits, which is the same as a Windows SMB2 server\&.
+The default is 8192 credits, which is the same as a Windows 2008R2 SMB2 server\&.
.sp
Default:
\fI\fIsmb2 max credits\fR\fR\fI = \fR\fI128\fR\fI \fR
Modified: branches/samba/experimental/docs/manpages/smbcacls.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbcacls.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbcacls.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbcacls
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCACLS" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbclient.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbclient.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbclient.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCLIENT" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbcontrol.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbcontrol.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbcontrol.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbcontrol
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCONTROL" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbcquotas.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbcquotas.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbcquotas.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbcquotas
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCQUOTAS" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbd.8
===================================================================
--- branches/samba/experimental/docs/manpages/smbd.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbd.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbget.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbget.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbget.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbget
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBGET" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbgetrc.5
===================================================================
--- branches/samba/experimental/docs/manpages/smbgetrc.5 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbgetrc.5 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbgetrc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBGETRC" "5" "07/26/2011" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "08/08/2011" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbpasswd.5
===================================================================
--- branches/samba/experimental/docs/manpages/smbpasswd.5 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbpasswd.5 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbpasswd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBPASSWD" "5" "07/26/2011" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "08/08/2011" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbpasswd.8
===================================================================
--- branches/samba/experimental/docs/manpages/smbpasswd.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbpasswd.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbpasswd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBPASSWD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbspool.8
===================================================================
--- branches/samba/experimental/docs/manpages/smbspool.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbspool.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbspool
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBSPOOL" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbstatus.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbstatus.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbstatus.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbstatus
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBSTATUS" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbta-util.8
===================================================================
--- branches/samba/experimental/docs/manpages/smbta-util.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbta-util.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbta-util
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTA\-UTIL" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbtar.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbtar.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbtar.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbtar
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTAR" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/smbtree.1
===================================================================
--- branches/samba/experimental/docs/manpages/smbtree.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/smbtree.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: smbtree
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTREE" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/swat.8
===================================================================
--- branches/samba/experimental/docs/manpages/swat.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/swat.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: swat
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SWAT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/tdbbackup.8
===================================================================
--- branches/samba/experimental/docs/manpages/tdbbackup.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/tdbbackup.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: tdbbackup
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBBACKUP" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/tdbdump.8
===================================================================
--- branches/samba/experimental/docs/manpages/tdbdump.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/tdbdump.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: tdbdump
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBDUMP" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/tdbtool.8
===================================================================
--- branches/samba/experimental/docs/manpages/tdbtool.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/tdbtool.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: tdbtool
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBTOOL" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/testparm.1
===================================================================
--- branches/samba/experimental/docs/manpages/testparm.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/testparm.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: testparm
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TESTPARM" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_acl_tdb.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_acl_tdb.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_acl_tdb.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_ACL_TDB" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_acl_xattr.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_acl_xattr.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_acl_xattr.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_ACL_XATTR" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_audit.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_audit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_audit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_AUDIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_cacheprime.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_cacheprime.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_cacheprime.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_cacheprime
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CACHEPRIME" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_cap.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_cap.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_cap.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_cap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CAP" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_catia.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_catia.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_catia.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_catia
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CATIA" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_commit.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_commit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_commit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_commit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_COMMIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_crossrename.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_crossrename.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_crossrename.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_crossrename
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CROSSRENAME" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_default_quota.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_default_quota.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_default_quota.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_DEFAULT_QUOTA" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_dirsort.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_dirsort.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_dirsort.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_dirsort
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_DIRSORT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_extd_audit.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_extd_audit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_extd_audit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_EXTD_AUDIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_fake_perms.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_fake_perms.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_fake_perms.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FAKE_PERMS" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_fileid.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_fileid.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_fileid.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_fileid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FILEID" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_full_audit.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_full_audit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_full_audit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FULL_AUDIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_gpfs.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_gpfs.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_gpfs.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_gpfs
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_GPFS" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_netatalk.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_netatalk.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_netatalk.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_netatalk
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_NETATALK" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_notify_fam.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_notify_fam.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_notify_fam.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_NOTIFY_FAM" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_prealloc.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_prealloc.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_prealloc.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_prealloc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_PREALLOC" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_preopen.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_preopen.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_preopen.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_preopen
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_PREOPEN" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_readahead.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_readahead.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_readahead.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_readahead
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_READAHEAD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_readonly.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_readonly.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_readonly.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_readonly
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_READONLY" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_recycle.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_recycle.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_recycle.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_recycle
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_RECYCLE" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_scannedonly.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_scannedonly.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_scannedonly.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_scannedonly
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SCANNEDONLY" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_shadow_copy.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_shadow_copy.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_shadow_copy.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SHADOW_COPY" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_shadow_copy2.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_shadow_copy2.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_shadow_copy2.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SHADOW_COPY2" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_smb_traffic_analyzer.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_smb_traffic_analyzer.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_streams_depot.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_streams_depot.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_streams_depot.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_STREAMS_DEPOT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_streams_xattr.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_streams_xattr.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_streams_xattr.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_STREAMS_XATTR" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_time_audit.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_time_audit.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_time_audit.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfs_time_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_TIME_AUDIT" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfs_xattr_tdb.8
===================================================================
--- branches/samba/experimental/docs/manpages/vfs_xattr_tdb.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfs_xattr_tdb.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_XATTR_TDB" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/vfstest.1
===================================================================
--- branches/samba/experimental/docs/manpages/vfstest.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/vfstest.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: vfstest
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFSTEST" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/wbinfo.1
===================================================================
--- branches/samba/experimental/docs/manpages/wbinfo.1 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/wbinfo.1 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: wbinfo
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WBINFO" "1" "07/26/2011" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "08/08/2011" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/winbind_krb5_locator.7
===================================================================
--- branches/samba/experimental/docs/manpages/winbind_krb5_locator.7 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/winbind_krb5_locator.7 2011-08-10 06:40:13 UTC (rev 3877)
@@ -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: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: 7
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "07/26/2011" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "08/08/2011" "Samba 3\&.6" "7"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs/manpages/winbindd.8
===================================================================
--- branches/samba/experimental/docs/manpages/winbindd.8 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs/manpages/winbindd.8 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,12 +2,12 @@
.\" Title: winbindd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: 07/26/2011
+.\" Date: 08/08/2011
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WINBINDD" "8" "07/26/2011" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "08/08/2011" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
Modified: branches/samba/experimental/docs-xml/manpages-3/idmap_tdb2.8.xml
===================================================================
--- branches/samba/experimental/docs-xml/manpages-3/idmap_tdb2.8.xml 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs-xml/manpages-3/idmap_tdb2.8.xml 2011-08-10 06:40:13 UTC (rev 3877)
@@ -43,6 +43,16 @@
backend is authoritative.
</para></listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>script</term>
+ <listitem><para>
+ This option can be used to configure an external program
+ for performing id mappings instead of using the tdb
+ counter. The mappings are then stored int tdb2 idmap
+ database. For details see the section on IDMAP SCRIPT below.
+ </para></listitem>
+ </varlistentry>
</variablelist>
</refsect1>
@@ -50,8 +60,21 @@
<title>IDMAP SCRIPT</title>
<para>
- The tdb2 idmap backend supports a script for performing id mappings
- through the smb.conf option <parameter>idmap : script</parameter>.
+ The tdb2 idmap backend supports an external program for performing id mappings
+ through the smb.conf option <parameter>idmap config * : script</parameter> or
+ its deprecated legacy form <parameter>idmap : script</parameter>.
+ </para>
+
+ <para>
+ The mappings obtained by the script are then stored in the idmap tdb2
+ database instead of mappings created by the incrementing id counters.
+ It is therefore important that the script covers the complete range of
+ SIDs that can be passed in for SID to Unix ID mapping, since otherwise
+ SIDs unmapped by the script might get mapped to IDs that had
+ previously been mapped by the script.
+ </para>
+
+ <para>
The script should accept the following command line options.
</para>
@@ -72,13 +95,6 @@
SID:yyyy
ERR:yyyy
</programlisting>
-
- <para>
- Note that the script should cover the complete range of SIDs
- that can be passed in for SID to Unix ID mapping, since otherwise
- SIDs unmapped by the script might get mapped to IDs that had
- previously been mapped by the script.
- </para>
</refsect1>
<refsect1>
@@ -86,8 +102,6 @@
<para>
This example shows how tdb2 is used as a the default idmap backend.
- It configures the idmap range through the global options for all
- domains encountered.
</para>
<programlisting>
@@ -95,6 +109,18 @@
idmap config * : backend = tdb2
idmap config * : range = 1000000-2000000
</programlisting>
+
+ <para>
+ This example shows how tdb2 is used as a the default idmap backend
+ using an external program via the script parameter:
+ </para>
+
+ <programlisting>
+ [global]
+ idmap config * : backend = tdb2
+ idmap config * : range = 1000000-2000000
+ idmap config * : script = /usr/local/samba/bin/idmap_script.sh
+ </programlisting>
</refsect1>
<refsect1>
Modified: branches/samba/experimental/docs-xml/smbdotconf/protocol/smb2maxcredits.xml
===================================================================
--- branches/samba/experimental/docs-xml/smbdotconf/protocol/smb2maxcredits.xml 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/docs-xml/smbdotconf/protocol/smb2maxcredits.xml 2011-08-10 06:40:13 UTC (rev 3877)
@@ -8,7 +8,7 @@
that Samba tells the client it will allow. This is similar to the <smbconfoption name="max mux"/>
parameter for SMB1. You should never need to set this parameter.
</para>
-<para>The default is 128 credits, which is the same as a Windows SMB2 server.</para>
+<para>The default is 8192 credits, which is the same as a Windows 2008R2 SMB2 server.</para>
</description>
<value type="default">128</value>
Modified: branches/samba/experimental/lib/replace/system/wait.h
===================================================================
--- branches/samba/experimental/lib/replace/system/wait.h 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/lib/replace/system/wait.h 2011-08-10 06:40:13 UTC (rev 3877)
@@ -40,10 +40,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
Modified: branches/samba/experimental/lib/tevent/testsuite.c
===================================================================
--- branches/samba/experimental/lib/tevent/testsuite.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/lib/tevent/testsuite.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -101,7 +101,9 @@
#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
Modified: branches/samba/experimental/lib/tevent/tevent_signal.c
===================================================================
--- branches/samba/experimental/lib/tevent/tevent_signal.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/lib/tevent/tevent_signal.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -355,16 +355,20 @@
(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
Modified: branches/samba/experimental/librpc/idl/nbt.idl
===================================================================
--- branches/samba/experimental/librpc/idl/nbt.idl 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/librpc/idl/nbt.idl 2011-08-10 06:40:13 UTC (rev 3877)
@@ -494,7 +494,7 @@
} nbt_netlogon_query_for_pdc;
/* response from pdc */
- typedef [flag(NDR_NOALIGN),public] struct {
+ typedef [public] struct {
netlogon_command command;
astring pdc_name;
[flag(NDR_ALIGN2)] DATA_BLOB _pad;
Modified: branches/samba/experimental/packaging/RHEL/makerpms.sh
===================================================================
--- branches/samba/experimental/packaging/RHEL/makerpms.sh 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/packaging/RHEL/makerpms.sh 2011-08-10 06:40:13 UTC (rev 3877)
@@ -20,7 +20,7 @@
USERID=`id -u`
GRPID=`id -g`
-VERSION='3.6.0rc3'
+VERSION='3.6.0'
REVISION=''
SPECFILE="samba.spec"
RPMVER=`rpm --version | awk '{print $3}'`
Modified: branches/samba/experimental/packaging/RHEL/samba.spec
===================================================================
--- branches/samba/experimental/packaging/RHEL/samba.spec 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/packaging/RHEL/samba.spec 2011-08-10 06:40:13 UTC (rev 3877)
@@ -5,7 +5,7 @@
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.0rc3
+Version: 3.6.0
Release: 1
Epoch: 0
License: GNU GPL version 3
Modified: branches/samba/experimental/packaging/RHEL-CTDB/samba.spec
===================================================================
--- branches/samba/experimental/packaging/RHEL-CTDB/samba.spec 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/packaging/RHEL-CTDB/samba.spec 2011-08-10 06:40:13 UTC (rev 3877)
@@ -5,7 +5,7 @@
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.0rc3
+Version: 3.6.0
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
Modified: branches/samba/experimental/source3/VERSION
===================================================================
--- branches/samba/experimental/source3/VERSION 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/VERSION 2011-08-10 06:40:13 UTC (rev 3877)
@@ -56,7 +56,7 @@
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=3
+SAMBA_VERSION_RC_RELEASE=
########################################################
# To mark SVN snapshots this should be set to 'yes' #
Modified: branches/samba/experimental/source3/include/local.h
===================================================================
--- branches/samba/experimental/source3/include/local.h 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/include/local.h 2011-08-10 06:40:13 UTC (rev 3877)
@@ -264,7 +264,7 @@
#define DEFAULT_SMB2_MAX_READ (1024*1024)
#define DEFAULT_SMB2_MAX_WRITE (1024*1024)
#define DEFAULT_SMB2_MAX_TRANSACT (1024*1024)
-#define DEFAULT_SMB2_MAX_CREDITS 128
+#define DEFAULT_SMB2_MAX_CREDITS 8192
#define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2
#endif
Modified: branches/samba/experimental/source3/include/version.h
===================================================================
--- branches/samba/experimental/source3/include/version.h 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/include/version.h 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2,8 +2,7 @@
#define SAMBA_VERSION_MAJOR 3
#define SAMBA_VERSION_MINOR 6
#define SAMBA_VERSION_RELEASE 0
-#define SAMBA_VERSION_RC_RELEASE 3
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.0rc3"
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.0"
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
Modified: branches/samba/experimental/source3/lib/dbwrap_ctdb.c
===================================================================
--- branches/samba/experimental/source3/lib/dbwrap_ctdb.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/lib/dbwrap_ctdb.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -911,7 +911,7 @@
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
static NTSTATUS db_ctdb_send_schedule_for_deletion(struct db_record *rec)
{
NTSTATUS status;
@@ -974,7 +974,7 @@
return status;
}
-#ifdef CTDB_CONTROL_SCHEDULE_FOR_DELETION
+#ifdef HAVE_CTDB_CONTROL_SCHEDULE_FOR_DELETION_DECL
status = db_ctdb_send_schedule_for_deletion(rec);
#endif
Modified: branches/samba/experimental/source3/lib/events.c
===================================================================
--- branches/samba/experimental/source3/lib/events.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/lib/events.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -243,6 +243,10 @@
struct pollfd *pfd;
uint16 flags = 0;
+ if ((fde->flags & (EVENT_FD_READ|EVENT_FD_WRITE)) == 0) {
+ continue;
+ }
+
if (pollfd_idx[fde->fd] >= num_pfds) {
DEBUG(1, ("internal error: pollfd_idx[fde->fd] (%d) "
">= num_pfds (%d)\n", pollfd_idx[fde->fd],
Modified: branches/samba/experimental/source3/librpc/gen_ndr/nbt.h
===================================================================
--- branches/samba/experimental/source3/librpc/gen_ndr/nbt.h 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/librpc/gen_ndr/nbt.h 2011-08-10 06:40:13 UTC (rev 3877)
@@ -554,7 +554,7 @@
uint32_t nt_version;
uint16_t lmnt_token;
uint16_t lm20_token;
-}/* [public,flag(LIBNDR_FLAG_NOALIGN)] */;
+}/* [public] */;
struct nbt_netlogon_response2 {
enum netlogon_command command;
Modified: branches/samba/experimental/source3/librpc/gen_ndr/ndr_nbt.c
===================================================================
--- branches/samba/experimental/source3/librpc/gen_ndr/ndr_nbt.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/librpc/gen_ndr/ndr_nbt.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -2229,89 +2229,79 @@
_PUBLIC_ enum ndr_err_code ndr_push_nbt_netlogon_response_from_pdc(struct ndr_push *ndr, int ndr_flags, const struct nbt_netlogon_response_from_pdc *r)
{
- {
- uint32_t _flags_save_STRUCT = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
- if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_push_align(ndr, 4));
- NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command));
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pdc_name));
- ndr->flags = _flags_save_string;
- }
- {
- uint32_t _flags_save_DATA_BLOB = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_pad));
- ndr->flags = _flags_save_DATA_BLOB;
- }
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name));
- ndr->flags = _flags_save_string;
- }
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name));
- ndr->flags = _flags_save_string;
- }
- NDR_CHECK(ndr_push_netlogon_nt_version_flags(ndr, NDR_SCALARS, r->nt_version));
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lmnt_token));
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm20_token));
- NDR_CHECK(ndr_push_trailer_align(ndr, 4));
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command));
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pdc_name));
+ ndr->flags = _flags_save_string;
}
- if (ndr_flags & NDR_BUFFERS) {
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->_pad));
+ ndr->flags = _flags_save_DATA_BLOB;
}
- ndr->flags = _flags_save_STRUCT;
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name));
+ ndr->flags = _flags_save_string;
+ }
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name));
+ ndr->flags = _flags_save_string;
+ }
+ NDR_CHECK(ndr_push_netlogon_nt_version_flags(ndr, NDR_SCALARS, r->nt_version));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lmnt_token));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lm20_token));
+ NDR_CHECK(ndr_push_trailer_align(ndr, 4));
}
+ if (ndr_flags & NDR_BUFFERS) {
+ }
return NDR_ERR_SUCCESS;
}
_PUBLIC_ enum ndr_err_code ndr_pull_nbt_netlogon_response_from_pdc(struct ndr_pull *ndr, int ndr_flags, struct nbt_netlogon_response_from_pdc *r)
{
- {
- uint32_t _flags_save_STRUCT = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
- if (ndr_flags & NDR_SCALARS) {
- NDR_CHECK(ndr_pull_align(ndr, 4));
- NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command));
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
- NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pdc_name));
- ndr->flags = _flags_save_string;
- }
- {
- uint32_t _flags_save_DATA_BLOB = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
- ndr->flags = _flags_save_DATA_BLOB;
- }
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name));
- ndr->flags = _flags_save_string;
- }
- {
- uint32_t _flags_save_string = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
- NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name));
- ndr->flags = _flags_save_string;
- }
- NDR_CHECK(ndr_pull_netlogon_nt_version_flags(ndr, NDR_SCALARS, &r->nt_version));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lmnt_token));
- NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lm20_token));
- NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command));
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pdc_name));
+ ndr->flags = _flags_save_string;
}
- if (ndr_flags & NDR_BUFFERS) {
+ {
+ uint32_t _flags_save_DATA_BLOB = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, &r->_pad));
+ ndr->flags = _flags_save_DATA_BLOB;
}
- ndr->flags = _flags_save_STRUCT;
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name));
+ ndr->flags = _flags_save_string;
+ }
+ {
+ uint32_t _flags_save_string = ndr->flags;
+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2);
+ NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name));
+ ndr->flags = _flags_save_string;
+ }
+ NDR_CHECK(ndr_pull_netlogon_nt_version_flags(ndr, NDR_SCALARS, &r->nt_version));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lmnt_token));
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lm20_token));
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
}
+ if (ndr_flags & NDR_BUFFERS) {
+ }
return NDR_ERR_SUCCESS;
}
@@ -2319,21 +2309,16 @@
{
ndr_print_struct(ndr, name, "nbt_netlogon_response_from_pdc");
if (r == NULL) { ndr_print_null(ndr); return; }
- {
- uint32_t _flags_save_STRUCT = ndr->flags;
- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN);
- ndr->depth++;
- ndr_print_netlogon_command(ndr, "command", r->command);
- ndr_print_string(ndr, "pdc_name", r->pdc_name);
- ndr_print_DATA_BLOB(ndr, "_pad", r->_pad);
- ndr_print_string(ndr, "unicode_pdc_name", r->unicode_pdc_name);
- ndr_print_string(ndr, "domain_name", r->domain_name);
- ndr_print_netlogon_nt_version_flags(ndr, "nt_version", r->nt_version);
- ndr_print_uint16(ndr, "lmnt_token", r->lmnt_token);
- ndr_print_uint16(ndr, "lm20_token", r->lm20_token);
- ndr->depth--;
- ndr->flags = _flags_save_STRUCT;
- }
+ ndr->depth++;
+ ndr_print_netlogon_command(ndr, "command", r->command);
+ ndr_print_string(ndr, "pdc_name", r->pdc_name);
+ ndr_print_DATA_BLOB(ndr, "_pad", r->_pad);
+ ndr_print_string(ndr, "unicode_pdc_name", r->unicode_pdc_name);
+ ndr_print_string(ndr, "domain_name", r->domain_name);
+ ndr_print_netlogon_nt_version_flags(ndr, "nt_version", r->nt_version);
+ ndr_print_uint16(ndr, "lmnt_token", r->lmnt_token);
+ ndr_print_uint16(ndr, "lm20_token", r->lm20_token);
+ ndr->depth--;
}
_PUBLIC_ enum ndr_err_code ndr_push_nbt_netlogon_response2(struct ndr_push *ndr, int ndr_flags, const struct nbt_netlogon_response2 *r)
Modified: branches/samba/experimental/source3/libsmb/clifsinfo.c
===================================================================
--- branches/samba/experimental/source3/libsmb/clifsinfo.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/libsmb/clifsinfo.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -472,6 +472,7 @@
uint16 setup[1];
uint8_t param[2];
uint8_t *rdata = NULL;
+ uint32_t rdata_count;
NTSTATUS status;
SSVAL(setup, 0, TRANSACT2_QFSINFO);
@@ -484,7 +485,7 @@
NULL,
NULL, 0, NULL, /* rsetup */
NULL, 0, NULL, /* rparam */
- &rdata, 56, NULL);
+ &rdata, 56, &rdata_count);
if (!NT_STATUS_IS_OK(status)) {
return status;
}
Modified: branches/samba/experimental/source3/libsmb/clilist.c
===================================================================
--- branches/samba/experimental/source3/libsmb/clilist.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/libsmb/clilist.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -573,7 +573,7 @@
state->max_matches = 1366; /* Match W2k */
- state->setup[0] = TRANSACT2_FINDFIRST;
+ SSVAL(&state->setup[0], 0, TRANSACT2_FINDFIRST);
nlen = 2*(strlen(mask)+1);
state->param = TALLOC_ARRAY(state, uint8_t, 12+nlen+2);
@@ -735,7 +735,7 @@
return;
}
- state->setup[0] = TRANSACT2_FINDNEXT;
+ SSVAL(&state->setup[0], 0, TRANSACT2_FINDNEXT);
nlen = 2*(strlen(state->mask) + 1);
Modified: branches/samba/experimental/source3/modules/nfs4_acls.c
===================================================================
--- branches/samba/experimental/source3/modules/nfs4_acls.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/modules/nfs4_acls.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -516,11 +516,8 @@
if (ace->flags == aceNew->flags &&
ace->aceType==aceNew->aceType &&
- ((ace->aceFlags&SMB_ACE4_INHERIT_ONLY_ACE)==
- (aceNew->aceFlags&SMB_ACE4_INHERIT_ONLY_ACE)) &&
- (ace->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)==
- (aceNew->aceFlags&SMB_ACE4_IDENTIFIER_GROUP)
- ) {
+ ace->aceFlags==aceNew->aceFlags)
+ {
/* keep type safety; e.g. gid is an u.short */
if (ace->flags & SMB_ACE4_ID_SPECIAL)
{
Modified: branches/samba/experimental/source3/param/loadparm.c
===================================================================
--- branches/samba/experimental/source3/param/loadparm.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/param/loadparm.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -7351,6 +7351,35 @@
return ret;
}
+/**
+ * reload those shares from registry that are already
+ * activated in the services array.
+ */
+static bool reload_registry_shares(void)
+{
+ int i;
+ bool ret = true;
+
+ for (i = 0; i < iNumServices; i++) {
+ if (!VALID(i)) {
+ continue;
+ }
+
+ if (ServicePtrs[i]->usershare == USERSHARE_VALID) {
+ continue;
+ }
+
+ ret = process_registry_service(ServicePtrs[i]->szService);
+ if (!ret) {
+ goto done;
+ }
+ }
+
+done:
+ return ret;
+}
+
+
#define MAX_INCLUDE_DEPTH 100
static uint8_t include_depth;
@@ -9599,8 +9628,12 @@
bRetval = false;
}
- if (bRetval && lp_registry_shares() && allow_registry_shares) {
- bRetval = process_registry_shares();
+ if (bRetval && lp_registry_shares()) {
+ if (allow_registry_shares) {
+ bRetval = process_registry_shares();
+ } else {
+ bRetval = reload_registry_shares();
+ }
}
lp_add_auto_services(lp_auto_services());
Modified: branches/samba/experimental/source3/smbd/aio.c
===================================================================
--- branches/samba/experimental/source3/smbd/aio.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/smbd/aio.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -779,6 +779,7 @@
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(subreq, status);
+ return errcode;
}
tevent_req_done(subreq);
@@ -812,6 +813,7 @@
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(subreq, status);
+ return errcode;
}
tevent_req_done(subreq);
Modified: branches/samba/experimental/source3/smbd/smb2_server.c
===================================================================
--- branches/samba/experimental/source3/smbd/smb2_server.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/smbd/smb2_server.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -441,21 +441,51 @@
const struct iovec *in_vector,
struct iovec *out_vector)
{
+ const uint8_t *inhdr = (const uint8_t *)in_vector->iov_base;
uint8_t *outhdr = (uint8_t *)out_vector->iov_base;
- uint16_t credits_requested = 0;
+ uint16_t credits_requested;
+ uint32_t out_flags;
uint16_t credits_granted = 0;
- if (in_vector != NULL) {
- const uint8_t *inhdr = (const uint8_t *)in_vector->iov_base;
- credits_requested = SVAL(inhdr, SMB2_HDR_CREDIT);
- }
+ credits_requested = SVAL(inhdr, SMB2_HDR_CREDIT);
+ out_flags = IVAL(outhdr, SMB2_HDR_FLAGS);
SMB_ASSERT(sconn->smb2.max_credits >= sconn->smb2.credits_granted);
- /* Remember what we gave out. */
- credits_granted = MIN(credits_requested, (sconn->smb2.max_credits -
- sconn->smb2.credits_granted));
+ if (out_flags & SMB2_HDR_FLAG_ASYNC) {
+ /*
+ * In case we already send an async interim
+ * response, we should not grant
+ * credits on the final response.
+ */
+ credits_requested = 0;
+ }
+ if (credits_requested) {
+ uint16_t modified_credits_requested;
+ uint32_t multiplier;
+
+ /*
+ * Split up max_credits into 1/16ths, and then scale
+ * the requested credits by how many 16ths have been
+ * currently granted. Less than 1/16th == grant all
+ * requested (100%), scale down as more have been
+ * granted. Never ask for less than 1 as the client
+ * asked for at least 1. JRA.
+ */
+
+ multiplier = 16 - (((sconn->smb2.credits_granted * 16) / sconn->smb2.max_credits) % 16);
+
+ modified_credits_requested = (multiplier * credits_requested) / 16;
+ if (modified_credits_requested == 0) {
+ modified_credits_requested = 1;
+ }
+
+ /* Remember what we gave out. */
+ credits_granted = MIN(modified_credits_requested,
+ (sconn->smb2.max_credits - sconn->smb2.credits_granted));
+ }
+
if (credits_granted == 0 && sconn->smb2.credits_granted == 0) {
/* First negprot packet, or ensure the client credits can
never drop to zero. */
@@ -1596,7 +1626,7 @@
/* Set credit for this operation (zero credits if this
is a final reply for an async operation). */
smb2_set_operation_credit(req->sconn,
- req->async ? NULL : &req->in.vector[i],
+ &req->in.vector[i],
&req->out.vector[i]);
if (req->do_signing) {
Deleted: branches/samba/experimental/source3/torture/test_notify_online.c
===================================================================
--- branches/samba/experimental/source3/torture/test_notify_online.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/torture/test_notify_online.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -1,294 +0,0 @@
-/*
- Unix SMB/CIFS implementation.
- Make sure that for offline files pread and pwrite trigger a notify
- Copyright (C) Volker Lendecke 2011
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "includes.h"
-#include "torture/proto.h"
-#include "libcli/security/security.h"
-#include "lib/util/tevent_ntstatus.h"
-#include "libsmb/libsmb.h"
-
-extern char *test_filename;
-
-struct notify_online_state {
- struct tevent_context *ev;
- struct cli_state *cli;
- uint16_t dnum;
- const char *fname;
- uint16_t fnum;
- bool got_notify;
-};
-
-static void notify_online_opened_dir(struct tevent_req *subreq);
-static void notify_online_notify_callback(struct tevent_req *subreq);
-static void notify_online_opened_file(struct tevent_req *subreq);
-static void notify_online_sent_read(struct tevent_req *subreq);
-static void notify_online_sent_closefile(struct tevent_req *subreq);
-static void notify_online_waited(struct tevent_req *subreq);
-static void notify_online_sent_closedir(struct tevent_req *subreq);
-
-static struct tevent_req *notify_online_send(
- TALLOC_CTX *mem_ctx, struct tevent_context *ev,
- struct cli_state *cli, const char *dname, const char *fname)
-{
- struct tevent_req *req, *subreq;
- struct notify_online_state *state;
-
- req = tevent_req_create(mem_ctx, &state, struct notify_online_state);
- if (req == NULL) {
- return NULL;
- }
- state->ev = ev;
- state->cli = cli;
- state->fname = fname;
-
- subreq = cli_ntcreate_send(
- state, ev, cli, dname, EXTENDED_RESPONSE_REQUIRED,
- SEC_FILE_READ_DATA, 0,
- FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
- FILE_OPEN, 0, 0);
- if (tevent_req_nomem(subreq, req)) {
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq, notify_online_opened_dir, req);
- return req;
-}
-
-static void notify_online_opened_dir(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
-
- status = cli_ntcreate_recv(subreq, &state->dnum);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
- subreq = cli_notify_send(state, state->ev, state->cli, state->dnum,
- 128, FILE_NOTIFY_CHANGE_ATTRIBUTES, false);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_notify_callback, req);
-
- subreq = cli_ntcreate_send(
- state, state->ev, state->cli, state->fname, 0,
- GENERIC_READ_ACCESS, FILE_ATTRIBUTE_NORMAL,
- FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE,
- FILE_OPEN, FILE_NON_DIRECTORY_FILE, 0);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_opened_file, req);
-}
-
-static void notify_online_notify_callback(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
- uint32_t num_changes;
- struct notify_change *changes;
-
- status = cli_notify_recv(subreq, state, &num_changes, &changes);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
- if ((num_changes == 1)
- && (changes[0].action == NOTIFY_ACTION_MODIFIED)
- && (strcmp(changes[0].name, state->fname) == 0)) {
- state->got_notify = true;
- }
- tevent_req_done(req);
-}
-
-static void notify_online_opened_file(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
-
- status = cli_ntcreate_recv(subreq, &state->fnum);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
- subreq = cli_read_andx_send(
- state, state->ev, state->cli, state->fnum, 0, 1);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_sent_read, req);
-}
-
-static void notify_online_sent_read(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
- ssize_t received;
- uint8_t *buf;
-
- status = cli_read_andx_recv(subreq, &received, &buf);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
- subreq = cli_close_send(
- state, state->ev, state->cli, state->fnum);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_sent_closefile, req);
-}
-
-static void notify_online_sent_closefile(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
-
- status = cli_close_recv(subreq);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
- subreq = tevent_wakeup_send(
- state, state->ev, timeval_current_ofs(10, 0));
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_waited, req);
-}
-
-static void notify_online_waited(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
-
- tevent_wakeup_recv(subreq);
- TALLOC_FREE(subreq);
- subreq = cli_close_send(
- state, state->ev, state->cli, state->dnum);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, notify_online_sent_closedir, req);
-}
-
-static void notify_online_sent_closedir(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- NTSTATUS status;
-
- status = cli_close_recv(subreq);
- TALLOC_FREE(subreq);
- if (tevent_req_nterror(req, status)) {
- return;
- }
-}
-
-static NTSTATUS notify_online_recv(struct tevent_req *req, bool *got_notify)
-{
- struct notify_online_state *state = tevent_req_data(
- req, struct notify_online_state);
- NTSTATUS status;
-
- if (tevent_req_is_nterror(req, &status)) {
- return status;
- }
- *got_notify = state->got_notify;
- return NT_STATUS_OK;
-}
-
-static NTSTATUS notify_online(struct cli_state *cli,
- const char *dirname, const char *filename,
- bool *got_notify)
-{
- TALLOC_CTX *frame = talloc_stackframe();
- struct event_context *ev;
- struct tevent_req *req;
- NTSTATUS status = NT_STATUS_NO_MEMORY;
-
- ev = event_context_init(frame);
- if (ev == NULL) {
- goto fail;
- }
- req = notify_online_send(frame, ev, cli, dirname, filename);
- if (req == NULL) {
- goto fail;
- }
- if (!tevent_req_poll_ntstatus(req, ev, &status)) {
- goto fail;
- }
- status = notify_online_recv(req, got_notify);
- fail:
- TALLOC_FREE(frame);
- return status;
-}
-
-bool run_notify_online(int dummy)
-{
- struct cli_state *cli;
- NTSTATUS status;
- char *p;
- const char *dir;
- const char *file;
- bool got_notify = false;
-
- printf("Starting NOTIFY_ONLINE\n");
-
- if (test_filename == NULL) {
- fprintf(stderr, "<-f filename> missing\n");
- return false;
- }
-
- if (!torture_open_connection(&cli, 0)) {
- return false;
- }
-
- p = strrchr(test_filename, '/');
- if (p != NULL) {
- dir = SMB_STRNDUP(test_filename, p-test_filename);
- file = SMB_STRDUP(p+1);
- } else {
- dir = "";
- file = test_filename;
- }
-
- status = notify_online(cli, dir, file, &got_notify);
- d_printf("notify_online returned %s (%d)\n", nt_errstr(status),
- (int)got_notify);
- torture_close_connection(cli);
- return NT_STATUS_IS_OK(status) && got_notify;
-}
Modified: branches/samba/experimental/source3/web/swat.c
===================================================================
--- branches/samba/experimental/source3/web/swat.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/web/swat.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -174,7 +174,7 @@
char tmp[3];
snprintf(tmp, sizeof(tmp), "%02x", token[i]);
- strncat(token_str, tmp, sizeof(tmp));
+ strlcat(token_str, tmp, sizeof(tmp));
}
}
@@ -198,16 +198,29 @@
const char *pass = cgi_user_pass();
const char *token = cgi_variable_nonull(XSRF_TOKEN);
const char *time_str = cgi_variable_nonull(XSRF_TIME);
+ char *p = NULL;
+ long long xsrf_time_ll = 0;
time_t xsrf_time = 0;
time_t now = time(NULL);
- if (sizeof(time_t) == sizeof(int)) {
- xsrf_time = atoi(time_str);
- } else if (sizeof(time_t) == sizeof(long)) {
- xsrf_time = atol(time_str);
- } else if (sizeof(time_t) == sizeof(long long)) {
- xsrf_time = atoll(time_str);
+ errno = 0;
+ xsrf_time_ll = strtoll(time_str, &p, 10);
+ if (errno != 0) {
+ return false;
}
+ if (p == NULL) {
+ return false;
+ }
+ if (PTR_DIFF(p, time_str) > strlen(time_str)) {
+ return false;
+ }
+ if (xsrf_time_ll > _TYPE_MAXIMUM(time_t)) {
+ return false;
+ }
+ if (xsrf_time_ll < _TYPE_MINIMUM(time_t)) {
+ return false;
+ }
+ xsrf_time = xsrf_time_ll;
if (abs(now - xsrf_time) > XSRF_TIMEOUT) {
return false;
Modified: branches/samba/experimental/source3/winbindd/idmap_tdb2.c
===================================================================
--- branches/samba/experimental/source3/winbindd/idmap_tdb2.c 2011-08-10 06:09:22 UTC (rev 3876)
+++ branches/samba/experimental/source3/winbindd/idmap_tdb2.c 2011-08-10 06:40:13 UTC (rev 3877)
@@ -108,12 +108,7 @@
return NT_STATUS_OK;
}
- db_path = lp_parm_talloc_string(-1, "tdb", "idmap2.tdb", NULL);
- if (db_path == NULL) {
- /* fall back to the private directory, which, despite
- its name, is usually on shared storage */
- db_path = talloc_asprintf(NULL, "%s/idmap2.tdb", lp_private_dir());
- }
+ db_path = talloc_asprintf(NULL, "%s/idmap2.tdb", lp_private_dir());
NT_STATUS_HAVE_NO_MEMORY(db_path);
/* Open idmap repository */
@@ -279,6 +274,8 @@
{
NTSTATUS ret;
struct idmap_tdb2_context *ctx;
+ char *config_option = NULL;
+ const char * idmap_script = NULL;
ctx = talloc_zero(dom, struct idmap_tdb2_context);
if ( ! ctx) {
@@ -286,27 +283,28 @@
return NT_STATUS_NO_MEMORY;
}
- if (strequal(dom->name, "*")) {
- ctx->script = lp_parm_const_string(-1, "idmap", "script", NULL);
- if (ctx->script) {
- DEBUG(1, ("using idmap script '%s'\n", ctx->script));
- }
- } else {
- char *config_option = NULL;
+ config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
+ if (config_option == NULL) {
+ DEBUG(0, ("Out of memory!\n"));
+ ret = NT_STATUS_NO_MEMORY;
+ goto failed;
+ }
+ ctx->script = lp_parm_const_string(-1, config_option, "script", "NULL");
+ talloc_free(config_option);
- config_option = talloc_asprintf(ctx, "idmap config %s", dom->name);
- if ( ! config_option) {
- DEBUG(0, ("Out of memory!\n"));
- ret = NT_STATUS_NO_MEMORY;
- goto failed;
- }
+ idmap_script = lp_parm_const_string(-1, "idmap", "script", NULL);
+ if (idmap_script != NULL) {
+ DEBUG(0, ("Warning: 'idmap:script' is deprecated. "
+ " Please use 'idmap config * : script' instead!\n"));
+ }
- ctx->script = lp_parm_const_string(-1, config_option, "script", NULL);
- if (ctx->script) {
- DEBUG(1, ("using idmap script '%s'\n", ctx->script));
- }
+ if (strequal(dom->name, "*") && ctx->script == NULL) {
+ /* fall back to idmap:script for backwards compatibility */
+ ctx->script = idmap_script;
+ }
- talloc_free(config_option);
+ if (ctx->script) {
+ DEBUG(1, ("using idmap script '%s'\n", ctx->script));
}
ctx->rw_ops = talloc_zero(ctx, struct idmap_rw_ops);
@@ -577,9 +575,6 @@
return NT_STATUS_INVALID_PARAMETER;
}
- /* final SAFE_FREE safe */
- data.dptr = NULL;
-
if (keystr == NULL) {
DEBUG(0, ("Out of memory!\n"));
ret = NT_STATUS_NO_MEMORY;
@@ -602,8 +597,6 @@
}
ret = idmap_tdb2_script(ctx, map, "IDTOSID %s", keystr);
-
- /* store it on shared storage */
if (!NT_STATUS_IS_OK(ret)) {
goto done;
}
@@ -678,7 +671,6 @@
}
ret = idmap_tdb2_script(ctx, map, "SIDTOID %s", keystr);
- /* store it on shared storage */
if (!NT_STATUS_IS_OK(ret)) {
goto done;
}
More information about the Pkg-samba-maint
mailing list