Karolin Seeger [Sat, 4 Jan 2014 19:15:34 +0000 (20:15 +0100)]
VERSION: Disable git snapshots for the 4.1.4 release.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Karolin Seeger [Tue, 7 Jan 2014 08:44:04 +0000 (09:44 +0100)]
WHATSNEW: Add release notes for Samba 4.1.4.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Christian Ambach [Mon, 16 Sep 2013 11:18:17 +0000 (13:18 +0200)]
s3:winbindd fix use of uninitialized variables
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10280
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
7393781a57891687b464762b0954e6c936f750bb)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Thu Jan 2 21:49:28 CET 2014 on sn-devel-104
Poornima Gurusiddaiah [Fri, 22 Nov 2013 05:04:11 +0000 (05:04 +0000)]
vfs_glusterfs: Enable per client log file
In Samba configuration file, one of the options of gluster type is
log file, the value of this option was not allowed to contain any
variables, as a result all the clients would have a single log file,
which complicated debugging.
In this patch, variable substitution is performed for gluster log file.
Hence allowing user to customise the gluster log file name.
Signed-off-by: Poornima Gurusiddaiah <pgurusid@redhat.com>
Reviewed-by: Ira Cooper <ira@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Tue Dec 17 23:44:16 CET 2013 on sn-devel-104
Fix bug #10337 - vfs_glusterfs: Enable per client log file.
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Thu Dec 26 21:21:07 CET 2013 on sn-devel-104
Jeremy Allison [Fri, 6 Dec 2013 23:58:02 +0000 (15:58 -0800)]
ldb: bad if test in ldb_comparison_fold()
Found by David Binderman <dcb314@hotmail.com>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10305
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Sat Dec 7 11:10:47 CET 2013 on sn-devel-104
Andreas Schneider [Wed, 27 Nov 2013 16:21:01 +0000 (17:21 +0100)]
s3-lib: Fix %G substitution for domain users in smbd
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10286
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Tue Dec 10 16:39:43 CET 2013 on sn-devel-104
(cherry picked from commit
8eef4ab79ec5fb7e96ad2f2ad6c9bf30db13a50d)
Signed-off-by: Andreas Schneider <asn@samba.org>
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Sat Dec 14 23:47:20 CET 2013 on sn-devel-104
Jeremy Allison [Wed, 4 Dec 2013 01:26:26 +0000 (17:26 -0800)]
smbtorture: New torture test for bug #9870.
Not fetching the latest modification time on a folder if we have read locks on it.
Prove we should just rely on the mtime value from the underlying
filesystem, even with an open handle.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9870
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Thu Dec 5 10:05:06 CET 2013 on sn-devel-104
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9870
Not fetching the latest modification time on a folder if we have read locks on
it.
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Tue Dec 10 20:19:08 CET 2013 on sn-devel-104
Jeremy Allison [Wed, 4 Dec 2013 01:22:19 +0000 (17:22 -0800)]
smbd - allow updates on directory write times on open handles.
If we set a non-null 'old timestamp' in the share mode database
when creating a directory handle, this prevents mtime (write time)
updates from being seen by clients, as we will always return the
timestamp stored in the database whilst the handle is open.
For files this is ok, as we update the stored timestamp
ourselves when we write to the handle. For directories
we should just rely on the mtime value from the underlying
filesystem.
Torture test to follow.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=9870
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Jan Brummer [Mon, 9 Dec 2013 14:22:29 +0000 (15:22 +0100)]
s3-winbindd: Fix DEBUG statement in winbind_msg_offline().
Guenther
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10285
Reviewed-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Günther Deschner <gd@samba.org>
Autobuild-Date(master): Mon Dec 9 17:28:37 CET 2013 on sn-devel-104
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Tue Dec 10 15:58:13 CET 2013 on sn-devel-104
Volker Lendecke [Thu, 5 Dec 2013 14:50:58 +0000 (15:50 +0100)]
smbd: Fix a panic when a smb2 brlock times out
Found by Peter Somogyi.
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Dec 5 21:21:35 CET 2013 on sn-devel-104
Fix bug #10311 - SMB2 server can panic when a smb2 brlock times out.
Christof Schmitt [Thu, 5 Dec 2013 22:53:47 +0000 (15:53 -0700)]
selftest: Remove samba3.smb2.lock.*.rw-exclusive from flapping file
This test demonstrates a problem with byte range locks and AIO.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Dec 6 05:19:37 CET 2013 on sn-devel-104
(cherry picked from commit
8c3bf7b84950fbb0305bcccd49ecfc202e08901a)
The last 5 patches address bug #10310 - Fix AIO with SMB2 and locks.
Christof Schmitt [Thu, 5 Dec 2013 22:22:13 +0000 (15:22 -0700)]
selftest: Run smb2.lock tests also against AIO share
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
d551d5256f9b1ca57b8018d816ea665c9b847ced)
Christof Schmitt [Thu, 5 Dec 2013 22:20:06 +0000 (15:20 -0700)]
selftest: Introduce share for testing AIO
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
63727c15450e1db2be49ade758c369aa4599657a)
Christof Schmitt [Thu, 5 Dec 2013 23:20:26 +0000 (16:20 -0700)]
s3: Return correct error code from SMB2 AIO read failure
This is similar to commit
27e20d5d60ea8aa526bcb7c2dfc18dd2de0bb97b which
fixed the same case for SMB2 writes: When sending the AIO read fails,
return the real error instead of mapping it to NT_STATUS_FILE_CLOSED.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
eadb2a54d1733a482999eb770182156dad1e184d)
Christof Schmitt [Thu, 5 Dec 2013 22:57:54 +0000 (15:57 -0700)]
s3-aio: Use correct locking context for SMB2
The synchronous SMB2 reads and writes use open_persistent_id. The AIO
codepathes have to use the same, otherwise a write will conflict with a
lock on the same open file.
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
dfef0701c398982226dde8a8e15ff97bba0fef53)
Stefan Metzmacher [Tue, 19 Nov 2013 04:21:05 +0000 (05:21 +0100)]
s3:smb2_server: avoid calling set_current_user_info() for each request
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
Autobuild-Date(master): Wed Nov 27 16:31:44 CET 2013 on sn-devel-104
(cherry picked from commit
3cc0651d9feda00b6a04f84b76744b2acc3a0446)
The last 6 patches address bug #10298 - smb2_server processing overhead.
Stefan Metzmacher [Mon, 14 Oct 2013 12:18:26 +0000 (14:18 +0200)]
s3:smb2_server: generate a header blob for the sendfile path
We need to pass the NBT header, SMB2 header and SMB2 Read header
as header blob to SMB_VFS_SENDFILE(). This allows the usage
of MSG_SEND or other tricks to avoid multiple TCP packets
on the wire.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
(cherry picked from commit
36efaac2597d2d36826c02f23be15e7323b09784)
Stefan Metzmacher [Wed, 16 Oct 2013 07:15:12 +0000 (09:15 +0200)]
s3:smb2_server: allocate smbd_smb2_request on talloc_tos()
This matches the behavior for smb1 requests
and avoids an additional malloc() per request.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
(cherry picked from commit
9d33a3f3e814e2924a423496ccc133c6c73fcd12)
Stefan Metzmacher [Sat, 12 Oct 2013 00:40:12 +0000 (02:40 +0200)]
s3:smb2_server: use tevent_req_notify_callback() in smbd_smb2_request_pending_queue()
If the request is already done we can avoid one iteration
of tevent_loop_once(), which means we avoids one
talloc_stackframe_pool/talloc_free pair.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
(cherry picked from commit
acfd4b068a5b99ac1d3fe716afff34cb7d2a0147)
Stefan Metzmacher [Mon, 14 Oct 2013 08:33:57 +0000 (10:33 +0200)]
s3:smb2_server: for performance reasons we use tevent_fd and readv/writev directly
Going via tevent_req_create/talloc_free at multiple layer costs
too much cpu cycles per request.
I tested downloading a 16GB (sparse) file with smbclient -b1 -mNT1,
and -mSMB2_02. Using smb2 max read = 64512, which means smb1 and smb2
will use the same read size.
I build with -O3 -g and compared the results with valgrind --tool=callgrind.
With -mNT1 the server uses about 2.000.000.000 cpu cycles.
This patch reduces the userspace cpu cycles for -mSMB2_02
from about ~ 8.000.000.000 down to ~ 4.000.000.000.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
(cherry picked from commit
4244a2686cddcdc754c284df884ae497afa4053a)
Stefan Metzmacher [Mon, 14 Oct 2013 14:42:55 +0000 (16:42 +0200)]
s3:smb2_server: fix drain_socket error handling
smbd_smb2_request_error_ex() should return NTSTATUS and the caller
will terminate the connection.
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
(cherry picked from commit
9393e28df59954414313bfae70ffb796d3e332fe)
Jeremy Allison [Tue, 3 Dec 2013 18:21:16 +0000 (10:21 -0800)]
smbd: Always use UCF_PREP_CREATEFILE for filename_convert calls to resolve a path for open.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Mon Dec 9 21:02:21 CET 2013 on sn-devel-104
(cherry picked from commit
f98d10af2a05f0261611f4cabdfe274cd9fe91c0)
Jeremy Allison [Tue, 3 Dec 2013 18:19:09 +0000 (10:19 -0800)]
smbd: change flag name from UCF_CREATING_FILE to UCF_PREP_CREATEFILE
In preparation to using it for all open calls.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
(cherry picked from commit
874318a97868e08837a1febb1be8e8a167b5ae0f)
Volker Lendecke [Tue, 3 Dec 2013 12:20:17 +0000 (13:20 +0100)]
smbd: Fix regression for the dropbox case.
We need to allow to save a file to a directory with perm -wx.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10297
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
5b49fe24c906cbae12beff7a1b45de6809258cab)
Christian Ambach [Mon, 18 Nov 2013 19:02:41 +0000 (20:02 +0100)]
lib/util: use proper include for struct stat
use <sys/stat.h> instead of forward declaring it
This fixes the build on AIX
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10276
Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Christian Ambach <ambi@samba.org>
Autobuild-Date(master): Thu Nov 21 22:12:45 CET 2013 on sn-devel-104
(cherry picked from commit
4ea92841b72a7b701a7c0fadf63430a7d0a3fac8)
Karolin Seeger [Mon, 9 Dec 2013 06:10:31 +0000 (07:10 +0100)]
VERSION: Bump version up to 4.1.4.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Karolin Seeger [Mon, 9 Dec 2013 06:10:12 +0000 (07:10 +0100)]
Merge tag 'samba-4.1.3' into v4-1-test
samba: tag release samba-4.1.3
Karolin Seeger [Tue, 3 Dec 2013 11:19:11 +0000 (12:19 +0100)]
VERSION: Disable git snapshots for the 4.1.3 release.
Bug 10185 - CVE-2013-4408: DCERPC frag_len not checked
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10185
Bug 10306 - CVE-2012-6150: Fail authentication if user isn't member of *any*
require_membership_of specified groups
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10306
(BUG: https://bugzilla.samba.org/show_bug.cgi?id=10300)
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Karolin Seeger [Fri, 6 Dec 2013 18:45:57 +0000 (19:45 +0100)]
WHATSNEW: Add release notes for Samba 4.1.3.
Bug 10185 - CVE-2013-4408: DCERPC frag_len not checked
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10185
Bug 10306 - CVE-2012-6150: Fail authentication if user isn't member of *any*
require_membership_of specified groups
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10306
(BUG: https://bugzilla.samba.org/show_bug.cgi?id=10300)
Signed-off-by: Karolin Seeger <kseeger@samba.org>
Noel Power [Wed, 16 Oct 2013 15:30:55 +0000 (16:30 +0100)]
CVE-2012-6150: Fail authentication for single group name which cannot be converted to sid
furthermore if more than one name is supplied and no sid is converted
then also fail.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10300
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10306
Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>
[ddiss@samba.org: fixed incorrect bugzilla tag I added to master commit]
Jeremy Allison [Fri, 8 Nov 2013 06:41:22 +0000 (22:41 -0800)]
CVE-2013-4408:s3:Ensure LookupRids() replies arrays are range checked.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Jeremy Allison <jra@samba.org>
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Jeremy Allison [Fri, 8 Nov 2013 05:40:55 +0000 (21:40 -0800)]
CVE-2013-4408:s3:Ensure LookupNames replies arrays are range checked.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jeremy Allison <jra@samba.org>
Jeremy Allison [Fri, 8 Nov 2013 04:38:01 +0000 (20:38 -0800)]
CVE-2013-4408:s3:Ensure LookupSids replies arrays are range checked.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Signed-off-by: Jeremy Allison <jra@samba.org>
Jeremy Allison [Thu, 17 Oct 2013 21:44:35 +0000 (14:44 -0700)]
CVE-2013-4408:s3:Ensure we always check call_id when validating an RPC reply.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Stefan Metzmacher [Wed, 16 Oct 2013 14:26:58 +0000 (16:26 +0200)]
CVE-2013-4408:s3:ctdb_conn: add some length verification to ctdb_packet_more()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 16 Oct 2013 12:17:49 +0000 (14:17 +0200)]
CVE-2013-4408:libcli/util: add some size verification to tstream_read_pdu_blob_done()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 16 Oct 2013 12:17:49 +0000 (14:17 +0200)]
CVE-2013-4408:s3:util_tsock: add some overflow detection to tstream_read_packet_done()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 16 Oct 2013 12:17:49 +0000 (14:17 +0200)]
CVE-2013-4408:async_sock: add some overflow detection to read_packet_handler()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 24 Sep 2013 03:03:40 +0000 (05:03 +0200)]
CVE-2013-4408:s4:dcerpc_sock: check for invalid frag_len within sock_complete_packet()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 25 Sep 2013 21:25:12 +0000 (23:25 +0200)]
CVE-2013-4408:s4:dcerpc_smb2: check for invalid frag_len in send_read_request_continue()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 25 Sep 2013 21:25:12 +0000 (23:25 +0200)]
CVE-2013-4408:s4:dcerpc_smb: check for invalid frag_len in send_read_request_continue()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 25 Sep 2013 21:25:12 +0000 (23:25 +0200)]
CVE-2013-4408:s4:dcerpc: check for invalid frag_len in ncacn_pull()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 25 Sep 2013 21:25:12 +0000 (23:25 +0200)]
CVE-2013-4408:s3:rpc_client: verify frag_len at least contains the header size
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Wed, 25 Sep 2013 21:25:12 +0000 (23:25 +0200)]
CVE-2013-4408:s3:rpc_client: check for invalid frag_len in dcerpc_pull_ncacn_packet()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 24 Sep 2013 03:03:40 +0000 (05:03 +0200)]
CVE-2013-4408:librpc: check for invalid frag_len within dcerpc_read_ncacn_packet_next_vector()
We should do this explicit instead of relying on
tstream_readv_pdu_ask_for_next_vector() to catch the overflow.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Stefan Metzmacher [Tue, 24 Sep 2013 03:03:40 +0000 (05:03 +0200)]
CVE-2013-4408:librpc: check for invalid frag_len within dcerpc_read_ncacn_packet_done()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10185
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Karolin Seeger [Thu, 21 Nov 2013 10:21:47 +0000 (11:21 +0100)]
VERSION: Bump version number up to 4.1.3...
and re-enable git snapshots.
Signed-off-by: Karolin Seeger <kseeger@samba.org>
(cherry picked from commit
c61910b51c4ee0107b0da0b41f162851e9f5638a)
Volker Lendecke [Thu, 21 Nov 2013 20:05:29 +0000 (21:05 +0100)]
smbd: Fix bug 10284
If we msg_read_send on a nonempty channel, we create one
tevent_immediate. If we directly receive another message and from
within the msg_read_send's tevent_req callback we immediately do
another msg_read_send, we end up with two tevent_immediate events for
msg_channel_trigger with just one incoming message. Test to follow.
This patch simplifies msg_channel.c by removing the explicit immediate
events. Instead, it relies on the implicit immediate event available
via tevent_req_defer_callback. For messages received from tdb with
a msg_read_send req pending, we directly finish that request without
putting the message on the queue.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10284
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit
6b6920b02905661ae661a894e3bd8d2c744d7003)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Thu Nov 28 13:13:48 CET 2013 on sn-devel-104
Andreas Schneider [Fri, 15 Nov 2013 16:02:20 +0000 (17:02 +0100)]
s3-libnet: Use a const char for realm.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Nov 15 23:11:54 CET 2013 on sn-devel-104
(cherry picked from commit
d02d70251f98ea2e7db4aea36f372cb0f65c04c5)
The last 9 patches address bug #10274 - Fix several issues and warnings from
analyzer tools.
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Tue Nov 26 22:33:13 CET 2013 on sn-devel-104
Andreas Schneider [Fri, 15 Nov 2013 16:02:19 +0000 (17:02 +0100)]
s3-vfs: Make glfs_set_preopened() static.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
4deb00a60f484824217a9683ec9cc2838deae8e0)
Andreas Schneider [Fri, 15 Nov 2013 16:02:18 +0000 (17:02 +0100)]
s3-vfs: Remove unused variable in vfs_glusterfs.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
9e7e83e9d07e967ac966b1cc17f21cb75c81a774)
Andreas Schneider [Fri, 15 Nov 2013 16:02:17 +0000 (17:02 +0100)]
examples: Fix scanf format in perf_writer_disk.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
f71b5e44e7a705096e4fdd7aa3d0e22df994e363)
Andreas Schneider [Fri, 15 Nov 2013 16:02:16 +0000 (17:02 +0100)]
s3-libsmb: Fix scanf format in parse_ace().
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
1214e3345c655a4c7dc98c69c4e018e47558f639)
Andreas Schneider [Fri, 15 Nov 2013 16:02:15 +0000 (17:02 +0100)]
s3-utils: Fix scanf format in sharesec.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
278899f5a763af7e7603f05f07048b7d8d4e9972)
Andreas Schneider [Fri, 15 Nov 2013 16:02:14 +0000 (17:02 +0100)]
s3-utils: Fix scanf format in smbacls.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
4c98b9ce8f8de5883796aa38f1193e04a0ee4e58)
Andreas Schneider [Fri, 15 Nov 2013 16:02:13 +0000 (17:02 +0100)]
testsuit: Fix fprintf format.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
69b3a0cb3f2736e98c20dabb43c201af0c004f67)
Andreas Schneider [Fri, 15 Nov 2013 16:02:12 +0000 (17:02 +0100)]
s3-libsmb: Use the right macro to set uint16_t attr.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
f8ab594d0253920cefc441587a55fddb688be550)
David Disseldorp [Fri, 18 Oct 2013 11:09:23 +0000 (13:09 +0200)]
printing: always store sytem job-ID in queue state
Print jobs have multiple identifiers: the regular spoolss jobid, which
is allocated by spoolss on job submission, and the system jobid, which
is assigned by the printing back-end.
Currently these identifiers are incorrectly mixed in print job queue
tracking. Fix this by ensuring that only the system jobid is stored in
the print queue state structure.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10271
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Mon Nov 18 18:03:41 CET 2013 on sn-devel-104
(cherry picked from commit
b7da5a5b00f6c78e41279415e33c091dcc0a773b)
David Disseldorp [Fri, 20 Sep 2013 03:31:37 +0000 (20:31 -0700)]
spoolss: return the spoolss job ID in notifications
Print job notifications currently carry the system print job identifier
from the queue structure. Instead, the spoolss job identifier should be
resolved and returned.
Print clients can use notification job-ids in subsequent spoolss SetJob
requests. Returning an incorrect identifier can result in the failure of
such requests, e.g. spoolss_SetJob(SPOOLSS_JOB_CONTROL_DELETE).
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10271
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Günther Deschner <gd@samba.org>
(cherry picked from commit
24d025f85d6eea272bff5e1040d4fd2ba0e6b8f3)
Andreas Schneider [Mon, 18 Nov 2013 13:58:14 +0000 (14:58 +0100)]
s3-winbind: Pass the group name to fillup_pw_field().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=2191
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Nov 22 02:04:54 CET 2013 on sn-devel-104
(cherry picked from commit
000172a5ab7e4bfac7ef618d0d78ec7fe95d0e2a)
Andreas Schneider [Mon, 18 Nov 2013 13:58:04 +0000 (14:58 +0100)]
s3-lib: Add grpname to talloc_sub_specified().
BUG: https://bugzilla.samba.org/show_bug.cgi?id=2191
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit
6366ebb79bb72d9dcb12f8fe8d6e35611fcff150)
Arvid Requate [Thu, 21 Nov 2013 11:35:20 +0000 (12:35 +0100)]
spoolss: accept XPS_PASS datatype used by Windows 8
The new v4 driver model used in Windows 8 declares print jobs
intended to bypass the XPS processing layer by setting datatype to
"XPS_PASS" instead of "RAW".
BUG: https://bugzilla.samba.org/show_bug.cgi?id=10267
Reviewed-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
b2815b4c8c3e436a79fb7f07be285a417fd6e8cb)
Autobuild-User(v4-1-test): Karolin Seeger <kseeger@samba.org>
Autobuild-Date(v4-1-test): Fri Nov 22 13:44:05 CET 2013 on sn-devel-104
Günther Deschner [Tue, 19 Nov 2013 11:36:53 +0000 (12:36 +0100)]
docs: remove duplicate "used" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 14:40:40 CET 2013 on sn-devel-104
(cherry picked from commit
c0bdd8011cc14a03bbddb7ad894219c649a609d9)
The last 84 patches fx bug #10281 - Fix a lot of documentation issues in the
manpages.
Günther Deschner [Tue, 19 Nov 2013 11:34:54 +0000 (12:34 +0100)]
docs: remove duplicate "line" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
344c59f99996d4e6a23c2cc914377536ea7e9eee)
Günther Deschner [Tue, 19 Nov 2013 11:34:33 +0000 (12:34 +0100)]
docs: remove duplicate "must" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
8d1ff1d73f43d0fd4c2290496389c006afb2de93)
Günther Deschner [Tue, 19 Nov 2013 11:34:05 +0000 (12:34 +0100)]
docs: remove duplicate "on" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
0cf92d476feabb870f67061d38d1027ebc59a852)
Günther Deschner [Tue, 19 Nov 2013 11:33:33 +0000 (12:33 +0100)]
docs: remove duplicate "or" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
59a240513c7d48afb337b102466c539af3f880f3)
Günther Deschner [Tue, 19 Nov 2013 11:20:12 +0000 (12:20 +0100)]
docs: remove duplicate "not" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
ced12107e0af429af088cd63b86c8b8b21e83a1a)
Günther Deschner [Tue, 19 Nov 2013 11:18:57 +0000 (12:18 +0100)]
docs: remove duplicate "to" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
25577278211f82a353477c48ea1381cdd16b3b63)
Günther Deschner [Tue, 19 Nov 2013 11:17:19 +0000 (12:17 +0100)]
docs: remove duplicate "the" from smb.conf manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
b55b56351d71bb4a4517d857959c7c9d9d2b768c)
Günther Deschner [Tue, 19 Nov 2013 11:14:45 +0000 (12:14 +0100)]
docs: remove duplicate "a" from vfs_cacheprime manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
7a587e715ae413ce0f44be4c6f63a9e30fe697e5)
Günther Deschner [Mon, 18 Nov 2013 16:26:28 +0000 (17:26 +0100)]
docs: document remaining undocumented options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue Nov 19 12:05:56 CET 2013 on sn-devel-104
(cherry picked from commit
19d1a7abcf5ceaf2577952b90ca77eb776bc95d2)
Günther Deschner [Mon, 18 Nov 2013 16:15:57 +0000 (17:15 +0100)]
docs: add net registry import specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
49ab592097a235d31355bf4e58d2957ee56c5a3c)
Günther Deschner [Mon, 18 Nov 2013 16:11:31 +0000 (17:11 +0100)]
docs: add net rpc registry check specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
57269672d1b52c5a1318619f5b6ccdfb757c161f)
Günther Deschner [Mon, 18 Nov 2013 15:28:10 +0000 (16:28 +0100)]
docs: add net groupmap set specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
cb90d1eb8f1ea0fd23f7af4aa1a21447d4772a1e)
Günther Deschner [Mon, 18 Nov 2013 15:22:52 +0000 (16:22 +0100)]
docs: add net rpc share migrate specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
e73493c64af9f76fa41b56c154ea973619e97cb0)
Günther Deschner [Mon, 18 Nov 2013 15:17:32 +0000 (16:17 +0100)]
docs: add net idmap specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
f1e03c2bc1bb34d1918b232035c25cc9e0e6811d)
Günther Deschner [Mon, 18 Nov 2013 15:08:19 +0000 (16:08 +0100)]
docs: add net rpc vampire specific options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
7c8dcc5e0f61577becf1954b6abfb72e4689eab2)
Günther Deschner [Mon, 18 Nov 2013 15:00:39 +0000 (16:00 +0100)]
docs: mention more options in net manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
0b24a4236c2b865a0cf318fcabb3ce64b93d9409)
Günther Deschner [Mon, 18 Nov 2013 14:53:49 +0000 (15:53 +0100)]
docs: use popt.autohelp entity in samba.8 manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
0815f114fbe99144061dc1c8c326fb0ee71f4a76)
Günther Deschner [Mon, 18 Nov 2013 14:53:29 +0000 (15:53 +0100)]
docs: use popt.autohelp entity in smbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
b649d631793bdd83ff1f3935a45f1617c1a4c3e8)
Günther Deschner [Mon, 18 Nov 2013 14:53:08 +0000 (15:53 +0100)]
docs: use popt.autohelp entity in winbindd manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
25eace39266edcac85c7d65a68dfbb632453b6f6)
Günther Deschner [Mon, 18 Nov 2013 14:52:35 +0000 (15:52 +0100)]
docs: use popt.autohelp entity in nmbd manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
b04375e725edfd419fa65c96d524b9fb351d5efc)
Günther Deschner [Mon, 18 Nov 2013 13:45:51 +0000 (14:45 +0100)]
docs: fix ntlm_auth manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
177c2c9c0ffe1ee434afc9d22d4bba12ae55d312)
Günther Deschner [Mon, 18 Nov 2013 12:52:59 +0000 (13:52 +0100)]
docs: fix smbcontrol manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
91d25302b92e01fdba3fa4bc22fea9a8381ae19e)
Günther Deschner [Mon, 18 Nov 2013 12:46:06 +0000 (13:46 +0100)]
docs: use &popt.autohelp entity in pdbedit manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
a0d8cb8f536620a6dbf1fab0093c715c9efaba65)
Günther Deschner [Mon, 18 Nov 2013 12:45:38 +0000 (13:45 +0100)]
docs: fix testparm manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
0674ef7c5b3551564894ee7b8810ee3c18857922)
Günther Deschner [Mon, 18 Nov 2013 11:55:02 +0000 (12:55 +0100)]
docs: use popt.autohelp entity in dbwrap-tools manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
f9cdbfb27325d4e84d866fdee2a7bc729c25e24e)
Günther Deschner [Mon, 18 Nov 2013 11:51:42 +0000 (12:51 +0100)]
docs: document all long option names in nmblookup manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
db62a5841a4892dc2d45ff027cac346c0e67c5aa)
Günther Deschner [Mon, 18 Nov 2013 11:39:00 +0000 (12:39 +0100)]
docs: remove unsupported -h option and use popt.autohelp entity in rpcclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
fb051ee29a55c6d72739bc895f05add50f2054d5)
Günther Deschner [Mon, 18 Nov 2013 11:35:16 +0000 (12:35 +0100)]
docs: mention --sddl and --domain-sid in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
94b26e6d7b22396ad220ddd1ed359376fc151458)
Günther Deschner [Mon, 18 Nov 2013 11:25:12 +0000 (12:25 +0100)]
docs: mention --query-security-info|--set-security-info in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
c7a4feaaf1236dce8de546b5019058efba047e31)
Günther Deschner [Mon, 18 Nov 2013 11:21:24 +0000 (12:21 +0100)]
docs: remove duplicate -e option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
019deb1e1acedb6ec522baad85592c17f2f78268)
Günther Deschner [Mon, 18 Nov 2013 11:18:34 +0000 (12:18 +0100)]
docs: use popt.autohelp entity in smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
559073e711cad5f895707385cc355440e21513d5)
Günther Deschner [Mon, 18 Nov 2013 11:17:36 +0000 (12:17 +0100)]
docs: remove unsupported -h option from smbcacls manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
26da51a94ea329aa78e2d69fc8190954e61e0b26)
Günther Deschner [Mon, 18 Nov 2013 11:16:00 +0000 (12:16 +0100)]
docs: use popt.autohelp and remove duplicate -e option from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
a2899b157f6096fd48e0c9a16a8cb7c848736ea4)
Günther Deschner [Mon, 18 Nov 2013 11:12:23 +0000 (12:12 +0100)]
docs: better document -e|--encrypt option globally.
This is taken from smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
5cab201a16663e9d91e4501124d6aeeaaa71e189)
Günther Deschner [Mon, 18 Nov 2013 11:10:29 +0000 (12:10 +0100)]
docs: mention -B|--browse to smbclient manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
0a7eff9cd77516368a1b1b7578bed64c3768b0da)
Günther Deschner [Mon, 18 Nov 2013 10:59:54 +0000 (11:59 +0100)]
docs: mention more long option names in smbcquotas manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
51fa7800d3b9f84b962d396270391a8cfd4d5a84)
Günther Deschner [Mon, 18 Nov 2013 10:51:55 +0000 (11:51 +0100)]
docs: mention --update and --encrypt in smbget manpage.
Guenther
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit
def43ad250168790fe3db868c0f688ff04f0fefa)
git.samba.org / asn / samba-autobuild / .git / log