[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 2bea45e ctdb-common: ioctl(.. FIONREAD ..) returns an int value
from 7fd3eb6 util:charset: Return EILSEQ in smb_iconv() if newer libc is
detected
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 2bea45e450e5ebd6544c2a8be4493242158b712e
Author: Amitay Isaacs
Date: Wed Feb 1 15:52:48 2017 +1100
ctdb-common: ioctl(.. FIONREAD ..) returns an int value
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12549
Signed-off-by: Amitay Isaacs
Reviewed-by: Volker Lendecke
Autobuild-User(master): Volker Lendecke
Autobuild-Date(master): Wed Feb 1 14:29:14 CET 2017 on sn-devel-144
---
Summary of changes:
ctdb/common/run_proc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/common/run_proc.c b/ctdb/common/run_proc.c
index 96e422c..f9fee80 100644
--- a/ctdb/common/run_proc.c
+++ b/ctdb/common/run_proc.c
@@ -132,8 +132,9 @@ static void proc_read_handler(struct tevent_context *ev,
{
struct proc_context *proc = talloc_get_type_abort(
private_data, struct proc_context);
- size_t offset, len = 0;
+ size_t offset;
ssize_t nread;
+ int len = 0;
int ret;
ret = ioctl(proc->fd, FIONREAD, &len);
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v4-4-test updated
The branch, v4-4-test has been updated
via 946a4de vfs_fruit: checks wrong AAPL config state and so always
uses readdirattr
via 0c0b893 selftest/Samba3: use "server min protocol = SMB3_00" for
"ktest"
via 36e2d39 s3:smbd: allow "server min protocol = SMB3_00" to go via
"SMB 2.???" negprot
via 6bf5ed9 selftest: add test for global "smb encrypt=off"
via caab54e selftest: disable SMB encryption in simpleserver environment
via 22d5d32 docs: impact of a global "smb encrypt=off" on a share with
"smb encrypt=required"
via ce51a27 s3/smbd: ensure global "smb encrypt = off" is effective for
share with "smb encrypt = desired"
via 3805e2f s3/smbd: ensure global "smb encrypt = off" is effective for
SMB 3.1.1 clients
via 080ce6e s3/smbd: ensure global "smb encrypt = off" is effective for
SMB 1 clients
from efd9c8a Merge tag 'samba-4.4.9' into v4-4-test
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-4-test
- Log -
commit 946a4dec22c41ded23d80bb541fd88e1a7a94984
Author: Ralph Boehme
Date: Thu Jan 26 11:49:55 2017 +0100
vfs_fruit: checks wrong AAPL config state and so always uses readdirattr
readdirattr should only be enabled if the client enables it via AAPL
negotitiation, not for all clients when vfs_fruit is loaded.
Unfortunately the check in fruit_readdir_attr() is
if (!config->use_aapl) {
return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data);
}
This uses the wrong config state "use_aapl" which is always true by
default (config option "fruit:aapl").
We must use "nego_aapl" instead which is only true if the client
really negotiated this feature.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12541
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Jan 28 01:49:11 CET 2017 on sn-devel-144
(cherry picked from commit 9a3b64a24cc21124485b423c9b70b67ff5a96f10)
Autobuild-User(v4-4-test): Karolin Seeger
Autobuild-Date(v4-4-test): Wed Feb 1 16:27:14 CET 2017 on sn-devel-144
commit 0c0b8937b2b304731e9ac71f7ccf017bec85a590
Author: Stefan Metzmacher
Date: Wed Jan 25 21:15:44 2017 +0100
selftest/Samba3: use "server min protocol = SMB3_00" for "ktest"
This verifies that clients can still connect with that setting.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12540
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Reviewed-by: Ralph Boehme
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Fri Jan 27 12:03:39 CET 2017 on sn-devel-144
(cherry picked from commit 348bcca76855798d60c04ddb30f1e13b2ac2d7cd)
commit 36e2d3905d895abb75a46836f58f23fffb9aac50
Author: Stefan Metzmacher
Date: Wed Jan 18 08:37:30 2017 +0100
s3:smbd: allow "server min protocol = SMB3_00" to go via "SMB 2.???" negprot
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12540
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Reviewed-by: Ralph Boehme
(cherry picked from commit c207f2a989fc791b5f9bf9043d3c6ac31db5cdfd)
commit 6bf5ed9e39981d26ef22ecdb63ca9289f990903a
Author: Ralph Boehme
Date: Wed Jan 18 16:23:40 2017 +0100
selftest: add test for global "smb encrypt=off"
Test various combinations of having encryption globally turned off and
enabled (desired/required) on a share, with SMB1 UNIX Extensions and SMB3.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12520
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
(cherry picked from commit 21d030e5bdf7dc6ef8d5f4e70bed7e70b731cd15)
commit caab54e5c42a60a9ef395c0721271e706e7864b6
Author: Ralph Boehme
Date: Tue Jan 17 17:23:51 2017 +0100
selftest: disable SMB encryption in simpleserver environment
Encryption is currently not tested in this env so we can safely turn it
off. The next commit will add a blackbox tests that test combinations of
having encryption globally turned off and enabled (desired/required) on
a share.
This also adds a new share "enc_desired" with "smb encrypt = desired"
which will be used by the test in the next commit.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12520
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
(cherry picked from commit 573e8e15b3ed27d6b593e635e9c24eea3fdf4fb9)
commit 22d5d3241de4559c4101381f9f1345612aab25d8
Author: Ralph Boehme
Date: Mon Jan 16 15:45:32 2017 +0100
docs: impact of a global "smb encrypt=off" on a share with "smb
encrypt=required"
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12520
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
(cherry picked from
[SCM] Samba Shared Repository - branch v4-6-test updated
The branch, v4-6-test has been updated
via de82686 docs: Improve description of "unix_primary_group" parameter
in idmap_ad manpage
via 5be0e74 vfs_fruit: checks wrong AAPL config state and so always
uses readdirattr
via 2f981c3 selftest/Samba3: use "server min protocol = SMB3_00" for
"ktest"
via 9dd155e s3:smbd: allow "server min protocol = SMB3_00" to go via
"SMB 2.???" negprot
via 25ff2b7 s3/rpc_server: move rpc_modules.c to its own subsystem
via edbffe9 selftest: add test for global "smb encrypt=off"
via 227d16c selftest: disable SMB encryption in simpleserver environment
via d2cf308 docs: impact of a global "smb encrypt=off" on a share with
"smb encrypt=required"
via 1231b71 s3/smbd: ensure global "smb encrypt = off" is effective for
share with "smb encrypt = desired"
via e138848 s3/smbd: ensure global "smb encrypt = off" is effective for
SMB 3.1.1 clients
via 4f1ac97 s3/smbd: ensure global "smb encrypt = off" is effective for
SMB 1 clients
via a6fd161 s3/rpc_server: shared rpc modules loading
from 1f2ebda VERSION: Bump version up to 4.6.0rc3...
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test
- Log -
commit de8268609960ef3e6191a912ba73fe5aa4d256cf
Author: John Mulligan
Date: Fri Jan 13 07:33:01 2017 +0100
docs: Improve description of "unix_primary_group" parameter in idmap_ad
manpage
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12542
Signed-off-by: John Mulligan
Reviewed-by: Volker Lendecke
Reviewed-by: Ralph Boehme
Autobuild-User(master): Ralph Böhme
Autobuild-Date(master): Fri Jan 27 20:58:18 CET 2017 on sn-devel-144
(cherry picked from commit f605332e1b87d87e0c454bcae2a374013d3ebf82)
Autobuild-User(v4-6-test): Karolin Seeger
Autobuild-Date(v4-6-test): Wed Feb 1 16:49:18 CET 2017 on sn-devel-144
commit 5be0e742a9216e6e45ea8aa60315c09b5a0d497a
Author: Ralph Boehme
Date: Thu Jan 26 11:49:55 2017 +0100
vfs_fruit: checks wrong AAPL config state and so always uses readdirattr
readdirattr should only be enabled if the client enables it via AAPL
negotitiation, not for all clients when vfs_fruit is loaded.
Unfortunately the check in fruit_readdir_attr() is
if (!config->use_aapl) {
return SMB_VFS_NEXT_READDIR_ATTR(handle, fname, mem_ctx, pattr_data);
}
This uses the wrong config state "use_aapl" which is always true by
default (config option "fruit:aapl").
We must use "nego_aapl" instead which is only true if the client
really negotiated this feature.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12541
Signed-off-by: Ralph Boehme
Reviewed-by: Jeremy Allison
Autobuild-User(master): Jeremy Allison
Autobuild-Date(master): Sat Jan 28 01:49:11 CET 2017 on sn-devel-144
(cherry picked from commit 9a3b64a24cc21124485b423c9b70b67ff5a96f10)
commit 2f981c3d1b96a22136370edb4d1d6dfe747ebd3a
Author: Stefan Metzmacher
Date: Wed Jan 25 21:15:44 2017 +0100
selftest/Samba3: use "server min protocol = SMB3_00" for "ktest"
This verifies that clients can still connect with that setting.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12540
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Reviewed-by: Ralph Boehme
Autobuild-User(master): Stefan Metzmacher
Autobuild-Date(master): Fri Jan 27 12:03:39 CET 2017 on sn-devel-144
(cherry picked from commit 348bcca76855798d60c04ddb30f1e13b2ac2d7cd)
commit 9dd155eb5752f4cd573620b787bf7a97cd10f774
Author: Stefan Metzmacher
Date: Wed Jan 18 08:37:30 2017 +0100
s3:smbd: allow "server min protocol = SMB3_00" to go via "SMB 2.???" negprot
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12540
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Reviewed-by: Ralph Boehme
(cherry picked from commit c207f2a989fc791b5f9bf9043d3c6ac31db5cdfd)
commit 25ff2b7c2e74cf8cfc7b9f25375ef73cc742b9cf
Author: Ralph Boehme
Date: Mon Jan 16 12:24:54 2017 +0100
s3/rpc_server: move rpc_modules.c to its own subsystem
The source file rpc_modules.c was used in two places which lead to the
following build error when configuring with '--nonshared-binary=smbd/smbd':
ERROR: source source3/rpc_server/rpc_modules.c is in more than one
subsystem of target 'smbd/smbd': ['RPC_SERVICE', 'MDSSD']
Bug: https://bugzilla.samba.org/show_bug.cgi?id=12524
Signed-off-by: Ralph Boehme
Reviewed-by: Noel Power
Reviewed-by: Andreas Schneider
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Fri Jan 20 15:00:45 CET 2017 on sn-devel-144
(cherry picked from commit be8e90f27a70f3ba8d708e984cf7b2a34e8c2628)
commit
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 3fe1f06 talloc/wscript: avoid passing pointless enabled=True to
SAMBA_PYTHON()
from 2bea45e ctdb-common: ioctl(.. FIONREAD ..) returns an int value
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 3fe1f06278ce90d8c6a882c6703f583923615117
Author: Stefan Metzmacher
Date: Sun Jan 29 15:52:30 2017 +0100
talloc/wscript: avoid passing pointless enabled=True to SAMBA_PYTHON()
This is the default and should not be passed explicitly.
Signed-off-by: Stefan Metzmacher
Reviewed-by: Andreas Schneider
Autobuild-User(master): Andreas Schneider
Autobuild-Date(master): Wed Feb 1 18:16:58 CET 2017 on sn-devel-144
---
Summary of changes:
lib/talloc/wscript | 2 --
1 file changed, 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/talloc/wscript b/lib/talloc/wscript
index 41f3be7..8ce4f59 100644
--- a/lib/talloc/wscript
+++ b/lib/talloc/wscript
@@ -141,13 +141,11 @@ def build(bld):
bld.SAMBA_PYTHON('pytalloc',
'pytalloc.c',
deps='talloc ' + name,
-enabled=True,
realname='talloc.so')
bld.SAMBA_PYTHON('test_pytalloc',
'test_pytalloc.c',
deps='pytalloc',
-enabled=True,
realname='_test_pytalloc.so',
install=False)
--
Samba Shared Repository
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-1922/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-1922/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-1922/samba.stdout The top commit at the time of the failure was: commit 2bea45e450e5ebd6544c2a8be4493242158b712e Author: Amitay Isaacs Date: Wed Feb 1 15:52:48 2017 +1100 ctdb-common: ioctl(.. FIONREAD ..) returns an int value BUG: https://bugzilla.samba.org/show_bug.cgi?id=12549 Signed-off-by: Amitay Isaacs Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Feb 1 14:29:14 CET 2017 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 129bc58 smbd: Fix "map acl inherit" = yes from 3fe1f06 talloc/wscript: avoid passing pointless enabled=True to SAMBA_PYTHON() https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 129bc58eee4b1868b1aaec6194808752520517b4 Author: Volker Lendecke Date: Wed Feb 1 14:41:43 2017 + smbd: Fix "map acl inherit" = yes Brown-Paper-Bag bug in f85c2a6852a. The assignment contains a self-reference in get_pai_flags which I missed. Fix an uninitialized read. Bug: https://bugzilla.samba.org/show_bug.cgi?id=12551 Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Wed Feb 1 22:06:50 CET 2017 on sn-devel-144 --- Summary of changes: source3/smbd/posix_acls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 9d02e8a..c8d2bb3 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -2699,9 +2699,9 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn, .attr = ALLOW_ACE, .trustee = sid, .unix_ug = unix_ug, - .owner_type = owner_type, - .ace_flags = get_pai_flags(pal, ace, is_default_acl) + .owner_type = owner_type }; + ace->ace_flags = get_pai_flags(pal, ace, is_default_acl); DLIST_ADD(l_head, ace); } -- Samba Shared Repository
autobuild[sn-devel-144]: intermittent test failure detected
The autobuild test system (on sn-devel-144) has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-2215/flakey.log The samba build logs are available here: http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-2215/samba.stderr http://git.samba.org/autobuild.flakey.sn-devel-144/2017-02-01-2215/samba.stdout The top commit at the time of the failure was: commit 3fe1f06278ce90d8c6a882c6703f583923615117 Author: Stefan Metzmacher Date: Sun Jan 29 15:52:30 2017 +0100 talloc/wscript: avoid passing pointless enabled=True to SAMBA_PYTHON() This is the default and should not be passed explicitly. Signed-off-by: Stefan Metzmacher Reviewed-by: Andreas Schneider Autobuild-User(master): Andreas Schneider Autobuild-Date(master): Wed Feb 1 18:16:58 CET 2017 on sn-devel-144
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via a24ba3e s3: VFS: vfs_streams_xattr.c: Make streams_xattr_open() store the same path as streams_xattr_recheck(). from 129bc58 smbd: Fix "map acl inherit" = yes https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit a24ba3e4083200ec9885363efc5769f43183fb6b Author: Jeremy Allison Date: Wed Feb 1 11:36:25 2017 -0800 s3: VFS: vfs_streams_xattr.c: Make streams_xattr_open() store the same path as streams_xattr_recheck(). If the open is changing directories, fsp->fsp_name->base_name will be the full path from the share root, whilst smb_fname will be relative to the $cwd. BUG: https://bugzilla.samba.org/show_bug.cgi?id=12546 Signed-off-by: Jeremy Allison Reviewed-by: Ralph Böhme Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Thu Feb 2 01:55:42 CET 2017 on sn-devel-144 --- Summary of changes: source3/modules/vfs_streams_xattr.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) Changeset truncated at 500 lines: diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c index d9eb2e1..d3c988c 100644 --- a/source3/modules/vfs_streams_xattr.c +++ b/source3/modules/vfs_streams_xattr.c @@ -527,8 +527,15 @@ static int streams_xattr_open(vfs_handle_struct *handle, sio->xattr_name = talloc_strdup(VFS_MEMCTX_FSP_EXTENSION(handle, fsp), xattr_name); + /* +* so->base needs to be a copy of fsp->fsp_name->base_name, +* making it identical to streams_xattr_recheck(). If the +* open is changing directories, fsp->fsp_name->base_name +* will be the full path from the share root, whilst +* smb_fname will be relative to the $cwd. +*/ sio->base = talloc_strdup(VFS_MEMCTX_FSP_EXTENSION(handle, fsp), - smb_fname->base_name); + fsp->fsp_name->base_name); sio->fsp_name_ptr = fsp->fsp_name; sio->handle = handle; sio->fsp = fsp; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via ce9b72c ctdb-build: Install CTDB tests correctly from toplevel
from a24ba3e s3: VFS: vfs_streams_xattr.c: Make streams_xattr_open()
store the same path as streams_xattr_recheck().
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit ce9b72c17abb156de8185b100f27d1ddd3c89b15
Author: Amitay Isaacs
Date: Wed Feb 1 15:53:47 2017 +1100
ctdb-build: Install CTDB tests correctly from toplevel
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12547
Signed-off-by: Amitay Isaacs
Reviewed-by: Martin Schwenke
Autobuild-User(master): Martin Schwenke
Autobuild-Date(master): Thu Feb 2 08:25:57 CET 2017 on sn-devel-144
---
Summary of changes:
ctdb/wscript | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/wscript b/ctdb/wscript
index 446bd8d..13384c8 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -850,8 +850,13 @@ def build(bld):
'tool'
]
+if bld.env.standalone_ctdb:
+testdir = 'tests'
+else:
+testdir = 'ctdb/tests'
+
for t in test_subdirs:
-files = SUBDIR_MODE('tests/%s' % t, trim_path='tests')
+files = SUBDIR_MODE('%s/%s' % (testdir, t), trim_path=testdir)
for fmode in files:
bld.INSTALL_FILES(bld.env.CTDB_TEST_DATADIR, 'tests/%s' % fmode[0],
destname=fmode[0], chmod=fmode[1])
--
Samba Shared Repository
