[SCM] Samba Shared Repository - branch v4-1-stable updated
Karolin Seeger
kseeger at samba.org
Wed Sep 11 09:30:33 CEST 2013
The branch, v4-1-stable has been updated
via 6a03c81 VERSION: Disable git snapshots for the 4.1.0rc3 release.
via d9517d5 WHATSNEW: Update changes since 4.1.0rc2.
via cfa4e2a Optimization. Don't do the retry logic if sitename_fetch() returned NULL, we already did a NULL query.
via 3912eeb9 Move the retry logic when site_name is passed in a NULL or "" to the wrapper function.
via 2d7fe2b Move the manipulation of site_name into the caller function dsgetdcname().
via 0c046a4 Refactor dsgetdcname to be called via a wrapper function.
via a616bbc dsgetdcname_cache_fetch() doesn't use the site_name parameter so don't pass it.
via 317f960 smbd: Correctly return INFO_LENGTH_MISMATCH for smb1
via 26ac864 smbd: Fix error return for STREAM_INFO
via db4e8a7 smbd: Revert a93f9c3
via 0e91fd6 smbd: Correctly return BUFFER_OVERFLOW in smb2_getinfo
via 9444c6f smbd: Correctly return INFO_LENGTH_MISMATCH in smb2_getinfo
via b4427b9 smbd: qfsinfo has fixed/variable buffers
via 3691f46 smbd: qfilepathinfo has fixed/variable buffers
via 6ee8231 smbd: Use #defines in smb2_getinfo_send
via a9ef99c s3:smbd: allow info class SMB_QUERY_FS_ATTRIBUTE_INFO to return partial data
via 25fbced s3:smbd: allow info class SMB_QUERY_FS_VOLUME_INFO to return partial data
via 342afee s3:smbd: allow status code in smbd_do_qfsinfo() to be set by information class handler
via 5e75d4b s3:smbd: allow GetInfo responses with STATUS_BUFFER_OVERFLOW to return partial, but valid data
via 2b411e6 s3:smbd: return NT_STATUS_INFO_LENGTH_MISMATCH for GetInfo in case output_buffer_length is too small
via a654601 torture: Ensure that GSSAPI and SPNEGO packets are accepted by dlz_bind9
via 1e653e4 selftest: Add a basic test of samba_upgradedns
via 79b7888 selftest: Start internal DNS server on domain provisioned for BIND9_DLZ
via 0d7c1f0 selftest: Test creation of the dns-SERVER account during selftest
via e00be93 scripting/samba_upgradedns: Tighten up exception and attribute list handling
via fee6fa5 scripting/join.py: Handle creating the dns-NAME account during a DC join
via e6cbc39 WHATSNEW: Add paragraph about SMB2/3 support for client tools/library.
via cf677c4 WHATSNEW: Add release notes for Samba 4.1.0rc3.
via bfd3cc3 python/provision: remove unused linklocal=False argument from interface_ips_v6()
via 21708c1 s4:samba_upgradedns: don't pass linklocal=False to interface_ips_v6()
via 10c1784 python/pyglue: filter out loopback and linklocal addresses unless all_interfaces is given
via ac1a309 client: add missing newlines to error messages for invalid iosize parameter.
via 5ba00cf Add documentation for the new internal command timeout to smbclient.
via b455784 Add documentation for the new -t <timeout> parameter in smbclient.
via 742c5c6 Fix the documentation of --encrypt to explain SMB3 encryption for smbclient.
via 4b3ce19 Fix the documentation of the iosize command to explain the new zero default for smbclient.
via bd16454 Fix the documentation for --send-buffersize for the new default value of zero for smbclient.
via 11890a5 Expand on the documentation of -m max-protocol for SMB2/3 for smbclient.
via cda1b51 Add "-e" encrypt transport command line option documentation for smbcacls.
via ff43be5 Add "max protocol" command line documentation for smbcacls.
via 69058ee Add new "timeout" command and -t option to smbclient to set the per-operation timeout.
via c0aed70 As SMB3 has transport level encryption, allow smbclient -e to force encryted SMB3 transport.
via 449503d Remove restrictions on setting iosize inside smbclient for SMB2 connections.
via 947cd1d libsmb: Fix a bunch of Coverity IDs
via 2fb817c s3:libsmb: call smb2cli_logoff() from cli_ulogoff()
via 159b051 s3:libsmb: make cli_ulogoff_send/recv static
via 409ab74 s3:libsmb: call smb2cli_tdis() from cli_tdis()
via 9d2ecfe s3:libsmb: only set tcon to invalid in smb2cli_tdis*
via c935ba3 s3:libsmb: make cli_tdis_send/recv static
via 26a1fd3 s3:libsmb: add support for SMB2 in cli_writeall()
via 1d0a87e s3:libsmb: add SMB2 support to cli_pull*
via e9d7054 s3:libsmb: add SMB2 support to cli_push*
via bd104ef s3:libsmb: Plumb cli_smb2_set_security_descriptor() inside cli_set_security_descriptor().
via c774061 s3:libsmb: Plumb cli_smb2_query_security_descriptor() inside cli_query_security_descriptor().
via 5ef4556 s3:libsmb: Plumb cli_smb2_qpathinfo_alt_name() inside cli_qpathinfo_alt_name().
via 919cb48 s3:libsmb: Plumb cli_smb2_qpathinfo_basic() inside cli_qpathinfo_basic().
via e7ff8b9 s3:libsmb: Plumb cli_smb2_qfileinfo_basic() inside cli_qfileinfo_basic().
via b8baf6d s3:libsmb: Plumb cli_smb2_qpathinfo_streams() inside cli_qpathinfo_streams().
via 509fe6d s3:libsmb: Plumb cli_smb2_qpathinfo2() inside cli_qpathinfo2().
via afb3b39 s3:libsmb: Plumb cli_smb2_list() inside cli_list().
via 056d800 s3:libsmb: Plumb cli_smb2_get_ea_list_path() inside cli_get_ea_list_path().
via a9d9142 s3:libsmb: Plumb cli_smb2_set_ea_fnum() inside cli_set_ea_fnum().
via 90c733a s3:libsmb: Plumb cli_smb2_set_ea_path() inside cli_set_ea_path().
via 663fa90 s3:libsmb: Fix cli_set_ea_path() to use frame instead of talloc_tos().
via 776e653 s3:libsmb: Plumb cli_smb2_dskattr() inside cli_dskattr().
via 65e9cb0 s3:libsmb: Plumb cli_smb2_getatr() inside cli_getatr().
via 79015d4 s3:libsmb: Plumb cli_smb2_setatr() inside cli_setatr().
via 40a7f2c s3:libsmb: Plumb cli_smb2_setattrE() inside cli_setattrE().
via 6a9b514 s3:libsmb: Plumb cli_smb2_getattrE() inside cli_getattrE().
via 6d938a2 s3:libsmb: Plumb cli_smb2_close_fnum() inside cli_close().
via c629546 s3:libsmb: Plumb cli_smb2_create_fnum() inside cli_ntcreate().
via 967357a s3:libsmb: Plumb cli_smb2_rmdir() inside cli_rmdir().
via ea30277 s3:libsmb: Plumb cli_smb2_mkdir() inside cli_mkdir().
via 5e14ff8 s3:libsmb: Plumb cli_smb2_unlink() inside cli_unlink().
via f041217 s3:libsmb: Plumb cli_smb2_rename() inside cli_rename().
via 086075e s3:libsmb: Add in the core of the libsmb client SMB2 functions.
via 2167e59 s3:lib: Factor read_ea_list_entry() and read_nttrans_ea_list() out so they can be used by the SMB2 client code.
via 7ff7f66 s3:client: fix compiler warning
via a06f581 s3:client: use the default io size
via a6b81a0 s3:libsmb: remove unused cli_readall*
via 21d0294 s3:libsmb: rewrite cli_pull* to use smb1cli_conn_req_possible()
via 21b1120 s3:libsmb: rewrite cli_push* to use smb1cli_conn_req_possible()
via c66525c libcli/smb: add smb2cli_conn_req_possible()
via 12b040b libcli/smb: add smb1cli_conn_req_possible()
via 60a05c0 libcli/smb: pass max_dyn_len to smb2cli_req_send()
via 0a880e0 libcli/smb: pass max_dyn_len to smb2cli_req_create()
via d0fbe4f libcli/smb: calculate the credit charge on the input and output dyn_len
via 72bfc65 libcli/smb: Change smb2cli_create() and smb2cli_create_recv() to return a parameter blob of the newly opened/created file.
via 0526566 libcli/smb: Fix smb2cli_write_recv() and smb2cli_write() to return the bytes written.
via 801bcd0 libcli/smb: fix the credit handling on a SMB1 => SMB2 negotiate
via d9f3bd2 s3:smbcacls: Add -m<MAX PROTOCOL> option to smbcacls.
via 98426d1 s3:libsmb: make use of lp_cli_{min,max}protocol() in SMBC_server_internal()
via bf02a46 s3:libsmb: use lp_cli_minprotocol() in do_connect()
via 58e621b s3:winbindd: make use of lp_cli_{min,max}protocol()
via f017d59 s3:lib/netapi: make use of lp_cli_maxprotocol()
via aadf310 s3:libsmb: Ensure we ask for DEFAULT_SMB2_MAX_CREDITS on successful negprot.
via a0ea1c0 s3:libsmb: Modify cli_start_connection_connected() to use lp_cli_minprotocol()/lp_cli_maxprotocol() instead of hard coding PROTOCOL_CORE, PROTOCOL_NT1.
via d0a5cf5 s3:lib: remove unused interpret_protocol()
via 88e1188 s3:torture: avoid interpret_protocol()
via 723bc67 s3:client: avoid interpret_protocol()
via ac26652 s3:param: Correctly set up cli_maxprotocol, cli_minprotocol in our parameter block.
via db6081f Fix the UNIX extensions CHOWN calls to use FCHOWN if available, else LCHOWN.
via d953374 Allow UNIX extensions client to act on open fsp instead of pathname if available.
via 954ecdf Fix the erroneous masking of chmod requests via the UNIX extensions.
via 163c0b3 s3:winbind: fail ads_cached_connection_connect() if realm == NULL
via 1c53cdd2 s3-winbindd: remove unneded include of secrets.h from idmap_ad.c
via b2276cd s3-winbindd: use get_trust_pw_clear() wrapper for AD connection code.
via 11fd36c s3-winbindd: make sure also the idmap code can deal with trusted domains.
via f486e86 s3-winbindd: use find_domain_from_name() instead of find_domain_from_name_no_init().
via ae20e2d s3-winbindd: Fix winbind on DC crash with trusted AD domains.
via ac40660 s3-winbindd: Fix memory leak in ads_cached_connection().
via a07ff7c s3-winbindd: remove pointless variable assigment, see the strdup below.
via 7c4011f smbd: Simplify dropbox special case in unix_convert
via 0fc78f9 smbd: Fix a profile problem
via 462cb9c docs: Add man samba-regedit.8.
via 6b6cab7 Fix bug #10063 - source3/lib/util.c:1493 leaking memory w/ pam_winbind.so / winbind
via c41ffd5 ntdbtool.8.xml: Bump version up to 4.1.
via db1ea01 ntdbrestore.8.xml: Bump version up to 4.1.
via aa916b7 ntdbdump.8.xml: Bump version up to 4.1.
via c0189f9 ntdbbackup.8.xml: Bump version up to 4.1.
via d969f6a ntdb.3.xml: Bump version up to 4.1.
via ef73d4c Man pages for ntdb tools missing
via 3487e49 s3-winbindd: fix fallback to ncacn_np in cm_connect_lsat().
via 7accc37 waf: replace dependency to libintl with samba_intl
via 8400442 waf: consolidate libintl related checks
via 3b23073 waf: add --without-gettext option
via 0f17c8d waf: fix build on AIX7
via 7af0c4f s3:lib/system fix build on AIX 7
via 11954a4 smbd: Fix async echo handler forking (Bug 10086)
via 6bf3319 Fix bug #10097 - MacOSX 10.9 will not follow path-based DFS referrals handed out by Samba.
via f036cee docs: Fix variable list in man vfs_crossrename.
via 2890940 Followup patch for BUG: https://bugzilla.samba.org/show_bug.cgi?id=10082
via 2f03250 s3-winbind: Fix a segfault passing NULL to a fstring argument.
via 87c63fd docs: Add man vfs_syncops.8 to waf build.
via 117e7ee docs: Add basic man page for vfs_syncops.
via f3a9fe5 s3-libads: Print a message if no realm has been specified.
via a183dcd s3-libads: Fail create_local_private_krb5_conf_for_domain() if parameters missing.
via e9edcb3 docs: Add man page for vfs_linux_xfs_sgid.
via 694d54a VERSION: Bump version number up to 4.1.0rc3...
from 589cb52 VERSION: Disable git snapshots for the 4.1.0rc2 release.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-1-stable
- Log -----------------------------------------------------------------
commit 6a03c817b3a0ef278d10893eafd327ee20bdca58
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Sep 6 11:46:16 2013 +0200
VERSION: Disable git snapshots for the 4.1.0rc3 release.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
commit d9517d5d80938d0a79351b7197b5a5f3e019448a
Author: Karolin Seeger <kseeger at samba.org>
Date: Fri Sep 6 11:11:39 2013 +0200
WHATSNEW: Update changes since 4.1.0rc2.
Signed-off-by: Karolin Seeger <kseeger at samba.org>
-----------------------------------------------------------------------
Summary of changes:
VERSION | 2 +-
WHATSNEW.txt | 147 ++-
buildtools/wafsamba/wscript | 5 +-
docs-xml/manpages/samba-regedit.8.xml | 121 ++
docs-xml/manpages/smbcacls.1.xml | 27 +
docs-xml/manpages/smbclient.1.xml | 77 +-
docs-xml/manpages/vfs_crossrename.8.xml | 20 +-
docs-xml/manpages/vfs_linux_xfs_sgid.8.xml | 74 +
docs-xml/manpages/vfs_syncops.8.xml | 99 ++
docs-xml/wscript_build | 3 +
lib/ntdb/man/ntdb.3.xml | 132 ++
lib/ntdb/man/ntdbbackup.8.xml | 150 ++
lib/ntdb/man/ntdbdump.8.xml | 93 ++
lib/ntdb/man/ntdbrestore.8.xml | 74 +
lib/ntdb/man/ntdbtool.8.xml | 251 +++
lib/ntdb/wscript | 13 +-
lib/replace/wscript | 46 +-
libcli/smb/smb2_create_blob.h | 12 +
libcli/smb/smb2cli_close.c | 3 +-
libcli/smb/smb2cli_create.c | 52 +-
libcli/smb/smb2cli_echo.c | 3 +-
libcli/smb/smb2cli_flush.c | 3 +-
libcli/smb/smb2cli_ioctl.c | 13 +-
libcli/smb/smb2cli_query_directory.c | 3 +-
libcli/smb/smb2cli_query_info.c | 3 +-
libcli/smb/smb2cli_read.c | 3 +-
libcli/smb/smb2cli_session.c | 6 +-
libcli/smb/smb2cli_set_info.c | 3 +-
libcli/smb/smb2cli_write.c | 33 +-
libcli/smb/smbXcli_base.c | 95 +-
libcli/smb/smbXcli_base.h | 22 +-
nsswitch/wscript_build | 2 +-
python/pyglue.c | 45 +-
python/samba/join.py | 73 +-
python/samba/provision/__init__.py | 6 +-
python/samba/provision/sambadns.py | 11 +-
selftest/target/Samba4.pm | 4 +-
source3/client/client.c | 86 +-
source3/include/client.h | 1 +
source3/include/ntioctl.h | 1 +
source3/include/proto.h | 3 +-
source3/lib/netapi/cm.c | 2 +-
source3/lib/system.c | 15 +-
source3/lib/util.c | 31 +-
source3/lib/util_ea.c | 126 ++
source3/lib/util_ea.h | 36 +
source3/libads/kerberos.c | 10 +
source3/libsmb/cli_np_tstream.c | 10 +-
source3/libsmb/cli_smb2_fnum.c | 2373 +++++++++++++++++++++++++++
source3/libsmb/cli_smb2_fnum.h | 161 ++
source3/libsmb/cliconnect.c | 37 +-
source3/libsmb/clidfs.c | 26 +-
source3/libsmb/clifile.c | 158 ++-
source3/libsmb/clilist.c | 8 +-
source3/libsmb/clirap.c | 64 +-
source3/libsmb/clirap.h | 4 +
source3/libsmb/clireadwrite.c | 908 ++++++-----
source3/libsmb/clisecdesc.c | 16 +
source3/libsmb/dsgetdcname.c | 85 +-
source3/libsmb/libsmb.h | 1 +
source3/libsmb/libsmb_server.c | 6 +-
source3/libsmb/proto.h | 8 -
source3/libsmb/smb2cli_tcon.c | 9 +-
source3/param/loadparm.c | 2 +
source3/smbd/dosmode.c | 5 +
source3/smbd/filename.c | 28 +-
source3/smbd/globals.h | 2 +
source3/smbd/negprot.c | 9 +-
source3/smbd/nttrans.c | 50 +-
source3/smbd/reply.c | 48 +-
source3/smbd/smb2_create.c | 3 +-
source3/smbd/smb2_getinfo.c | 47 +-
source3/smbd/smbd.h | 1 +
source3/smbd/trans2.c | 189 ++-
source3/torture/masktest.c | 5 +-
source3/torture/test_smb2.c | 62 +-
source3/torture/torture.c | 3 +-
source3/utils/smbcacls.c | 4 +
source3/winbindd/idmap_ad.c | 1 -
source3/winbindd/winbindd_ads.c | 62 +-
source3/winbindd/winbindd_cm.c | 29 +-
source3/wscript | 9 +-
source3/wscript_build | 8 +-
source4/heimdal_build/wscript_build | 4 +-
source4/heimdal_build/wscript_configure | 4 +-
source4/libcli/smb2/transport.c | 9 +-
source4/scripting/bin/samba_upgradedns | 32 +-
source4/selftest/tests.py | 3 +-
source4/setup/secrets_dns.ldif | 2 +-
source4/torture/dns/dlz_bind9.c | 78 +
source4/torture/winbind/winbind.c | 1 +
testprogs/blackbox/test_samba_upgradedns.sh | 37 +
92 files changed, 5769 insertions(+), 882 deletions(-)
create mode 100644 docs-xml/manpages/samba-regedit.8.xml
create mode 100644 docs-xml/manpages/vfs_linux_xfs_sgid.8.xml
create mode 100644 docs-xml/manpages/vfs_syncops.8.xml
create mode 100644 lib/ntdb/man/ntdb.3.xml
create mode 100644 lib/ntdb/man/ntdbbackup.8.xml
create mode 100644 lib/ntdb/man/ntdbdump.8.xml
create mode 100644 lib/ntdb/man/ntdbrestore.8.xml
create mode 100644 lib/ntdb/man/ntdbtool.8.xml
create mode 100644 source3/lib/util_ea.c
create mode 100644 source3/lib/util_ea.h
create mode 100644 source3/libsmb/cli_smb2_fnum.c
create mode 100644 source3/libsmb/cli_smb2_fnum.h
create mode 100755 testprogs/blackbox/test_samba_upgradedns.sh
Changeset truncated at 500 lines:
diff --git a/VERSION b/VERSION
index 07ce7cd..acbd226 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
# e.g. SAMBA_VERSION_RC_RELEASE=1 #
# -> "3.0.0rc1" #
########################################################
-SAMBA_VERSION_RC_RELEASE=2
+SAMBA_VERSION_RC_RELEASE=3
########################################################
# To mark SVN snapshots this should be set to 'yes' #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index c176388..eeb6307 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,7 +1,7 @@
Release Announcements
=====================
-This is the second release candidate of Samba 4.1. This is *not*
+This is the third release candidate of Samba 4.1. This is *not*
intended for production environments and is designed for testing
purposes only. Please report any defects via the Samba bug reporting
system at https://bugzilla.samba.org/.
@@ -19,6 +19,73 @@ releases candidates, you should backup all configuration and data.
NEW FEATURES
============
+Client tools support SMB2/3
+===========================
+
+Samba 4.1.0 contains the first release of our client tools
+and client library that work over the new protocols SMB2 or SMB3.
+Note that SMB3 only works either to a Samba server version 4.0.0
+or above, or to a Windows Server running Windows 2012 or Windows 8.
+
+The default protocol for smbclient and smbcacls is still
+SMB1 (the NT1 protocol dialect). An SMB2 or SMB3 connection
+can be selected in one of two ways. The easiest way to test
+the new protocol connection is to add the -mMAX_PROTOCOL
+command line switch to either smbclient or smbcacls.
+
+For example, to connect using SMB3 with smbclient a user
+would type:
+
+smbclient //server/share -Uuser%password -mSMB3
+
+Another example of connecting using SMB2 using smbcacls
+would be:
+
+smbcacls //server/share -Uuser%password -mSMB2 filename
+
+Note that when connecting using SMB2 or SMB3 protocols
+the UNIX extensions are no longer available inside the
+smbclient command set. This is due to UNIX extensions
+not yet being defined for the SMB2 or SMB3 protocols.
+
+The second way to select SMB2 or SMB3 connections is to
+set the "client max protocol" parameter in the [global]
+section of your smb.conf.
+
+Setting this parameter will cause all client connections
+from Samba and its client tools to offer the requested
+max protocol to a server on every connection request.
+
+For example, to cause all client tools (including winbindd,
+rpcclient, and the libsmbclient library) to attempt use SMB3
+by default add the line:
+
+client max protocol = SMB3
+
+to the [global] section of your smb.conf. This has not
+been as widely tested as the -mPROTOCOL options, but
+is intended to work correctly in the final release of
+4.1.0.
+
+Encrypted transport
+===================
+
+Although Samba servers have supported encrypted transport
+connections using the UNIX extensions for many years,
+selecting SMB3 transport allows encrypted transport
+connections to Windows servers that support SMB3, as
+well as Samba servers.
+
+In order to enable this, add the "-e" option to the
+smbclient command line.
+
+For example, to connect to a Windows 2012 server over
+SMB3 and select an encrypted transport you would use
+the following command line:
+
+smbclient //Win2012Server/share -Uuser%password -mSMB3 -e
+
+
Directory database replication (AD DC mode)
===========================================
@@ -79,20 +146,94 @@ smb.conf changes
RUNNING Samba 4.1 as an AD DC
=============================
-A short guide to setting up Samba 4 as an AD DC can be found on the wiki:
+A short guide to setting up Samba as an AD DC can be found on the wiki:
- http://wiki.samba.org/index.php/Samba4/HOWTO
+ https://wiki.samba.org/index.php/Samba_AD_DC_HOWTO
COMMIT HIGHLIGHTS
=================
+o Jeremy Allison <jra at samba.org>
+ * Add SMB2 and SMB3 support for client tools and client library.
+ * Add support for SMB3 Encrypted transport.
+
+
o David Disseldorp <ddiss at samba.org>
* Add vfs_btrfs module.
* Add support for server-side copy operations via the
SMB2 FSCTL_SRV_COPYCHUNK request.
+CHANGES SINCE 4.1.0rc2
+======================
+
+o Michael Adam <obnox at samba.org>
+ * BUG 10107: Fix Winbind crashes on DC with trusted AD domains.
+
+
+o Jeremy Allison <jra at samba.org>
+ * BUG 5917: Fix working on site with Read Only Domain Controller.
+ * BUG 9974: Add SMB2 and SMB3 support for smbclient.
+ * BUG 10063: Fix memory leak in source3/lib/util.c:1493.
+ * BUG 10121: Masks incorrectly applied to UNIX extension permission
+ changes.
+
+
+o Christian Ambach <ambi at samba.org>
+ * BUG 9911: Build Samba 4.0.x on AIX with IBM XL C/C++.
+
+
+o Andrew Bartlett <abartlet at samba.org>
+ * BUG 9091: When replicating DNS for bind9_dlz we need to create the
+ server-DNS account remotely.
+
+
+o Günther Deschner <gd at samba.org>
+ * BUG 9615: Winbind unable to retrieve user information from AD.
+ * BUG 9899: winbind_lookup_names() fails because of
+ NT_STATUS_CANT_ACCESS_DOMAIN_INFO.
+ * BUG 10107: Fix Winbind crashes on DC with trusted AD domains.
+
+
+o Volker Lendecke <vl at samba.org>
+ * BUG 10086: smbd: Fix async echo handler forking.
+ * 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 Stefan Metzmacher <metze at samba.org>
+ * BUG 10030: ::1 added to nameserver on join.
+
+
+o Rusty Russell <rusty at rustcorp.com.au>
+ * BUG 10000: Add man pages for ntdb tools.
+
+
+o Karolin Seeger <kseeger at samba.org>
+ * BUG 7364: Add man page for vfs_syncops.
+ * BUG 7490: Add man page for vfs_linux_xfs_sgid.
+ * BUG 10001: Add man page for samba-regedit tool.
+ * BUG 10076: Fix variable list in vfs_crossrename man page.
+
+
+o Andreas Schneider <asn at samba.org>
+ * BUG 10073: Fix segmentation fault in 'net ads join'.
+ * BUG 10082: s3-winbind: Fix a segfault passing NULL to a fstring argument.
+
+
+o Richard Sharpe <realrichardsharpe at gmail.com>
+ * BUG 10097: MacOSX 10.9 will not follow path-based DFS referrals handed
+ out by Samba.
+
+
+o Ralph Wuerthner <ralph.wuerthner at de.ibm.com>
+ * BUG 10106: Honour output buffer length set by the client for SMB2 GetInfo
+ requests.
+
+
CHANGES SINCE 4.1.0rc1
======================
diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 17aef27..fe2e515 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -82,6 +82,9 @@ def set_options(opt):
help='additional directory to search for gettext',
action='store', dest='gettext_location', default='/usr/local',
match = ['Checking for library intl', 'Checking for header libintl.h'])
+ opt.add_option('--without-gettext',
+ help=("Disable use of gettext"),
+ action="store_true", dest='disable_gettext', default=False)
gr = opt.option_group('developer options')
@@ -322,7 +325,7 @@ def configure(conf):
else:
conf.env.HAVE_LD_VERSION_SCRIPT = False
- if sys.platform == "aix5" or sys.platform == "aix6":
+ if sys.platform.startswith('aix'):
conf.DEFINE('_ALL_SOURCE', 1, add_to_cflags=True)
# Might not be needed if ALL_SOURCE is defined
# conf.DEFINE('_XOPEN_SOURCE', 600, add_to_cflags=True)
diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
new file mode 100644
index 0000000..e7ec761
--- /dev/null
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="samba-regedit.8">
+
+<refmeta>
+ <refentrytitle>samba-regedit</refentrytitle>
+ <manvolnum>8</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">System Administration tools</refmiscinfo>
+ <refmiscinfo class="version">4.1</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>samba-regedit</refname>
+ <refpurpose>ncurses based tool to manage the Samba registry</refpurpose>
+</refnamediv>
+
+<refsynopsisdiv>
+ <cmdsynopsis>
+ <command>samba-regedit</command>
+ <arg choice="opt">--help</arg>
+ <arg choice="opt">--usage</arg>
+ <arg choice="opt">-d <debug level></arg>
+ <arg choice="opt">-s <configuration file></arg>
+ <arg choice="opt">-l <log directory></arg>
+ <arg choice="opt">-V</arg>
+ <arg choice="opt">--option=<parameter>=<value></arg>
+ <arg choice="opt">--socket-options=<SOCKETOPTIONS></arg>
+ <arg choice="opt">--netbiosname=<NETBIOSNAME></arg>
+ <arg choice="opt">--workgroup=<WORKGROUP></arg>
+ <arg choice="opt">--scope=<SCOPE></arg>
+ <arg choice="opt">--user=<USERNAME></arg>
+ <arg choice="opt">-N</arg>
+ <arg choice="opt">-k</arg>
+ <arg choice="opt">--authentication-file=<FILE></arg>
+ <arg choice="opt">--signing=[on|off|required]</arg>
+ <arg choice="opt">-P</arg>
+ <arg choice="opt">-e</arg>
+ <arg choice="opt">-C</arg>
+ <arg choice="opt">--pw-nt-hash</arg>
+ </cmdsynopsis>
+</refsynopsisdiv>
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>This tool is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.</para>
+ <para><command>samba-regedit</command> is a ncurses based tool to manage the Samba
+ registry. It can be used to show/edit registry keys/subkeys and
+ their values.</para>
+</refsect1>
+
+<refsect1>
+ <title>OPTIONS</title>
+ <variablelist>
+ &stdarg.help;
+ <varlistentry>
+ <term>--usage</term>
+ <listitem><para>Display brief usage message.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-d|--debuglevel=<debuglevel></term>
+ <listitem><para>Set debug level.</para></listitem>
+ </varlistentry>
+ &popt.common.samba;
+ <varlistentry>
+ <term>--option=<parameter>=<value></term>
+ <listitem><para>Set smb.conf option from command line.</para></listitem>
+ </varlistentry>
+ &popt.common.connection;
+ <varlistentry>
+ <term>-S|--signing</term>
+ <listitem><para>Set the client signing state.</para></listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>-P|--machine-pass</term>
+ <listitem><para>Use stored machine account password.</para></listitem>
+ </varlistentry>
+ &popt.common.credentials;
+ <varlistentry>
+ <term>-e|--encrypt</term>
+ <listitem><para>Encrypt SMB transport (UNIX extended servers only).</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>--pw-nt-hash</term>
+ <listitem><para>The supplied password is the NT hash.</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+</refsect1>
+
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>This man page is correct for version 4 of the Samba suite.</para>
+</refsect1>
+
+<refsect1>
+ <title>SEE ALSO</title>
+ <para><citerefentry><refentrytitle>smbd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>, <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> and <citerefentry><refentrytitle>net</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry>.</para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>The original Samba software and related utilities
+ were created by Andrew Tridgell. Samba is now developed
+ by the Samba Team as an Open Source project similar
+ to the way the Linux kernel is developed.</para>
+
+ <para>The samba-regedit man page was written by Karolin Seeger.</para>
+</refsect1>
+
+</refentry>
diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 91a1806..22b55cc 100644
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -33,6 +33,8 @@
<arg choice="opt">-U username</arg>
<arg choice="opt">-h</arg>
<arg choice="opt">-d</arg>
+ <arg choice="opt">-e</arg>
+ <arg choice="opt">-m|--max-protocol LEVEL</arg>
</cmdsynopsis>
</refsynopsisdiv>
@@ -139,6 +141,31 @@
</varlistentry>
<varlistentry>
+ <term>-e</term>
+ <listitem><para>This command line parameter requires the remote
+ server support the UNIX extensions or that the SMB3 protocol has been selected.
+ Requests that the connection be encrypted. Negotiates SMB encryption using either
+ SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+ the encryption negotiation (either kerberos or NTLMv1/v2 if given
+ domain/username/password triple. Fails the connection if encryption
+ cannot be negotiated.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>-m|--max-protocol PROTOCOL_NAME</term>
+ <listitem><para>This allows the user to select the
+ highest SMB protocol level that smbcacls will use to
+ connect to the server. By default this is set to
+ NT1, which is the highest available SMB1 protocol.
+ To connect using SMB2 or SMB3 protocol, use the
+ strings SMB2 or SMB3 respectively. Note that to connect
+ to a Windows 2012 server with encrypted transport selecting
+ a max-protocol of SMB3 is required.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-t|--test-args</term>
<listitem><para>
Don't actually do anything, only validate the correctness of
diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 328fd50..425cc4b 100644
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -37,6 +37,7 @@
<arg choice="opt">-p port</arg>
<arg choice="opt">-R <name resolve order></arg>
<arg choice="opt">-s <smb config file></arg>
+ <arg choice="opt">-t <per-operation timeout in seconds></arg>
<arg choice="opt">-k</arg>
<arg choice="opt">-P</arg>
<arg choice="opt">-c <command></arg>
@@ -67,6 +68,7 @@
<arg choice="opt">-p port</arg>
<arg choice="opt">-R <name resolve order></arg>
<arg choice="opt">-s <smb config file></arg>
+ <arg choice="opt">-t <per-operation timeout in seconds></arg>
<arg choice="opt">-T<c|x>IXFqgbNan</arg>
<arg choice="opt">-k</arg>
</cmdsynopsis>
@@ -256,7 +258,14 @@
<varlistentry>
<term>-m|--max-protocol protocol</term>
- <listitem><para>This parameter sets the maximum protocol version announced by the client.
+ <listitem><para>This allows the user to select the
+ highest SMB protocol level that smbclient will use to
+ connect to the server. By default this is set to
+ NT1, which is the highest available SMB1 protocol.
+ To connect using SMB2 or SMB3 protocol, use the
+ strings SMB2 or SMB3 respectively. Note that to connect
+ to a Windows 2012 server with encrypted transport selecting
+ a max-protocol of SMB3 is required.
</para></listitem>
</varlistentry>
@@ -309,22 +318,29 @@
<varlistentry>
<term>-b|--send-buffer buffersize</term>
- <listitem><para>This option changes the transmit/send buffer
- size when getting or putting a file from/to the server. The default
- is 65520 bytes. Setting this value smaller (to 1200 bytes) has been
- observed to speed up file transfers to and from a Win9x server.
+ <listitem><para>
+ When sending or receiving files, smbclient uses an
+ internal buffer sized by the maximum number of allowed requests
+ to the connected server. This command allows this size to be set to any
+ range between 0 (which means use the default server controlled size) bytes
+ and 16776960 (0xFFFF00) bytes. Using the server controlled size is the
+ most efficient as smbclient will pipeline as many simultaneous reads or
+ writes needed to keep the server as busy as possible. Setting this to
+ any other size will slow down the transfer. This can also be set
+ using the <command>iosize</command> command inside smbclient.
</para></listitem>
</varlistentry>
<varlistentry>
<term>-e|--encrypt</term>
- <listitem><para>This command line parameter requires the remote
- server support the UNIX extensions. Request that the connection be
- encrypted. This is new for Samba 3.2 and will only work with Samba
- 3.2 or above servers. Negotiates SMB encryption using GSSAPI. Uses
- the given credentials for the encryption negotiation (either kerberos
- or NTLMv1/v2 if given domain/username/password triple. Fails the
- connection if encryption cannot be negotiated.
+ <listitem><para>
+ This command line parameter requires the remote
+ server support the UNIX extensions or that the SMB3 protocol has been selected.
+ Requests that the connection be encrypted. Negotiates SMB encryption using either
+ SMB3 or POSIX extensions via GSSAPI. Uses the given credentials for
+ the encryption negotiation (either kerberos or NTLMv1/v2 if given
+ domain/username/password triple. Fails the connection if encryption
+ cannot be negotiated.
</para></listitem>
</varlistentry>
@@ -334,6 +350,18 @@
&popt.common.connection;
<varlistentry>
+ <term>-t|--timeout <timeout-seconds></term>
+ <listitem><para>This allows the user to tune the default
+ timeout used for each SMB request. The default setting is
+ 20 seconds. Increase it if requests to the server sometimes
+ time out. This can happen when SMB3 encryption is selected
+ and smbclient is overwhelming the server with requests.
+ This can also be set using the <command>timeout</command>
+ command inside smbclient.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-T|--tar tar options</term>
<listitem><para>smbclient may be used to create <command>tar(1)
</command> compatible backups of all the files on an SMB/CIFS
@@ -694,12 +722,15 @@
<varlistentry>
<term>iosize <bytes></term>
- <listitem><para>When sending or receiving files, smbclient uses an
- internal memory buffer by default of size 64512 bytes. This command
- allows this size to be set to any range between 16384 (0x4000) bytes
- and 16776960 (0xFFFF00) bytes. Larger sizes may mean more efficient
- data transfer as smbclient will try and use the most efficient
- read and write calls for the connected server.
+ <listitem><para>
+ When sending or receiving files, smbclient uses an
--
Samba Shared Repository
More information about the samba-cvs
mailing list