[Pkg-samba-maint] [samba] 02/05: Imported Upstream version 3.6.19
Ivo De Decker
idd-guest at alioth.debian.org
Wed Sep 25 18:13:40 UTC 2013
This is an automated email from the git hooks/post-receive script.
idd-guest pushed a commit to annotated tag debian/2%3.6.19-1
in repository samba.
commit c5c729127181bd4a1095321a90ee40104627a439
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date: Wed Sep 25 19:49:15 2013 +0200
Imported Upstream version 3.6.19
---
WHATSNEW.txt | 80 ++++++++++++++++++++++++++-
docs-xml/manpages-3/vfs_crossrename.8.xml | 20 ++++---
docs/manpages/dbwrap_tool.1 | 4 +-
docs/manpages/eventlogadm.8 | 4 +-
docs/manpages/findsmb.1 | 4 +-
docs/manpages/idmap_ad.8 | 4 +-
docs/manpages/idmap_adex.8 | 4 +-
docs/manpages/idmap_autorid.8 | 4 +-
docs/manpages/idmap_hash.8 | 4 +-
docs/manpages/idmap_ldap.8 | 4 +-
docs/manpages/idmap_nss.8 | 4 +-
docs/manpages/idmap_rid.8 | 4 +-
docs/manpages/idmap_tdb.8 | 4 +-
docs/manpages/idmap_tdb2.8 | 4 +-
docs/manpages/libsmbclient.7 | 4 +-
docs/manpages/lmhosts.5 | 4 +-
docs/manpages/log2pcap.1 | 6 +-
docs/manpages/net.8 | 6 +-
docs/manpages/nmbd.8 | 6 +-
docs/manpages/nmblookup.1 | 6 +-
docs/manpages/ntlm_auth.1 | 6 +-
docs/manpages/pam_winbind.8 | 4 +-
docs/manpages/pam_winbind.conf.5 | 4 +-
docs/manpages/pdbedit.8 | 6 +-
docs/manpages/profiles.1 | 6 +-
docs/manpages/rpcclient.1 | 6 +-
docs/manpages/samba.7 | 4 +-
docs/manpages/sharesec.1 | 6 +-
docs/manpages/smb.conf.5 | 4 +-
docs/manpages/smbcacls.1 | 6 +-
docs/manpages/smbclient.1 | 6 +-
docs/manpages/smbcontrol.1 | 6 +-
docs/manpages/smbcquotas.1 | 6 +-
docs/manpages/smbd.8 | 6 +-
docs/manpages/smbget.1 | 4 +-
docs/manpages/smbgetrc.5 | 4 +-
docs/manpages/smbpasswd.5 | 4 +-
docs/manpages/smbpasswd.8 | 4 +-
docs/manpages/smbspool.8 | 4 +-
docs/manpages/smbstatus.1 | 6 +-
docs/manpages/smbta-util.8 | 4 +-
docs/manpages/smbtar.1 | 4 +-
docs/manpages/smbtree.1 | 6 +-
docs/manpages/swat.8 | 6 +-
docs/manpages/tdbbackup.8 | 4 +-
docs/manpages/tdbdump.8 | 4 +-
docs/manpages/tdbtool.8 | 4 +-
docs/manpages/testparm.1 | 6 +-
docs/manpages/vfs_acl_tdb.8 | 4 +-
docs/manpages/vfs_acl_xattr.8 | 4 +-
docs/manpages/vfs_aio_fork.8 | 4 +-
docs/manpages/vfs_aio_pthread.8 | 4 +-
docs/manpages/vfs_audit.8 | 4 +-
docs/manpages/vfs_cacheprime.8 | 4 +-
docs/manpages/vfs_cap.8 | 4 +-
docs/manpages/vfs_catia.8 | 4 +-
docs/manpages/vfs_commit.8 | 4 +-
docs/manpages/vfs_crossrename.8 | 36 ++++++------
docs/manpages/vfs_default_quota.8 | 4 +-
docs/manpages/vfs_dirsort.8 | 4 +-
docs/manpages/vfs_extd_audit.8 | 4 +-
docs/manpages/vfs_fake_perms.8 | 4 +-
docs/manpages/vfs_fileid.8 | 4 +-
docs/manpages/vfs_full_audit.8 | 4 +-
docs/manpages/vfs_gpfs.8 | 4 +-
docs/manpages/vfs_netatalk.8 | 4 +-
docs/manpages/vfs_notify_fam.8 | 4 +-
docs/manpages/vfs_prealloc.8 | 4 +-
docs/manpages/vfs_preopen.8 | 4 +-
docs/manpages/vfs_readahead.8 | 4 +-
docs/manpages/vfs_readonly.8 | 4 +-
docs/manpages/vfs_recycle.8 | 4 +-
docs/manpages/vfs_scannedonly.8 | 4 +-
docs/manpages/vfs_shadow_copy.8 | 4 +-
docs/manpages/vfs_shadow_copy2.8 | 4 +-
docs/manpages/vfs_smb_traffic_analyzer.8 | 4 +-
docs/manpages/vfs_streams_depot.8 | 4 +-
docs/manpages/vfs_streams_xattr.8 | 4 +-
docs/manpages/vfs_time_audit.8 | 4 +-
docs/manpages/vfs_xattr_tdb.8 | 4 +-
docs/manpages/vfstest.1 | 6 +-
docs/manpages/wbinfo.1 | 6 +-
docs/manpages/winbind_krb5_locator.7 | 4 +-
docs/manpages/winbindd.8 | 6 +-
packaging/RHEL-CTDB/samba.spec | 2 +-
packaging/RHEL/makerpms.sh | 2 +-
packaging/RHEL/samba.spec | 2 +-
source3/VERSION | 2 +-
source3/include/ntioctl.h | 1 +
source3/include/proto.h | 1 +
source3/include/serverid.h | 2 +
source3/include/smb.h | 1 +
source3/include/version.h | 4 +-
source3/lib/serverid.c | 42 +++++++++-----
source3/lib/sessionid_tdb.c | 25 ++++++---
source3/libads/kerberos.c | 10 ++++
source3/libnet/libnet_join.c | 9 +++
source3/libsmb/dsgetdcname.c | 85 ++++++++++++++++++++++-------
source3/rpc_client/cli_netlogon.c | 13 +++++
source3/smbd/dosmode.c | 5 ++
source3/smbd/filename.c | 27 +++++++--
source3/smbd/globals.h | 2 +
source3/smbd/nttrans.c | 6 +-
source3/smbd/reply.c | 48 ++++++++--------
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_getinfo.c | 45 +++++++++++++--
source3/smbd/trans2.c | 75 ++++++++++++++++++++++---
source3/utils/net_serverid.c | 9 +++
source3/utils/net_status.c | 6 ++
source3/utils/status.c | 12 ++++
source3/winbindd/winbindd_cm.c | 9 ++-
source3/winbindd/winbindd_pam.c | 8 +++
112 files changed, 653 insertions(+), 305 deletions(-)
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c8e7607..711c225 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,79 @@
==============================
+ Release Notes for Samba 3.6.19
+ September 25, 2013
+ ==============================
+
+
+This is is the latest maintenance release of Samba 3.6.
+
+Please note that this will probably be the last maintenance release
+of the Samba 3.6 release series. With the release of Samba 4.1.0, the
+3.6 release series will be turned into the "security fixes only" mode.
+
+
+Changes since 3.6.18:
+---------------------
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 5917: Make Samba work on site with Read Only Domain Controller.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 8955: NetrServerPasswordSet2 timeout is too short.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 9899: Fix fallback to ncacn_np in cm_connect_lsat().
+ * BUG 9615: Fix fallback to ncacn_np in cm_connect_lsat().
+ * BUG 10127: Fix 'smbstatus' as non-root user.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 8955: Give machine password changes 10 minutes of time.
+ * BUG 10106: Honour output buffer length set by the client for SMB2 GetInfo
+ requests.
+ * BUG 10114: Handle Dropbox (write-only-directory) case correctly in
+ pathname lookup.
+
+
+o Karolin Seeger <kseeger at samba.org>
+ * BUG 10076: Fix variable list in man vfs_crossrename.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 9994: s3-winbind: Do not delete an existing valid credential cache.
+ * BUG 10073: 'net ads join': Fix segmentation fault in
+ create_local_private_krb5_conf_for_domain.
+
+
+o Richard Sharpe <realrichardsharpe at gmail.com>
+ * BUG 10097: MacOSX 10.9 will not follow path-based DFS referrals handed
+ out by Samba.
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored. All bug reports should
+be filed under the Samba 3.6 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+Release notes for older releases follow:
+----------------------------------------
+
+ ==============================
Release Notes for Samba 3.6.18
August 14, 2013
==============================
@@ -51,8 +126,9 @@ database (https://bugzilla.samba.org/).
== The Samba Team
======================================================================
-Release notes for older releases follow:
-----------------------------------------
+
+----------------------------------------------------------------------
+
==============================
Release Notes for Samba 3.6.17
diff --git a/docs-xml/manpages-3/vfs_crossrename.8.xml b/docs-xml/manpages-3/vfs_crossrename.8.xml
index ba7c7c8..97f62c8 100644
--- a/docs-xml/manpages-3/vfs_crossrename.8.xml
+++ b/docs-xml/manpages-3/vfs_crossrename.8.xml
@@ -37,28 +37,30 @@
NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by
manual copy and delete operations. If the rename by copy is done by the
server this can be much more efficient. vfs_crossrename tries to do
- this server-side cross-device rename operation. There are however
- limitations that this module currently does not solve:
+ this server-side cross-device rename operation.
+ </para>
+
+ <para>There are however limitations that this module currently does not
+ solve:</para>
<variablelist>
<varlistentry>
- the ACLs of files are not preserved
+ <para>The ACLs of files are not preserved,</para>
</varlistentry>
<varlistentry>
- meta data in EAs are not preserved
+ <para>meta data in EAs are not preserved,</para>
</varlistentry>
<varlistentry>
- renames of whole subdirectories cannot be done recursively,
+ <para>renames of whole subdirectories cannot be done recursively,
in that case we still return STATUS_NOT_SAME_DEVICE and
- let the client decide what to do
+ let the client decide what to do,</para>
</varlistentry>
<varlistentry>
- rename operations of huge files can cause hangs on the
+ <para>rename operations of huge files can cause hangs on the
client because clients expect a rename operation to
- return fast
+ return fast.</para>
</varlistentry>
</variablelist>
- </para>
<para>This module is stackable.</para>
diff --git a/docs/manpages/dbwrap_tool.1 b/docs/manpages/dbwrap_tool.1
index b16aae0..a610c75 100644
--- a/docs/manpages/dbwrap_tool.1
+++ b/docs/manpages/dbwrap_tool.1
@@ -2,12 +2,12 @@
.\" Title: dbwrap_tool
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "DBWRAP_TOOL" "1" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "DBWRAP_TOOL" "1" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/eventlogadm.8 b/docs/manpages/eventlogadm.8
index 39709b6..0260980 100644
--- a/docs/manpages/eventlogadm.8
+++ b/docs/manpages/eventlogadm.8
@@ -2,12 +2,12 @@
.\" Title: eventlogadm
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "EVENTLOGADM" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "EVENTLOGADM" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/findsmb.1 b/docs/manpages/findsmb.1
index c6ffd74..7298b08 100644
--- a/docs/manpages/findsmb.1
+++ b/docs/manpages/findsmb.1
@@ -2,12 +2,12 @@
.\" Title: findsmb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "FINDSMB" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "FINDSMB" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_ad.8 b/docs/manpages/idmap_ad.8
index d054fd6..bcbf162 100644
--- a/docs/manpages/idmap_ad.8
+++ b/docs/manpages/idmap_ad.8
@@ -2,12 +2,12 @@
.\" Title: idmap_ad
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_AD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_adex.8 b/docs/manpages/idmap_adex.8
index dca99c1..a1a3b18 100644
--- a/docs/manpages/idmap_adex.8
+++ b/docs/manpages/idmap_adex.8
@@ -2,12 +2,12 @@
.\" Title: idmap_adex
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_ADEX" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_ADEX" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_autorid.8 b/docs/manpages/idmap_autorid.8
index 41a0701..54b1426 100644
--- a/docs/manpages/idmap_autorid.8
+++ b/docs/manpages/idmap_autorid.8
@@ -2,12 +2,12 @@
.\" Title: idmap_autorid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_AUTORID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_AUTORID" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_hash.8 b/docs/manpages/idmap_hash.8
index 60d7b18..8c100ec 100644
--- a/docs/manpages/idmap_hash.8
+++ b/docs/manpages/idmap_hash.8
@@ -2,12 +2,12 @@
.\" Title: idmap_hash
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_HASH" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_HASH" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_ldap.8 b/docs/manpages/idmap_ldap.8
index f66d949..c167208 100644
--- a/docs/manpages/idmap_ldap.8
+++ b/docs/manpages/idmap_ldap.8
@@ -2,12 +2,12 @@
.\" Title: idmap_ldap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_LDAP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_LDAP" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_nss.8 b/docs/manpages/idmap_nss.8
index f134237..100734a 100644
--- a/docs/manpages/idmap_nss.8
+++ b/docs/manpages/idmap_nss.8
@@ -2,12 +2,12 @@
.\" Title: idmap_nss
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_NSS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_NSS" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_rid.8 b/docs/manpages/idmap_rid.8
index 75787ea..0544de5 100644
--- a/docs/manpages/idmap_rid.8
+++ b/docs/manpages/idmap_rid.8
@@ -2,12 +2,12 @@
.\" Title: idmap_rid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_RID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_RID" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_tdb.8 b/docs/manpages/idmap_tdb.8
index 8783b65..bd0d2c8 100644
--- a/docs/manpages/idmap_tdb.8
+++ b/docs/manpages/idmap_tdb.8
@@ -2,12 +2,12 @@
.\" Title: idmap_tdb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/idmap_tdb2.8 b/docs/manpages/idmap_tdb2.8
index d0a76c4..ae65a1f 100644
--- a/docs/manpages/idmap_tdb2.8
+++ b/docs/manpages/idmap_tdb2.8
@@ -2,12 +2,12 @@
.\" Title: idmap_tdb2
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "IDMAP_TDB2" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "IDMAP_TDB2" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/libsmbclient.7 b/docs/manpages/libsmbclient.7
index bdb553d..aa30b49 100644
--- a/docs/manpages/libsmbclient.7
+++ b/docs/manpages/libsmbclient.7
@@ -2,12 +2,12 @@
.\" Title: libsmbclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: 7
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LIBSMBCLIENT" "7" "08/12/2013" "Samba 3\&.6" "7"
+.TH "LIBSMBCLIENT" "7" "09/18/2013" "Samba 3\&.6" "7"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/lmhosts.5 b/docs/manpages/lmhosts.5
index 024d4f6..792b9ec 100644
--- a/docs/manpages/lmhosts.5
+++ b/docs/manpages/lmhosts.5
@@ -2,12 +2,12 @@
.\" Title: lmhosts
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LMHOSTS" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "LMHOSTS" "5" "09/18/2013" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/log2pcap.1 b/docs/manpages/log2pcap.1
index 594028f..f00adc6 100644
--- a/docs/manpages/log2pcap.1
+++ b/docs/manpages/log2pcap.1
@@ -2,12 +2,12 @@
.\" Title: log2pcap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "LOG2PCAP" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "LOG2PCAP" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -74,7 +74,7 @@ pcap_file
Name of the output file to write the pcap (or hexdump) data to\&. If this argument is not specified, output data will be written to stdout\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/net.8 b/docs/manpages/net.8
index 7900344..d7443a8 100644
--- a/docs/manpages/net.8
+++ b/docs/manpages/net.8
@@ -2,12 +2,12 @@
.\" Title: net
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NET" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "NET" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -41,7 +41,7 @@ suite\&.
The Samba net utility is meant to work just like the net utility available for windows and DOS\&. The first argument should be used to specify the protocol to use when executing a certain command\&. ADS is used for ActiveDirectory, RAP is using for old (Win9x/NT3) clients and RPC can be used for NT4 and Windows 2000\&. If this argument is omitted, net will try to determine it automatically\&. Not all commands are available on all protocols\&.
.SH "OPTIONS"
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/nmbd.8 b/docs/manpages/nmbd.8
index 7617d8f..21ede98 100644
--- a/docs/manpages/nmbd.8
+++ b/docs/manpages/nmbd.8
@@ -2,12 +2,12 @@
.\" Title: nmbd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NMBD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "NMBD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -106,7 +106,7 @@ also logs to standard output, as if the
parameter had been given\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/nmblookup.1 b/docs/manpages/nmblookup.1
index fd9e376..88af64a 100644
--- a/docs/manpages/nmblookup.1
+++ b/docs/manpages/nmblookup.1
@@ -2,12 +2,12 @@
.\" Title: nmblookup
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NMBLOOKUP" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "NMBLOOKUP" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -109,7 +109,7 @@ smb\&.conf
manual page for the list of valid options\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/ntlm_auth.1 b/docs/manpages/ntlm_auth.1
index 1ea539c..7ddcff2 100644
--- a/docs/manpages/ntlm_auth.1
+++ b/docs/manpages/ntlm_auth.1
@@ -2,12 +2,12 @@
.\" Title: ntlm_auth
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "NTLM_AUTH" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "NTLM_AUTH" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -347,7 +347,7 @@ Base directory name for log/debug files\&. The extension
will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/pam_winbind.8 b/docs/manpages/pam_winbind.8
index 9baa5df..c29bedb 100644
--- a/docs/manpages/pam_winbind.8
+++ b/docs/manpages/pam_winbind.8
@@ -2,12 +2,12 @@
.\" Title: pam_winbind
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: 8
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PAM_WINBIND" "8" "08/12/2013" "Samba 3\&.6" "8"
+.TH "PAM_WINBIND" "8" "09/18/2013" "Samba 3\&.6" "8"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/pam_winbind.conf.5 b/docs/manpages/pam_winbind.conf.5
index a5d393d..91c80c5 100644
--- a/docs/manpages/pam_winbind.conf.5
+++ b/docs/manpages/pam_winbind.conf.5
@@ -2,12 +2,12 @@
.\" Title: pam_winbind.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: 5
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PAM_WINBIND\&.CONF" "5" "08/12/2013" "Samba 3\&.6" "5"
+.TH "PAM_WINBIND\&.CONF" "5" "09/18/2013" "Samba 3\&.6" "5"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/pdbedit.8 b/docs/manpages/pdbedit.8
index dbf7872..8057d87 100644
--- a/docs/manpages/pdbedit.8
+++ b/docs/manpages/pdbedit.8
@@ -2,12 +2,12 @@
.\" Title: pdbedit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PDBEDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "PDBEDIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -555,7 +555,7 @@ Example:
This option is currently not being used\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/profiles.1 b/docs/manpages/profiles.1
index 0f10b29..66ef6bb 100644
--- a/docs/manpages/profiles.1
+++ b/docs/manpages/profiles.1
@@ -2,12 +2,12 @@
.\" Title: profiles
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "PROFILES" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "PROFILES" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@ file
by SID2\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/rpcclient.1 b/docs/manpages/rpcclient.1
index 50d5f00..d9118d9 100644
--- a/docs/manpages/rpcclient.1
+++ b/docs/manpages/rpcclient.1
@@ -2,12 +2,12 @@
.\" Title: rpcclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "RPCCLIENT" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "RPCCLIENT" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -199,7 +199,7 @@ smb\&.conf
manual page for the list of valid options\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/samba.7 b/docs/manpages/samba.7
index cc79adb..bad2fb9 100644
--- a/docs/manpages/samba.7
+++ b/docs/manpages/samba.7
@@ -2,12 +2,12 @@
.\" Title: samba
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: Miscellanea
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SAMBA" "7" "08/12/2013" "Samba 3\&.6" "Miscellanea"
+.TH "SAMBA" "7" "09/18/2013" "Samba 3\&.6" "Miscellanea"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/sharesec.1 b/docs/manpages/sharesec.1
index 0e282dc..7b077d6 100644
--- a/docs/manpages/sharesec.1
+++ b/docs/manpages/sharesec.1
@@ -2,12 +2,12 @@
.\" Title: sharesec
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SHARESEC" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SHARESEC" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -82,7 +82,7 @@ Remove ACEs\&.
Overwrite an existing share permission ACL\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smb.conf.5 b/docs/manpages/smb.conf.5
index 1a7ea08..3e9dd09 100644
--- a/docs/manpages/smb.conf.5
+++ b/docs/manpages/smb.conf.5
@@ -2,12 +2,12 @@
.\" Title: smb.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMB\&.CONF" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMB\&.CONF" "5" "09/18/2013" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbcacls.1 b/docs/manpages/smbcacls.1
index 2639322..62d7848 100644
--- a/docs/manpages/smbcacls.1
+++ b/docs/manpages/smbcacls.1
@@ -2,12 +2,12 @@
.\" Title: smbcacls
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCACLS" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCACLS" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -102,7 +102,7 @@ This option displays all ACL information in numeric format\&. The default is to
Don\*(Aqt actually do anything, only validate the correctness of the arguments\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbclient.1 b/docs/manpages/smbclient.1
index 6a180e0..b87da1e 100644
--- a/docs/manpages/smbclient.1
+++ b/docs/manpages/smbclient.1
@@ -2,12 +2,12 @@
.\" Title: smbclient
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCLIENT" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCLIENT" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -205,7 +205,7 @@ This parameter sets the maximum protocol version announced by the client\&.
Make queries to the external server using the machine account of the local server\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbcontrol.1 b/docs/manpages/smbcontrol.1
index 628c164..34237ff 100644
--- a/docs/manpages/smbcontrol.1
+++ b/docs/manpages/smbcontrol.1
@@ -2,12 +2,12 @@
.\" Title: smbcontrol
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCONTROL" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCONTROL" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -48,7 +48,7 @@ is a very small program, which sends messages to a
daemon running on the system\&.
.SH "OPTIONS"
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbcquotas.1 b/docs/manpages/smbcquotas.1
index ca21eee..590ca48 100644
--- a/docs/manpages/smbcquotas.1
+++ b/docs/manpages/smbcquotas.1
@@ -2,12 +2,12 @@
.\" Title: smbcquotas
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBCQUOTAS" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBCQUOTAS" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -82,7 +82,7 @@ Don\*(Aqt actually do anything, only validate the correctness of the arguments\&
Be verbose\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbd.8 b/docs/manpages/smbd.8
index ee823ea..4b70ef8 100644
--- a/docs/manpages/smbd.8
+++ b/docs/manpages/smbd.8
@@ -2,12 +2,12 @@
.\" Title: smbd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -130,7 +130,7 @@ Base directory name for log/debug files\&. The extension
will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbget.1 b/docs/manpages/smbget.1
index 194d4aa..5f5eec9 100644
--- a/docs/manpages/smbget.1
+++ b/docs/manpages/smbget.1
@@ -2,12 +2,12 @@
.\" Title: smbget
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBGET" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBGET" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbgetrc.5 b/docs/manpages/smbgetrc.5
index 24d83f6..b92c8f4 100644
--- a/docs/manpages/smbgetrc.5
+++ b/docs/manpages/smbgetrc.5
@@ -2,12 +2,12 @@
.\" Title: smbgetrc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBGETRC" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBGETRC" "5" "09/18/2013" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbpasswd.5 b/docs/manpages/smbpasswd.5
index 28673e3..1aa97ee 100644
--- a/docs/manpages/smbpasswd.5
+++ b/docs/manpages/smbpasswd.5
@@ -2,12 +2,12 @@
.\" Title: smbpasswd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: File Formats and Conventions
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBPASSWD" "5" "08/12/2013" "Samba 3\&.6" "File Formats and Conventions"
+.TH "SMBPASSWD" "5" "09/18/2013" "Samba 3\&.6" "File Formats and Conventions"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbpasswd.8 b/docs/manpages/smbpasswd.8
index 3afada1..f0698cc 100644
--- a/docs/manpages/smbpasswd.8
+++ b/docs/manpages/smbpasswd.8
@@ -2,12 +2,12 @@
.\" Title: smbpasswd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBPASSWD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBPASSWD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbspool.8 b/docs/manpages/smbspool.8
index d6c85e1..a86e27b 100644
--- a/docs/manpages/smbspool.8
+++ b/docs/manpages/smbspool.8
@@ -2,12 +2,12 @@
.\" Title: smbspool
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBSPOOL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBSPOOL" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbstatus.1 b/docs/manpages/smbstatus.1
index 13773fb..18f38f5 100644
--- a/docs/manpages/smbstatus.1
+++ b/docs/manpages/smbstatus.1
@@ -2,12 +2,12 @@
.\" Title: smbstatus
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBSTATUS" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBSTATUS" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -114,7 +114,7 @@ processes and exit\&. Useful for scripting\&.
causes smbstatus to only list shares\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/smbta-util.8 b/docs/manpages/smbta-util.8
index ae29186..cae4b38 100644
--- a/docs/manpages/smbta-util.8
+++ b/docs/manpages/smbta-util.8
@@ -2,12 +2,12 @@
.\" Title: smbta-util
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTA\-UTIL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMBTA\-UTIL" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbtar.1 b/docs/manpages/smbtar.1
index e0152d8..9544a82 100644
--- a/docs/manpages/smbtar.1
+++ b/docs/manpages/smbtar.1
@@ -2,12 +2,12 @@
.\" Title: smbtar
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTAR" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBTAR" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/smbtree.1 b/docs/manpages/smbtree.1
index 0fee7da..2dfbc6d 100644
--- a/docs/manpages/smbtree.1
+++ b/docs/manpages/smbtree.1
@@ -2,12 +2,12 @@
.\" Title: smbtree
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMBTREE" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "SMBTREE" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -153,7 +153,7 @@ rpcclient
to prompt for a password and type it in directly\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/swat.8 b/docs/manpages/swat.8
index 2baf8fd..c325e24 100644
--- a/docs/manpages/swat.8
+++ b/docs/manpages/swat.8
@@ -2,12 +2,12 @@
.\" Title: swat
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SWAT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SWAT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -116,7 +116,7 @@ Base directory name for log/debug files\&. The extension
will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/tdbbackup.8 b/docs/manpages/tdbbackup.8
index 06ce984..d3507d8 100644
--- a/docs/manpages/tdbbackup.8
+++ b/docs/manpages/tdbbackup.8
@@ -2,12 +2,12 @@
.\" Title: tdbbackup
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBBACKUP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBBACKUP" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/tdbdump.8 b/docs/manpages/tdbdump.8
index dc07fe4..40ad86d 100644
--- a/docs/manpages/tdbdump.8
+++ b/docs/manpages/tdbdump.8
@@ -2,12 +2,12 @@
.\" Title: tdbdump
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBDUMP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBDUMP" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/tdbtool.8 b/docs/manpages/tdbtool.8
index ef783af..f4c49c9 100644
--- a/docs/manpages/tdbtool.8
+++ b/docs/manpages/tdbtool.8
@@ -2,12 +2,12 @@
.\" Title: tdbtool
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TDBTOOL" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "TDBTOOL" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/testparm.1 b/docs/manpages/testparm.1
index 650b50d..8c7eb5a 100644
--- a/docs/manpages/testparm.1
+++ b/docs/manpages/testparm.1
@@ -2,12 +2,12 @@
.\" Title: testparm
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "TESTPARM" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "TESTPARM" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -66,7 +66,7 @@ testparm
will prompt for a carriage return after printing the service names and before dumping the service definitions\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/vfs_acl_tdb.8 b/docs/manpages/vfs_acl_tdb.8
index 1f7d80e..936e189 100644
--- a/docs/manpages/vfs_acl_tdb.8
+++ b/docs/manpages/vfs_acl_tdb.8
@@ -2,12 +2,12 @@
.\" Title: vfs_acl_tdb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_ACL_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_TDB" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_acl_xattr.8 b/docs/manpages/vfs_acl_xattr.8
index 4ab34e0..e61ca4e 100644
--- a/docs/manpages/vfs_acl_xattr.8
+++ b/docs/manpages/vfs_acl_xattr.8
@@ -2,12 +2,12 @@
.\" Title: vfs_acl_xattr
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_ACL_XATTR" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_ACL_XATTR" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_aio_fork.8 b/docs/manpages/vfs_aio_fork.8
index 5772f80..9c54447 100644
--- a/docs/manpages/vfs_aio_fork.8
+++ b/docs/manpages/vfs_aio_fork.8
@@ -2,12 +2,12 @@
.\" Title: vfs_aio_fork
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_AIO_FORK" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_FORK" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_aio_pthread.8 b/docs/manpages/vfs_aio_pthread.8
index 4d38c64..e907866 100644
--- a/docs/manpages/vfs_aio_pthread.8
+++ b/docs/manpages/vfs_aio_pthread.8
@@ -2,12 +2,12 @@
.\" Title: vfs_aio_pthread
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_AIO_PTHREAD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AIO_PTHREAD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_audit.8 b/docs/manpages/vfs_audit.8
index a3930b5..ea5acde 100644
--- a/docs/manpages/vfs_audit.8
+++ b/docs/manpages/vfs_audit.8
@@ -2,12 +2,12 @@
.\" Title: vfs_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_AUDIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_cacheprime.8 b/docs/manpages/vfs_cacheprime.8
index dedf462..8517a39 100644
--- a/docs/manpages/vfs_cacheprime.8
+++ b/docs/manpages/vfs_cacheprime.8
@@ -2,12 +2,12 @@
.\" Title: vfs_cacheprime
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CACHEPRIME" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CACHEPRIME" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_cap.8 b/docs/manpages/vfs_cap.8
index 33b1290..d89cedf 100644
--- a/docs/manpages/vfs_cap.8
+++ b/docs/manpages/vfs_cap.8
@@ -2,12 +2,12 @@
.\" Title: vfs_cap
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CAP" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CAP" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_catia.8 b/docs/manpages/vfs_catia.8
index 2ff3c0f..8636304 100644
--- a/docs/manpages/vfs_catia.8
+++ b/docs/manpages/vfs_catia.8
@@ -2,12 +2,12 @@
.\" Title: vfs_catia
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CATIA" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CATIA" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_commit.8 b/docs/manpages/vfs_commit.8
index 4f5131a..0103782 100644
--- a/docs/manpages/vfs_commit.8
+++ b/docs/manpages/vfs_commit.8
@@ -2,12 +2,12 @@
.\" Title: vfs_commit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_COMMIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_COMMIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_crossrename.8 b/docs/manpages/vfs_crossrename.8
index 338344d..b3e8b1e 100644
--- a/docs/manpages/vfs_crossrename.8
+++ b/docs/manpages/vfs_crossrename.8
@@ -2,12 +2,12 @@
.\" Title: vfs_crossrename
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_CROSSRENAME" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_CROSSRENAME" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -40,31 +40,29 @@ suite\&.
.PP
The
vfs_crossrename
-VFS module allows server side rename operations even if source and target are on different physical devices\&. A "move" in Explorer is usually a rename operation if it is inside of a single share or device\&. Usually such a rename operation returns NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by manual copy and delete operations\&. If the rename by copy is done by the server this can be much more efficient\&. vfs_crossrename tries to do this server\-side cross\-device re [...]
+VFS module allows server side rename operations even if source and target are on different physical devices\&. A "move" in Explorer is usually a rename operation if it is inside of a single share or device\&. Usually such a rename operation returns NT_STATUS_NOT_SAME_DEVICE and the client has to move the file by manual copy and delete operations\&. If the rename by copy is done by the server this can be much more efficient\&. vfs_crossrename tries to do this server\-side cross\-device re [...]
+.PP
+There are however limitations that this module currently does not solve:
.PP
.RS 4
-
- the ACLs of files are not preserved
- .RE
+.PP
+The ACLs of files are not preserved,
+.RE
.PP
.RS 4
-
- meta data in EAs are not preserved
- .RE
+.PP
+meta data in EAs are not preserved,
+.RE
.PP
.RS 4
-
- renames of whole subdirectories cannot be done recursively,
- in that case we still return STATUS_NOT_SAME_DEVICE and
- let the client decide what to do
- .RE
+.PP
+renames of whole subdirectories cannot be done recursively, in that case we still return STATUS_NOT_SAME_DEVICE and let the client decide what to do,
+.RE
.PP
.RS 4
-
- rename operations of huge files can cause hangs on the
- client because clients expect a rename operation to
- return fast
- .RE
+.PP
+rename operations of huge files can cause hangs on the client because clients expect a rename operation to return fast\&.
+.RE
.PP
This module is stackable\&.
.SH "OPTIONS"
diff --git a/docs/manpages/vfs_default_quota.8 b/docs/manpages/vfs_default_quota.8
index fb7da6e..276fc28 100644
--- a/docs/manpages/vfs_default_quota.8
+++ b/docs/manpages/vfs_default_quota.8
@@ -2,12 +2,12 @@
.\" Title: vfs_default_quota
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_DEFAULT_QUOTA" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DEFAULT_QUOTA" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_dirsort.8 b/docs/manpages/vfs_dirsort.8
index a59c1bc..e555fd1 100644
--- a/docs/manpages/vfs_dirsort.8
+++ b/docs/manpages/vfs_dirsort.8
@@ -2,12 +2,12 @@
.\" Title: vfs_dirsort
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_DIRSORT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_DIRSORT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_extd_audit.8 b/docs/manpages/vfs_extd_audit.8
index 92d0056..80393a2 100644
--- a/docs/manpages/vfs_extd_audit.8
+++ b/docs/manpages/vfs_extd_audit.8
@@ -2,12 +2,12 @@
.\" Title: vfs_extd_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_EXTD_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_EXTD_AUDIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_fake_perms.8 b/docs/manpages/vfs_fake_perms.8
index 5258566..f011337 100644
--- a/docs/manpages/vfs_fake_perms.8
+++ b/docs/manpages/vfs_fake_perms.8
@@ -2,12 +2,12 @@
.\" Title: vfs_fake_perms
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FAKE_PERMS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FAKE_PERMS" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_fileid.8 b/docs/manpages/vfs_fileid.8
index a865be1..4d4ad34 100644
--- a/docs/manpages/vfs_fileid.8
+++ b/docs/manpages/vfs_fileid.8
@@ -2,12 +2,12 @@
.\" Title: vfs_fileid
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FILEID" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FILEID" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_full_audit.8 b/docs/manpages/vfs_full_audit.8
index 6b34c50..f6aad37 100644
--- a/docs/manpages/vfs_full_audit.8
+++ b/docs/manpages/vfs_full_audit.8
@@ -2,12 +2,12 @@
.\" Title: vfs_full_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_FULL_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_FULL_AUDIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_gpfs.8 b/docs/manpages/vfs_gpfs.8
index 79c2a28..cc7ee69 100644
--- a/docs/manpages/vfs_gpfs.8
+++ b/docs/manpages/vfs_gpfs.8
@@ -2,12 +2,12 @@
.\" Title: vfs_gpfs
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_GPFS" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_GPFS" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_netatalk.8 b/docs/manpages/vfs_netatalk.8
index 844ea4c..974d2a2 100644
--- a/docs/manpages/vfs_netatalk.8
+++ b/docs/manpages/vfs_netatalk.8
@@ -2,12 +2,12 @@
.\" Title: vfs_netatalk
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_NETATALK" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NETATALK" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_notify_fam.8 b/docs/manpages/vfs_notify_fam.8
index d1b7062..d7e0e77 100644
--- a/docs/manpages/vfs_notify_fam.8
+++ b/docs/manpages/vfs_notify_fam.8
@@ -2,12 +2,12 @@
.\" Title: vfs_notify_fam
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_NOTIFY_FAM" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_NOTIFY_FAM" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_prealloc.8 b/docs/manpages/vfs_prealloc.8
index 6cb1602..5fcc657 100644
--- a/docs/manpages/vfs_prealloc.8
+++ b/docs/manpages/vfs_prealloc.8
@@ -2,12 +2,12 @@
.\" Title: vfs_prealloc
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_PREALLOC" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREALLOC" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_preopen.8 b/docs/manpages/vfs_preopen.8
index ed99e5b..8fedeae 100644
--- a/docs/manpages/vfs_preopen.8
+++ b/docs/manpages/vfs_preopen.8
@@ -2,12 +2,12 @@
.\" Title: vfs_preopen
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_PREOPEN" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_PREOPEN" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_readahead.8 b/docs/manpages/vfs_readahead.8
index f55e61f..24d5bec 100644
--- a/docs/manpages/vfs_readahead.8
+++ b/docs/manpages/vfs_readahead.8
@@ -2,12 +2,12 @@
.\" Title: vfs_readahead
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_READAHEAD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READAHEAD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_readonly.8 b/docs/manpages/vfs_readonly.8
index d0fd48f..5bcc2ca 100644
--- a/docs/manpages/vfs_readonly.8
+++ b/docs/manpages/vfs_readonly.8
@@ -2,12 +2,12 @@
.\" Title: vfs_readonly
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_READONLY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_READONLY" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_recycle.8 b/docs/manpages/vfs_recycle.8
index 473e569..3f076e7 100644
--- a/docs/manpages/vfs_recycle.8
+++ b/docs/manpages/vfs_recycle.8
@@ -2,12 +2,12 @@
.\" Title: vfs_recycle
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_RECYCLE" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_RECYCLE" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_scannedonly.8 b/docs/manpages/vfs_scannedonly.8
index bae64d0..8a303a5 100644
--- a/docs/manpages/vfs_scannedonly.8
+++ b/docs/manpages/vfs_scannedonly.8
@@ -2,12 +2,12 @@
.\" Title: vfs_scannedonly
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SCANNEDONLY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SCANNEDONLY" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_shadow_copy.8 b/docs/manpages/vfs_shadow_copy.8
index 267b6b6..d31c36e 100644
--- a/docs/manpages/vfs_shadow_copy.8
+++ b/docs/manpages/vfs_shadow_copy.8
@@ -2,12 +2,12 @@
.\" Title: vfs_shadow_copy
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SHADOW_COPY" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_shadow_copy2.8 b/docs/manpages/vfs_shadow_copy2.8
index adff585..2b7a543 100644
--- a/docs/manpages/vfs_shadow_copy2.8
+++ b/docs/manpages/vfs_shadow_copy2.8
@@ -2,12 +2,12 @@
.\" Title: vfs_shadow_copy2
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_SHADOW_COPY2" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_SHADOW_COPY2" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_smb_traffic_analyzer.8 b/docs/manpages/vfs_smb_traffic_analyzer.8
index b38d685..be38a7e 100644
--- a/docs/manpages/vfs_smb_traffic_analyzer.8
+++ b/docs/manpages/vfs_smb_traffic_analyzer.8
@@ -2,12 +2,12 @@
.\" Title: smb_traffic_analyzer
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "SMB_TRAFFIC_ANALYZER" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "SMB_TRAFFIC_ANALYZER" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_streams_depot.8 b/docs/manpages/vfs_streams_depot.8
index 71ca7ec..de2fb71 100644
--- a/docs/manpages/vfs_streams_depot.8
+++ b/docs/manpages/vfs_streams_depot.8
@@ -2,12 +2,12 @@
.\" Title: vfs_streams_depot
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_STREAMS_DEPOT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_DEPOT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_streams_xattr.8 b/docs/manpages/vfs_streams_xattr.8
index 14fef59..5e372a5 100644
--- a/docs/manpages/vfs_streams_xattr.8
+++ b/docs/manpages/vfs_streams_xattr.8
@@ -2,12 +2,12 @@
.\" Title: vfs_streams_xattr
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_STREAMS_XATTR" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_STREAMS_XATTR" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_time_audit.8 b/docs/manpages/vfs_time_audit.8
index a9d95b4..9ef3809 100644
--- a/docs/manpages/vfs_time_audit.8
+++ b/docs/manpages/vfs_time_audit.8
@@ -2,12 +2,12 @@
.\" Title: vfs_time_audit
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_TIME_AUDIT" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_TIME_AUDIT" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfs_xattr_tdb.8 b/docs/manpages/vfs_xattr_tdb.8
index 526bc49..9db5665 100644
--- a/docs/manpages/vfs_xattr_tdb.8
+++ b/docs/manpages/vfs_xattr_tdb.8
@@ -2,12 +2,12 @@
.\" Title: vfs_xattr_tdb
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFS_XATTR_TDB" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "VFS_XATTR_TDB" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/vfstest.1 b/docs/manpages/vfstest.1
index bd8b054..252212c 100644
--- a/docs/manpages/vfstest.1
+++ b/docs/manpages/vfstest.1
@@ -2,12 +2,12 @@
.\" Title: vfstest
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "VFSTEST" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "VFSTEST" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -47,7 +47,7 @@ is a small command line utility that has the ability to test dso samba VFS modul
Execute the specified (colon\-separated) commands\&. See below for the commands that are available\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/wbinfo.1 b/docs/manpages/wbinfo.1
index dd52a56..aec6519 100644
--- a/docs/manpages/wbinfo.1
+++ b/docs/manpages/wbinfo.1
@@ -2,12 +2,12 @@
.\" Title: wbinfo
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: User Commands
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WBINFO" "1" "08/12/2013" "Samba 3\&.6" "User Commands"
+.TH "WBINFO" "1" "09/18/2013" "Samba 3\&.6" "User Commands"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -355,7 +355,7 @@ then the operation will fail\&.
Prints the program version number\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/docs/manpages/winbind_krb5_locator.7 b/docs/manpages/winbind_krb5_locator.7
index eca42e5..6694f32 100644
--- a/docs/manpages/winbind_krb5_locator.7
+++ b/docs/manpages/winbind_krb5_locator.7
@@ -2,12 +2,12 @@
.\" Title: winbind_krb5_locator
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: 7
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WINBIND_KRB5_LOCATOR" "7" "08/12/2013" "Samba 3\&.6" "7"
+.TH "WINBIND_KRB5_LOCATOR" "7" "09/18/2013" "Samba 3\&.6" "7"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff --git a/docs/manpages/winbindd.8 b/docs/manpages/winbindd.8
index cc3a517..d36854c 100644
--- a/docs/manpages/winbindd.8
+++ b/docs/manpages/winbindd.8
@@ -2,12 +2,12 @@
.\" Title: winbindd
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\" Date: 08/12/2013
+.\" Date: 09/18/2013
.\" Manual: System Administration tools
.\" Source: Samba 3.6
.\" Language: English
.\"
-.TH "WINBINDD" "8" "08/12/2013" "Samba 3\&.6" "System Administration tools"
+.TH "WINBINDD" "8" "09/18/2013" "Samba 3\&.6" "System Administration tools"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -207,7 +207,7 @@ Base directory name for log/debug files\&. The extension
will be appended (e\&.g\&. log\&.smbclient, log\&.smbd, etc\&.\&.\&.)\&. The log file is never removed by the client\&.
.RE
.PP
-\-?|\-\-help
+\-h|\-\-help
.RS 4
Print a summary of command line options\&.
.RE
diff --git a/packaging/RHEL-CTDB/samba.spec b/packaging/RHEL-CTDB/samba.spec
index 4fe4c47..aea2e87 100644
--- a/packaging/RHEL-CTDB/samba.spec
+++ b/packaging/RHEL-CTDB/samba.spec
@@ -5,7 +5,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.18
+Version: 3.6.19
Release: 1GITHASH
Epoch: 0
License: GNU GPL version 3
diff --git a/packaging/RHEL/makerpms.sh b/packaging/RHEL/makerpms.sh
index b0f7445..9818b2f 100644
--- a/packaging/RHEL/makerpms.sh
+++ b/packaging/RHEL/makerpms.sh
@@ -20,7 +20,7 @@ SRCDIR=`rpm --eval %_sourcedir`
USERID=`id -u`
GRPID=`id -g`
-VERSION='3.6.18'
+VERSION='3.6.19'
REVISION=''
SPECFILE="samba.spec"
RPMVER=`rpm --version | awk '{print $3}'`
diff --git a/packaging/RHEL/samba.spec b/packaging/RHEL/samba.spec
index 001e785..c5b6302 100644
--- a/packaging/RHEL/samba.spec
+++ b/packaging/RHEL/samba.spec
@@ -11,7 +11,7 @@ Summary: Samba SMB client and server
Vendor: Samba Team
Packager: Samba Team <samba at samba.org>
Name: samba
-Version: 3.6.18
+Version: 3.6.19
Release: 1
Epoch: 0
License: GNU GPL version 3
diff --git a/source3/VERSION b/source3/VERSION
index ea6a68d..fc6d79e 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
########################################################
SAMBA_VERSION_MAJOR=3
SAMBA_VERSION_MINOR=6
-SAMBA_VERSION_RELEASE=18
+SAMBA_VERSION_RELEASE=19
########################################################
# Bug fix releases use a letter for the patch revision #
diff --git a/source3/include/ntioctl.h b/source3/include/ntioctl.h
index 925a06f..c990ebc 100644
--- a/source3/include/ntioctl.h
+++ b/source3/include/ntioctl.h
@@ -122,6 +122,7 @@
#define IO_REPARSE_TAG_MOUNT_POINT 0xA0000003
#define IO_REPARSE_TAG_HSM 0xC0000004
#define IO_REPARSE_TAG_SIS 0x80000007
+#define IO_REPARSE_TAG_DFS 0x8000000A
/* For FSCTL_GET_SHADOW_COPY_DATA ...*/
diff --git a/source3/include/proto.h b/source3/include/proto.h
index 189b286..7303e76 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1846,6 +1846,7 @@ void server_messaging_context_free(void);
/* The following definitions come from lib/sessionid_tdb.c */
struct sessionid;
bool sessionid_init(void);
+bool sessionid_init_readonly(void);
struct db_record *sessionid_fetch_record(TALLOC_CTX *mem_ctx, const char *key);
int sessionid_traverse(int (*fn)(struct db_record *rec, const char *key,
struct sessionid *session,
diff --git a/source3/include/serverid.h b/source3/include/serverid.h
index 435c88b..56b7237 100644
--- a/source3/include/serverid.h
+++ b/source3/include/serverid.h
@@ -73,4 +73,6 @@ bool serverid_parent_init(TALLOC_CTX *mem_ctx);
*/
uint64_t serverid_get_random_unique_id(void);
+bool serverid_init_readonly(TALLOC_CTX *mem_ctx);
+
#endif
diff --git a/source3/include/smb.h b/source3/include/smb.h
index 873657a..2d04373 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1716,6 +1716,7 @@ struct smb_file_time {
#define UCF_COND_ALLOW_WCARD_LCOMP 0x00000004
#define UCF_POSIX_PATHNAMES 0x00000008
#define UCF_UNIX_NAME_LOOKUP 0x00000010
+#define UCF_CREATING_FILE 0x00000020
/*
* smb_filename
diff --git a/source3/include/version.h b/source3/include/version.h
index dde7580..b7e7602 100644
--- a/source3/include/version.h
+++ b/source3/include/version.h
@@ -1,8 +1,8 @@
/* Autogenerated by script/mkversion.sh */
#define SAMBA_VERSION_MAJOR 3
#define SAMBA_VERSION_MINOR 6
-#define SAMBA_VERSION_RELEASE 18
-#define SAMBA_VERSION_OFFICIAL_STRING "3.6.18"
+#define SAMBA_VERSION_RELEASE 19
+#define SAMBA_VERSION_OFFICIAL_STRING "3.6.19"
#ifdef SAMBA_VERSION_VENDOR_FUNCTION
# define SAMBA_VERSION_STRING SAMBA_VERSION_VENDOR_FUNCTION
#else /* SAMBA_VERSION_VENDOR_FUNCTION */
diff --git a/source3/lib/serverid.c b/source3/lib/serverid.c
index 00dd6c4..9a0deb3 100644
--- a/source3/lib/serverid.c
+++ b/source3/lib/serverid.c
@@ -34,37 +34,53 @@ struct serverid_data {
uint32_t msg_flags;
};
-bool serverid_parent_init(TALLOC_CTX *mem_ctx)
+static struct db_context *db_ptr = NULL;
+
+static struct db_context *serverid_init(TALLOC_CTX *mem_ctx,
+ bool readonly)
{
- struct tdb_wrap *db;
+ db_ptr = db_open(mem_ctx, lock_path("serverid.tdb"),
+ 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH,
+ readonly ? O_RDONLY : O_RDWR | O_CREAT,
+ 0644);
+ return db_ptr;
+}
+bool serverid_parent_init(TALLOC_CTX *mem_ctx)
+{
/*
* Open the tdb in the parent process (smbd) so that our
* CLEAR_IF_FIRST optimization in tdb_reopen_all can properly
* work.
*/
- db = tdb_wrap_open(mem_ctx, lock_path("serverid.tdb"),
- 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT,
- 0644);
- if (db == NULL) {
+ if (serverid_init(mem_ctx, false) == NULL) {
DEBUG(1, ("could not open serverid.tdb: %s\n",
strerror(errno)));
return false;
}
+
return true;
}
-static struct db_context *serverid_db(void)
+bool serverid_init_readonly(TALLOC_CTX *mem_ctx)
{
- static struct db_context *db;
+ if (serverid_init(mem_ctx, true) == NULL) {
+ DEBUG(1, ("could not open serverid.tdb: %s\n",
+ strerror(errno)));
+ return false;
+ }
- if (db != NULL) {
- return db;
+ return true;
+}
+
+static struct db_context *serverid_db(void)
+{
+ if (db_ptr != NULL) {
+ return db_ptr;
}
- db = db_open(NULL, lock_path("serverid.tdb"), 0,
- TDB_DEFAULT|TDB_CLEAR_IF_FIRST|TDB_INCOMPATIBLE_HASH, O_RDWR|O_CREAT, 0644);
- return db;
+
+ return serverid_init(NULL, false);
}
static void serverid_fill_key(const struct server_id *id,
diff --git a/source3/lib/sessionid_tdb.c b/source3/lib/sessionid_tdb.c
index de3ccab..769aac2 100644
--- a/source3/lib/sessionid_tdb.c
+++ b/source3/lib/sessionid_tdb.c
@@ -23,23 +23,34 @@
#include "session.h"
#include "util_tdb.h"
+static struct db_context *session_db_ctx_ptr = NULL;
+
static struct db_context *session_db_ctx(void)
{
- static struct db_context *session_db_ctx_ptr;
-
- if (session_db_ctx_ptr != NULL) {
- return session_db_ctx_ptr;
- }
+ return session_db_ctx_ptr;
+}
+static struct db_context *session_db_ctx_init(bool readonly)
+{
session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
TDB_CLEAR_IF_FIRST|TDB_DEFAULT|TDB_INCOMPATIBLE_HASH,
- O_RDWR | O_CREAT, 0644);
+ readonly ? O_RDONLY : O_RDWR | O_CREAT, 0644);
return session_db_ctx_ptr;
}
bool sessionid_init(void)
{
- if (session_db_ctx() == NULL) {
+ if (session_db_ctx_init(false) == NULL) {
+ DEBUG(1,("session_init: failed to open sessionid tdb\n"));
+ return False;
+ }
+
+ return True;
+}
+
+bool sessionid_init_readonly(void)
+{
+ if (session_db_ctx_init(true) == NULL) {
DEBUG(1,("session_init: failed to open sessionid tdb\n"));
return False;
}
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 6b8f247..1153ccb 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -856,6 +856,16 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
return false;
}
+ if (realm == NULL) {
+ DEBUG(0, ("No realm has been specified! Do you really want to "
+ "join an Active Directory server?\n"));
+ return false;
+ }
+
+ if (domain == NULL || pss == NULL || kdc_name == NULL) {
+ return false;
+ }
+
dname = lock_path("smb_krb5");
if (!dname) {
return false;
diff --git a/source3/libnet/libnet_join.c b/source3/libnet/libnet_join.c
index 7bb436b..e84682d 100644
--- a/source3/libnet/libnet_join.c
+++ b/source3/libnet/libnet_join.c
@@ -850,6 +850,7 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
struct samr_Ids name_types;
union samr_UserInfo user_info;
struct dcerpc_binding_handle *b = NULL;
+ unsigned int old_timeout = 0;
struct samr_CryptPassword crypt_pwd;
struct samr_CryptPasswordEx crypt_pwd_ex;
@@ -1061,6 +1062,12 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
/* Set password on machine account - first try level 26 */
+ /*
+ * increase the timeout as password filter modules on the DC
+ * might delay the operation for a significant amount of time
+ */
+ old_timeout = rpccli_set_timeout(pipe_hnd, 600000);
+
init_samr_CryptPasswordEx(r->in.machine_password,
&cli->user_session_key,
&crypt_pwd_ex);
@@ -1092,6 +1099,8 @@ static NTSTATUS libnet_join_joindomain_rpc(TALLOC_CTX *mem_ctx,
&result);
}
+ old_timeout = rpccli_set_timeout(pipe_hnd, old_timeout);
+
if (!NT_STATUS_IS_OK(status)) {
dcerpc_samr_DeleteUser(b, mem_ctx,
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 442f8ed..841a179 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -321,7 +321,6 @@ static NTSTATUS dsgetdcname_cache_fetch(TALLOC_CTX *mem_ctx,
const char *domain_name,
const struct GUID *domain_guid,
uint32_t flags,
- const char *site_name,
struct netr_DsRGetDCNameInfo **info_p)
{
char *key;
@@ -394,7 +393,7 @@ static NTSTATUS dsgetdcname_cached(TALLOC_CTX *mem_ctx,
NTSTATUS status;
status = dsgetdcname_cache_fetch(mem_ctx, domain_name, domain_guid,
- flags, site_name, info);
+ flags, info);
if (!NT_STATUS_IS_OK(status)
&& !NT_STATUS_EQUAL(status, NT_STATUS_NOT_FOUND)) {
DEBUG(10,("dsgetdcname_cached: cache fetch failed with: %s\n",
@@ -1083,12 +1082,10 @@ static bool is_closest_site(struct netr_DsRGetDCNameInfo *info)
}
/********************************************************************
- dsgetdcname.
-
- This will be the only public function here.
+ Internal dsgetdcname.
********************************************************************/
-NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+static NTSTATUS dsgetdcname_internal(TALLOC_CTX *mem_ctx,
struct messaging_context *msg_ctx,
const char *domain_name,
const struct GUID *domain_guid,
@@ -1098,15 +1095,14 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
{
NTSTATUS status = NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND;
struct netr_DsRGetDCNameInfo *myinfo = NULL;
- char *query_site = NULL;
bool first = true;
struct netr_DsRGetDCNameInfo *first_info = NULL;
- DEBUG(10,("dsgetdcname: domain_name: %s, "
+ DEBUG(10,("dsgetdcname_internal: domain_name: %s, "
"domain_guid: %s, site_name: %s, flags: 0x%08x\n",
domain_name,
domain_guid ? GUID_string(mem_ctx, domain_guid) : "(null)",
- site_name, flags));
+ site_name ? site_name : "(null)", flags));
*info = NULL;
@@ -1115,18 +1111,12 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
return NT_STATUS_INVALID_PARAMETER;
}
- if ((site_name == NULL) || (site_name[0] == '\0')) {
- query_site = sitename_fetch(domain_name);
- } else {
- query_site = SMB_STRDUP(site_name);
- }
-
if (flags & DS_FORCE_REDISCOVERY) {
goto rediscover;
}
status = dsgetdcname_cached(mem_ctx, msg_ctx, domain_name, domain_guid,
- flags, query_site, &myinfo);
+ flags, site_name, &myinfo);
if (NT_STATUS_IS_OK(status)) {
goto done;
}
@@ -1137,12 +1127,10 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
rediscover:
status = dsgetdcname_rediscover(mem_ctx, msg_ctx, domain_name,
- domain_guid, flags, query_site,
+ domain_guid, flags, site_name,
&myinfo);
done:
- SAFE_FREE(query_site);
-
if (!NT_STATUS_IS_OK(status)) {
if (!first) {
*info = first_info;
@@ -1157,10 +1145,67 @@ NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
first = false;
first_info = myinfo;
/* TODO: may use the next_closest_site here */
- query_site = SMB_STRDUP(myinfo->client_site_name);
+ site_name = myinfo->client_site_name;
goto rediscover;
}
*info = myinfo;
return NT_STATUS_OK;
}
+
+/********************************************************************
+ dsgetdcname.
+
+ This will be the only public function here.
+********************************************************************/
+
+NTSTATUS dsgetdcname(TALLOC_CTX *mem_ctx,
+ struct messaging_context *msg_ctx,
+ const char *domain_name,
+ const struct GUID *domain_guid,
+ const char *site_name,
+ uint32_t flags,
+ struct netr_DsRGetDCNameInfo **info)
+{
+ NTSTATUS status;
+ const char *query_site = NULL;
+ char *ptr_to_free = NULL;
+ bool retry_query_with_null = false;
+
+ if ((site_name == NULL) || (site_name[0] == '\0')) {
+ ptr_to_free = sitename_fetch(domain_name);
+ if (ptr_to_free != NULL) {
+ retry_query_with_null = true;
+ }
+ query_site = ptr_to_free;
+ } else {
+ query_site = site_name;
+ }
+
+ status = dsgetdcname_internal(mem_ctx,
+ msg_ctx,
+ domain_name,
+ domain_guid,
+ query_site,
+ flags,
+ info);
+
+ SAFE_FREE(ptr_to_free);
+
+ if (!NT_STATUS_EQUAL(status, NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND)) {
+ return status;
+ }
+
+ /* Should we try again with site_name == NULL ? */
+ if (retry_query_with_null) {
+ status = dsgetdcname_internal(mem_ctx,
+ msg_ctx,
+ domain_name,
+ domain_guid,
+ NULL,
+ flags,
+ info);
+ }
+
+ return status;
+}
diff --git a/source3/rpc_client/cli_netlogon.c b/source3/rpc_client/cli_netlogon.c
index bd3232d..c69a933 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -625,11 +625,14 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
if (cli->dc->negotiate_flags & NETLOGON_NEG_PASSWORD_SET2) {
struct netr_CryptPassword new_password;
+ uint32_t old_timeout;
init_netr_CryptPassword(new_trust_pwd_cleartext,
cli->dc->session_key,
&new_password);
+ old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
status = dcerpc_netr_ServerPasswordSet2(b, mem_ctx,
cli->srv_name_slash,
cli->dc->account_name,
@@ -639,6 +642,9 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
&srv_cred,
&new_password,
&result);
+
+ dcerpc_binding_handle_set_timeout(b, old_timeout);
+
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("dcerpc_netr_ServerPasswordSet2 failed: %s\n",
nt_errstr(status)));
@@ -647,9 +653,13 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
} else {
struct samr_Password new_password;
+ uint32_t old_timeout;
+
memcpy(new_password.hash, new_trust_passwd_hash, sizeof(new_password.hash));
netlogon_creds_des_encrypt(cli->dc, &new_password);
+ old_timeout = dcerpc_binding_handle_set_timeout(b, 600000);
+
status = dcerpc_netr_ServerPasswordSet(b, mem_ctx,
cli->srv_name_slash,
cli->dc->account_name,
@@ -659,6 +669,9 @@ NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
&srv_cred,
&new_password,
&result);
+
+ dcerpc_binding_handle_set_timeout(b, old_timeout);
+
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("dcerpc_netr_ServerPasswordSet failed: %s\n",
nt_errstr(status)));
diff --git a/source3/smbd/dosmode.c b/source3/smbd/dosmode.c
index 823d44d..326e995 100644
--- a/source3/smbd/dosmode.c
+++ b/source3/smbd/dosmode.c
@@ -484,6 +484,11 @@ uint32 dos_mode_msdfs(connection_struct *conn,
result = filter_mode_by_protocol(result);
+ /*
+ * Add in that it is a reparse point
+ */
+ result |= FILE_ATTRIBUTE_REPARSE_POINT;
+
DEBUG(8,("dos_mode_msdfs returning "));
if (result & FILE_ATTRIBUTE_HIDDEN) DEBUG(8, ("h"));
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 207b56c..8ef0c0a 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -713,12 +713,29 @@ NTSTATUS unix_convert(TALLOC_CTX *ctx,
/*
* ENOENT/EACCESS are the only valid errors
- * here. EACCESS needs handling here for
- * "dropboxes", i.e. directories where users
- * can only put stuff with permission -wx.
+ * here.
*/
- if ((errno != 0) && (errno != ENOENT)
- && (errno != EACCES)) {
+ if (errno == EACCES) {
+ if (ucf_flags & UCF_CREATING_FILE) {
+ /*
+ * This is the dropbox
+ * behaviour. A dropbox is a
+ * directory with only -wx
+ * permissions, so
+ * get_real_filename fails
+ * with EACCESS, it needs to
+ * list the directory. We
+ * nevertheless want to allow
+ * users creating a file.
+ */
+ status = NT_STATUS_OBJECT_PATH_NOT_FOUND;
+ } else {
+ status = NT_STATUS_ACCESS_DENIED;
+ }
+ goto fail;
+ }
+
+ if ((errno != 0) && (errno != ENOENT)) {
/*
* ENOTDIR and ELOOP both map to
* NT_STATUS_OBJECT_PATH_NOT_FOUND
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index ce5b18d..8cec74c 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -162,6 +162,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
char *lock_data,
uint16_t flags2,
unsigned int max_data_bytes,
+ size_t *fixed_portion,
char **ppdata,
unsigned int *pdata_size);
@@ -179,6 +180,7 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
uint16_t info_level,
uint16_t flags2,
unsigned int max_data_bytes,
+ size_t *fixed_portion,
struct smb_filename *smb_fname,
char **ppdata,
int *ret_data_len);
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index a884b2f..4c145e0 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -536,7 +536,8 @@ void reply_ntcreate_and_X(struct smb_request *req)
conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ (create_disposition == FILE_CREATE)
+ ? UCF_CREATING_FILE : 0,
NULL,
&smb_fname);
@@ -1165,7 +1166,8 @@ static void call_nt_transact_create(connection_struct *conn,
conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ (create_disposition == FILE_CREATE)
+ ? UCF_CREATING_FILE : 0,
NULL,
&smb_fname);
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index ca3a08f..0585a6e 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -1748,11 +1748,20 @@ void reply_open(struct smb_request *req)
goto out;
}
+ if (!map_open_params_to_ntcreate(fname, deny_mode,
+ OPENX_FILE_EXISTS_OPEN, &access_mask,
+ &share_mode, &create_disposition,
+ &create_options, &private_flags)) {
+ reply_force_doserror(req, ERRDOS, ERRbadaccess);
+ goto out;
+ }
+
status = filename_convert(ctx,
conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ (create_disposition == FILE_CREATE)
+ ? UCF_CREATING_FILE : 0,
NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
@@ -1766,14 +1775,6 @@ void reply_open(struct smb_request *req)
goto out;
}
- if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
- OPENX_FILE_EXISTS_OPEN, &access_mask,
- &share_mode, &create_disposition,
- &create_options, &private_flags)) {
- reply_force_doserror(req, ERRDOS, ERRbadaccess);
- goto out;
- }
-
status = SMB_VFS_CREATE_FILE(
conn, /* conn */
req, /* req */
@@ -1923,11 +1924,22 @@ void reply_open_and_X(struct smb_request *req)
goto out;
}
+ if (!map_open_params_to_ntcreate(fname, deny_mode,
+ smb_ofun,
+ &access_mask, &share_mode,
+ &create_disposition,
+ &create_options,
+ &private_flags)) {
+ reply_force_doserror(req, ERRDOS, ERRbadaccess);
+ goto out;
+ }
+
status = filename_convert(ctx,
conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ (create_disposition == FILE_CREATE)
+ ? UCF_CREATING_FILE : 0,
NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
@@ -1941,16 +1953,6 @@ void reply_open_and_X(struct smb_request *req)
goto out;
}
- if (!map_open_params_to_ntcreate(smb_fname->base_name, deny_mode,
- smb_ofun,
- &access_mask, &share_mode,
- &create_disposition,
- &create_options,
- &private_flags)) {
- reply_force_doserror(req, ERRDOS, ERRbadaccess);
- goto out;
- }
-
status = SMB_VFS_CREATE_FILE(
conn, /* conn */
req, /* req */
@@ -2145,7 +2147,7 @@ void reply_mknew(struct smb_request *req)
conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ UCF_CREATING_FILE,
NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
@@ -2286,7 +2288,7 @@ void reply_ctemp(struct smb_request *req)
status = filename_convert(ctx, conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ UCF_CREATING_FILE,
NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
@@ -5539,7 +5541,7 @@ void reply_mkdir(struct smb_request *req)
status = filename_convert(ctx, conn,
req->flags2 & FLAGS2_DFS_PATHNAMES,
directory,
- 0,
+ UCF_CREATING_FILE,
NULL,
&smb_dname);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/smb2_create.c b/source3/smbd/smb2_create.c
index 5b81099..0862990 100644
--- a/source3/smbd/smb2_create.c
+++ b/source3/smbd/smb2_create.c
@@ -694,7 +694,8 @@ static struct tevent_req *smbd_smb2_create_send(TALLOC_CTX *mem_ctx,
smb1req->conn,
smb1req->flags2 & FLAGS2_DFS_PATHNAMES,
fname,
- 0,
+ (in_create_disposition == FILE_CREATE) ?
+ UCF_CREATING_FILE : 0,
NULL,
&smb_fname);
if (!NT_STATUS_IS_OK(status)) {
diff --git a/source3/smbd/smb2_getinfo.c b/source3/smbd/smb2_getinfo.c
index 55071e8..9ad2847 100644
--- a/source3/smbd/smb2_getinfo.c
+++ b/source3/smbd/smb2_getinfo.c
@@ -148,7 +148,10 @@ static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq)
return;
}
- if (!NT_STATUS_IS_OK(call_status)) {
+ /* some GetInfo responses set STATUS_BUFFER_OVERFLOW and return partial,
+ but valid data */
+ if (!(NT_STATUS_IS_OK(call_status) ||
+ NT_STATUS_EQUAL(call_status, STATUS_BUFFER_OVERFLOW))) {
/* Return a specific error with data. */
error = smbd_smb2_request_error_ex(req,
call_status,
@@ -185,7 +188,7 @@ static void smbd_smb2_request_getinfo_done(struct tevent_req *subreq)
outdyn = out_output_buffer;
- error = smbd_smb2_request_done(req, outbody, &outdyn);
+ error = smbd_smb2_request_done_ex(req, call_status, outbody, &outdyn, __location__);
if (!NT_STATUS_IS_OK(error)) {
smbd_server_connection_terminate(req->sconn,
nt_errstr(error));
@@ -270,7 +273,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
}
switch (in_info_type) {
- case 0x01:/* SMB2_GETINFO_FILE */
+ case SMB2_GETINFO_FILE:
{
uint16_t file_info_level;
char *data = NULL;
@@ -281,6 +284,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
struct ea_list *ea_list = NULL;
int lock_data_count = 0;
char *lock_data = NULL;
+ size_t fixed_portion;
ZERO_STRUCT(write_time_ts);
@@ -368,6 +372,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
lock_data,
STR_UNICODE,
in_output_buffer_length,
+ &fixed_portion,
&data,
&data_size);
if (!NT_STATUS_IS_OK(status)) {
@@ -378,6 +383,12 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
+ if (in_output_buffer_length < fixed_portion) {
+ SAFE_FREE(data);
+ tevent_req_nterror(
+ req, NT_STATUS_INFO_LENGTH_MISMATCH);
+ return tevent_req_post(req, ev);
+ }
if (data_size > 0) {
state->out_output_buffer = data_blob_talloc(state,
data,
@@ -386,16 +397,22 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
if (tevent_req_nomem(state->out_output_buffer.data, req)) {
return tevent_req_post(req, ev);
}
+ if (data_size > in_output_buffer_length) {
+ state->out_output_buffer.length =
+ in_output_buffer_length;
+ status = STATUS_BUFFER_OVERFLOW;
+ }
}
SAFE_FREE(data);
break;
}
- case 0x02:/* SMB2_GETINFO_FS */
+ case SMB2_GETINFO_FS:
{
uint16_t file_info_level;
char *data = NULL;
int data_size = 0;
+ size_t fixed_portion;
/* the levels directly map to the passthru levels */
file_info_level = in_file_info_class + 1000;
@@ -404,10 +421,14 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
file_info_level,
STR_UNICODE,
in_output_buffer_length,
+ &fixed_portion,
fsp->fsp_name,
&data,
&data_size);
- if (!NT_STATUS_IS_OK(status)) {
+ /* some responses set STATUS_BUFFER_OVERFLOW and return
+ partial, but valid data */
+ if (!(NT_STATUS_IS_OK(status) ||
+ NT_STATUS_EQUAL(status, STATUS_BUFFER_OVERFLOW))) {
SAFE_FREE(data);
if (NT_STATUS_EQUAL(status, NT_STATUS_INVALID_LEVEL)) {
status = NT_STATUS_INVALID_INFO_CLASS;
@@ -415,6 +436,12 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
+ if (in_output_buffer_length < fixed_portion) {
+ SAFE_FREE(data);
+ tevent_req_nterror(
+ req, NT_STATUS_INFO_LENGTH_MISMATCH);
+ return tevent_req_post(req, ev);
+ }
if (data_size > 0) {
state->out_output_buffer = data_blob_talloc(state,
data,
@@ -423,12 +450,17 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
if (tevent_req_nomem(state->out_output_buffer.data, req)) {
return tevent_req_post(req, ev);
}
+ if (data_size > in_output_buffer_length) {
+ state->out_output_buffer.length =
+ in_output_buffer_length;
+ status = STATUS_BUFFER_OVERFLOW;
+ }
}
SAFE_FREE(data);
break;
}
- case 0x03:/* SMB2_GETINFO_SEC */
+ case SMB2_GETINFO_SECURITY:
{
uint8_t *p_marshalled_sd = NULL;
size_t sd_size = 0;
@@ -485,6 +517,7 @@ static struct tevent_req *smbd_smb2_getinfo_send(TALLOC_CTX *mem_ctx,
return tevent_req_post(req, ev);
}
+ state->status = status;
tevent_req_done(req);
return tevent_req_post(req, ev);
}
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 01b0130..26b6523 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -24,6 +24,7 @@
*/
#include "includes.h"
+#include "ntioctl.h"
#include "system/filesys.h"
#include "version.h"
#include "smbd/smbd.h"
@@ -1773,12 +1774,14 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */
- {
+ if (mode & FILE_ATTRIBUTE_REPARSE_POINT) {
+ SIVAL(p, 0, IO_REPARSE_TAG_DFS);
+ } else {
unsigned int ea_size = estimate_ea_size(conn, NULL,
smb_fname->base_name);
SIVAL(p,0,ea_size); /* Extended attributes */
- p += 4;
}
+ p += 4;
/* Clear the short name buffer. This is
* IMPORTANT as not doing so will trigger
* a Win2k client bug. JRA.
@@ -1950,12 +1953,14 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length. */
- {
+ if (mode & FILE_ATTRIBUTE_REPARSE_POINT) {
+ SIVAL(p, 0, IO_REPARSE_TAG_DFS);
+ } else {
unsigned int ea_size = estimate_ea_size(conn, NULL,
smb_fname->base_name);
SIVAL(p,0,ea_size); /* Extended attributes */
- p +=4;
}
+ p +=4;
SIVAL(p,0,0); p += 4; /* Unknown - reserved ? */
SBVAL(p,0,file_index); p += 8;
len = srvstr_push(base_data, flags2, p,
@@ -1996,12 +2001,14 @@ static bool smbd_marshall_dir_entry(TALLOC_CTX *ctx,
SOFF_T(p,0,allocation_size); p += 8;
SIVAL(p,0,mode); p += 4;
q = p; p += 4; /* q is placeholder for name length */
- {
+ if (mode & FILE_ATTRIBUTE_REPARSE_POINT) {
+ SIVAL(p, 0, IO_REPARSE_TAG_DFS);
+ } else {
unsigned int ea_size = estimate_ea_size(conn, NULL,
smb_fname->base_name);
SIVAL(p,0,ea_size); /* Extended attributes */
- p +=4;
}
+ p +=4;
/* Clear the short name buffer. This is
* IMPORTANT as not doing so will trigger
* a Win2k client bug. JRA.
@@ -2964,6 +2971,7 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
uint16_t info_level,
uint16_t flags2,
unsigned int max_data_bytes,
+ size_t *fixed_portion,
struct smb_filename *fname,
char **ppdata,
int *ret_data_len)
@@ -2977,6 +2985,7 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
uint32 additional_flags = 0;
struct smb_filename smb_fname;
SMB_STRUCT_STAT st;
+ NTSTATUS status = NT_STATUS_OK;
if (fname == NULL || fname->base_name == NULL) {
filename = ".";
@@ -3015,6 +3024,8 @@ NTSTATUS smbd_do_qfsinfo(connection_struct *conn,
memset((char *)pdata,'\0',max_data_bytes + DIR_ENTRY_SAFETY_MARGIN);
end_data = pdata + max_data_bytes + DIR_ENTRY_SAFETY_MARGIN - 1;
+ *fixed_portion = 0;
+
switch (info_level) {
case SMB_INFO_ALLOCATION:
{
@@ -3107,6 +3118,13 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
STR_UNICODE);
SIVAL(pdata,8,len);
data_len = 12 + len;
+ if (max_data_bytes >= 16 && data_len > max_data_bytes) {
+ /* the client only requested a portion of the
+ file system name */
+ data_len = max_data_bytes;
+ status = STATUS_BUFFER_OVERFLOW;
+ }
+ *fixed_portion = 16;
break;
case SMB_QUERY_FS_LABEL_INFO:
@@ -3136,6 +3154,13 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)st.st_ex_dev, (u
DEBUG(5,("smbd_do_qfsinfo : SMB_QUERY_FS_VOLUME_INFO namelen = %d, vol=%s serv=%s\n",
(int)strlen(vname),vname, lp_servicename(snum)));
+ if (max_data_bytes >= 24 && data_len > max_data_bytes) {
+ /* the client only requested a portion of the
+ volume label */
+ data_len = max_data_bytes;
+ status = STATUS_BUFFER_OVERFLOW;
+ }
+
break;
case SMB_QUERY_FS_SIZE_INFO:
@@ -3168,6 +3193,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
SBIG_UINT(pdata,8,dfree);
SIVAL(pdata,16,sectors_per_unit);
SIVAL(pdata,20,bytes_per_sector);
+ *fixed_portion = 24;
break;
}
@@ -3201,6 +3227,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
SBIG_UINT(pdata,16,dfree); /* Actual available allocation units. */
SIVAL(pdata,24,sectors_per_unit); /* Sectors per allocation unit. */
SIVAL(pdata,28,bytes_per_sector); /* Bytes per sector. */
+ *fixed_portion = 32;
break;
}
@@ -3215,6 +3242,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
data_len = 8;
SIVAL(pdata,0,FILE_DEVICE_DISK); /* dev type */
SIVAL(pdata,4,characteristics);
+ *fixed_portion = 8;
break;
}
@@ -3389,6 +3417,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
DEBUG(0,("vfs_statvfs() failed for service [%s]\n",lp_servicename(SNUM(conn))));
return NT_STATUS_DOS(ERRSRV, ERRerror);
}
+ *fixed_portion = 24;
break;
}
@@ -3519,7 +3548,7 @@ cBytesSector=%u, cUnitTotal=%u, cUnitAvail=%d\n", (unsigned int)bsize, (unsigned
}
*ret_data_len = data_len;
- return NT_STATUS_OK;
+ return status;
}
/****************************************************************************
@@ -3535,6 +3564,7 @@ static void call_trans2qfsinfo(connection_struct *conn,
char *params = *pparams;
uint16_t info_level;
int data_len = 0;
+ size_t fixed_portion;
NTSTATUS status;
if (total_params < 2) {
@@ -3561,6 +3591,7 @@ static void call_trans2qfsinfo(connection_struct *conn,
info_level,
req->flags2,
max_data_bytes,
+ &fixed_portion,
NULL,
ppdata, &data_len);
if (!NT_STATUS_IS_OK(status)) {
@@ -4114,6 +4145,10 @@ static NTSTATUS marshall_stream_info(unsigned int num_streams,
unsigned int i;
unsigned int ofs = 0;
+ if (max_data_bytes < 32) {
+ return NT_STATUS_INFO_LENGTH_MISMATCH;
+ }
+
for (i = 0; i < num_streams; i++) {
unsigned int next_offset;
size_t namelen;
@@ -4265,6 +4300,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
char *lock_data,
uint16_t flags2,
unsigned int max_data_bytes,
+ size_t *fixed_portion,
char **ppdata,
unsigned int *pdata_size)
{
@@ -4400,6 +4436,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
BasicFileInformationTest. -tpot */
file_index = get_FileIndex(conn, psbuf);
+ *fixed_portion = 0;
+
switch (info_level) {
case SMB_INFO_STANDARD:
DEBUG(10,("smbd_do_qfilepathinfo: SMB_INFO_STANDARD\n"));
@@ -4537,6 +4575,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
DEBUG(5,("write: %s ", ctime(&mtime)));
DEBUG(5,("change: %s ", ctime(&c_time)));
DEBUG(5,("mode: %x\n", mode));
+ *fixed_portion = data_size;
break;
case SMB_FILE_STANDARD_INFORMATION:
@@ -4550,6 +4589,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SCVAL(pdata,20,delete_pending?1:0);
SCVAL(pdata,21,(mode&FILE_ATTRIBUTE_DIRECTORY)?1:0);
SSVAL(pdata,22,0); /* Padding. */
+ *fixed_portion = 24;
break;
case SMB_FILE_EA_INFORMATION:
@@ -4559,6 +4599,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
estimate_ea_size(conn, fsp, smb_fname->base_name);
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_EA_INFORMATION\n"));
data_size = 4;
+ *fixed_portion = 4;
SIVAL(pdata,0,ea_size);
break;
}
@@ -4580,6 +4621,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
STR_UNICODE);
data_size = 4 + len;
SIVAL(pdata,0,len);
+ *fixed_portion = 8;
break;
}
@@ -4643,6 +4685,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SIVAL(pdata,0,len);
pdata += 4 + len;
data_size = PTR_DIFF(pdata,(*ppdata));
+ *fixed_portion = 10;
break;
}
@@ -4680,6 +4723,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SIVAL(pdata,0,len);
pdata += 4 + len;
data_size = PTR_DIFF(pdata,(*ppdata));
+ *fixed_portion = 104;
break;
}
case SMB_FILE_INTERNAL_INFORMATION:
@@ -4687,12 +4731,14 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_INTERNAL_INFORMATION\n"));
SBVAL(pdata, 0, file_index);
data_size = 8;
+ *fixed_portion = 8;
break;
case SMB_FILE_ACCESS_INFORMATION:
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ACCESS_INFORMATION\n"));
SIVAL(pdata, 0, access_mask);
data_size = 4;
+ *fixed_portion = 4;
break;
case SMB_FILE_NAME_INFORMATION:
@@ -4710,24 +4756,28 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_DISPOSITION_INFORMATION\n"));
data_size = 1;
SCVAL(pdata,0,delete_pending);
+ *fixed_portion = 1;
break;
case SMB_FILE_POSITION_INFORMATION:
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_POSITION_INFORMATION\n"));
data_size = 8;
SOFF_T(pdata,0,pos);
+ *fixed_portion = 8;
break;
case SMB_FILE_MODE_INFORMATION:
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_MODE_INFORMATION\n"));
SIVAL(pdata,0,mode);
data_size = 4;
+ *fixed_portion = 4;
break;
case SMB_FILE_ALIGNMENT_INFORMATION:
DEBUG(10,("smbd_do_qfilepathinfo: SMB_FILE_ALIGNMENT_INFORMATION\n"));
SIVAL(pdata,0,0); /* No alignment needed. */
data_size = 4;
+ *fixed_portion = 4;
break;
/*
@@ -4772,6 +4822,8 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
TALLOC_FREE(streams);
+ *fixed_portion = 32;
+
break;
}
case SMB_QUERY_COMPRESSION_INFO:
@@ -4781,6 +4833,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SIVAL(pdata,8,0); /* ??? */
SIVAL(pdata,12,0); /* ??? */
data_size = 16;
+ *fixed_portion = 16;
break;
case SMB_FILE_NETWORK_OPEN_INFORMATION:
@@ -4794,6 +4847,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SIVAL(pdata,48,mode);
SIVAL(pdata,52,0); /* ??? */
data_size = 56;
+ *fixed_portion = 56;
break;
case SMB_FILE_ATTRIBUTE_TAG_INFORMATION:
@@ -4801,6 +4855,7 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn,
SIVAL(pdata,0,mode);
SIVAL(pdata,4,0);
data_size = 8;
+ *fixed_portion = 8;
break;
/*
@@ -5070,6 +5125,7 @@ static void call_trans2qfilepathinfo(connection_struct *conn,
struct ea_list *ea_list = NULL;
int lock_data_count = 0;
char *lock_data = NULL;
+ size_t fixed_portion;
NTSTATUS status = NT_STATUS_OK;
if (!params) {
@@ -5431,11 +5487,16 @@ total_data=%u (should be %u)\n", (unsigned int)total_data, (unsigned int)IVAL(pd
ea_list,
lock_data_count, lock_data,
req->flags2, max_data_bytes,
+ &fixed_portion,
ppdata, &data_size);
if (!NT_STATUS_IS_OK(status)) {
reply_nterror(req, status);
return;
}
+ if (fixed_portion > max_data_bytes) {
+ reply_nterror(req, NT_STATUS_INFO_LENGTH_MISMATCH);
+ return;
+ }
send_trans2_replies(conn, req, params, param_size, *ppdata, data_size,
max_data_bytes);
diff --git a/source3/utils/net_serverid.c b/source3/utils/net_serverid.c
index 08a1a7f..5e61f11 100644
--- a/source3/utils/net_serverid.c
+++ b/source3/utils/net_serverid.c
@@ -36,6 +36,10 @@ static int net_serverid_list_fn(const struct server_id *id,
static int net_serverid_list(struct net_context *c, int argc,
const char **argv)
{
+ if (!serverid_init_readonly(c)) {
+ d_printf("failed to open serverid.tdb\n");
+ return -1;
+ }
d_printf("pid unique_id msg_flags\n");
return serverid_traverse_read(net_serverid_list_fn, NULL) ? 0 : -1;
}
@@ -113,6 +117,11 @@ static int net_serverid_wipedbs_sessionid(struct db_record *rec,
static int net_serverid_wipedbs(struct net_context *c, int argc,
const char **argv)
{
+ if (!sessionid_init()) {
+ d_printf("failed to open sessionid.tdb\n");
+ return -1;
+ };
+
connections_forall(net_serverid_wipedbs_conn, NULL);
sessionid_traverse(net_serverid_wipedbs_sessionid, NULL);
return 0;
diff --git a/source3/utils/net_status.c b/source3/utils/net_status.c
index d602743..857b184 100644
--- a/source3/utils/net_status.c
+++ b/source3/utils/net_status.c
@@ -239,5 +239,11 @@ int net_status(struct net_context *c, int argc, const char **argv)
},
{NULL, NULL, 0, NULL, NULL}
};
+
+ if (!sessionid_init_readonly()) {
+ d_printf("failed to open sessionid.tdb\n");
+ return -1;
+ }
+
return net_run_function(c, argc, argv, "net status", func);
}
diff --git a/source3/utils/status.c b/source3/utils/status.c
index cf625fb..b89a779 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -38,6 +38,7 @@
#include "session.h"
#include "locking/proto.h"
#include "messages.h"
+#include "serverid.h"
#define SMB_MAXPIDS 2048
static uid_t Ucrit_uid = 0; /* added by OH */
@@ -378,6 +379,12 @@ static int traverse_sessionid(const char *key, struct sessionid *session,
}
+ if (!sessionid_init_readonly()) {
+ fprintf(stderr, "Can't open sessionid.tdb\n");
+ ret = -1;
+ goto done;
+ }
+
if (lp_clustering()) {
/*
* This implicitly initializes the global ctdbd
@@ -470,6 +477,11 @@ static int traverse_sessionid(const char *key, struct sessionid *session,
goto done;
}
+ if (!serverid_init_readonly(frame)) {
+ d_printf("Can't initialise serverid tdb - exiting\n");
+ ret = 1;
+ goto done;
+ }
result = share_mode_forall(print_share_mode, NULL);
if (result == 0) {
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 9cb3717..c502e83 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -2589,11 +2589,16 @@ NTSTATUS cm_connect_lsat(struct winbindd_domain *domain,
invalidate_cm_connection(&domain->conn);
status = cm_connect_lsa_tcp(domain, mem_ctx, cli);
}
- if (!NT_STATUS_IS_OK(status)) {
+ if (NT_STATUS_IS_OK(status)) {
return status;
}
- return NT_STATUS_OK;
+ /*
+ * we tried twice to connect via ncan_ip_tcp and schannel and
+ * failed - maybe it is a trusted domain we can't connect to ?
+ * do not try tcp next time - gd
+ */
+ domain->can_do_ncacn_ip_tcp = false;
}
status = cm_connect_lsa(domain, mem_ctx, cli, lsa_policy);
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index a966202..125e393 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -668,6 +668,14 @@ static NTSTATUS winbindd_raw_kerberos_login(TALLOC_CTX *mem_ctx,
return NT_STATUS_OK;
failed:
+ /*
+ * Do not delete an existing valid credential cache, if the user
+ * e.g. enters a wrong password
+ */
+ if ((strequal(krb5_cc_type, "FILE") || strequal(krb5_cc_type, "WRFILE"))
+ && user_ccache_file != NULL) {
+ return result;
+ }
/* we could have created a new credential cache with a valid tgt in it
* but we werent able to get or verify the service ticket for this
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list