[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 5118985841a lib/util: Count a trailing line that doesn't end in a
newline
via b3e4e094261 s4 messaging: Add support for smbcontrol sleep
via a70deab0fb3 s3 server: Add support for smbcontrol sleep
via ff9052c923d s3 smbcontrol: Add sleep command
via b578fad88e3 s4 messaging tests: Tests for smbcontrol sleep command
via 8167486b999 s4 messaging: support smbcontrol inject fault command
via 8741af7af68 s4 messaging tests: Add inject fault command
from c817deca0c7 s4: Remove double init of kerberos error table
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 5118985841aa0363147d552f243ab5a7d90dbdaf
Author: Martin Schwenke
Date: Fri Dec 14 14:43:57 2018 +1100
lib/util: Count a trailing line that doesn't end in a newline
If the final line of a file does not contain a newline then it isn't
included in the line count.
Change i to point to the next slot in the array instead of the current
one. This means that that the current line won't be thrown away if no
newline is seen.
Without changing i to unsigned int, the -O3 --picky -developer build
fails with:
[ 745/4136] Compiling lib/util/util_file.c
==> /builds/samba-team/devel/samba/samba-o3.stderr <==
../../lib/util/util_file.c: In function ‘file_lines_parse’:
../../lib/util/util_file.c:251:8: error: assuming signed overflow does not
occur when simplifying conditional to constant [-Werror=strict-overflow]
while (i > 0 && ret[i-1][0] == 0) {
^
cc1: all warnings being treated as errors
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13717
Signed-off-by: Martin Schwenke
Reviewed-by: Andrew Bartlett
Autobuild-User(master): Andrew Bartlett
Autobuild-Date(master): Wed Dec 19 08:08:28 CET 2018 on sn-devel-144
commit b3e4e094261c039320f6ad999043f78695e56021
Author: Gary Lockyer
Date: Tue Dec 11 11:43:52 2018 +1300
s4 messaging: Add support for smbcontrol sleep
Add a sleep command that pauses the target process for the specified
number of seconds
This command is only enabled on developer and self test builds.
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
commit a70deab0fb3726611a041c83d616cda2594264c7
Author: Gary Lockyer
Date: Tue Dec 11 11:39:23 2018 +1300
s3 server: Add support for smbcontrol sleep
Add a sleep command that pauses the target process for the specified number
of seconds
This command is only enabled on self test and developer builds.
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
commit ff9052c923d1f474696022527663b64f60195a05
Author: Gary Lockyer
Date: Tue Dec 4 09:31:22 2018 +1300
s3 smbcontrol: Add sleep command
Add a sleep command that pauses the target process for the specified
number of seconds
This command is only enabled on developer and self test builds.
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
commit b578fad88e3b5a62fa060474b52dbc7e59fd6a24
Author: Gary Lockyer
Date: Wed Dec 5 14:50:22 2018 +1300
s4 messaging tests: Tests for smbcontrol sleep command
Add a sleep command that pauses the target process for the specified
number seconds
This command is only enabled on developer and self test builds.
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
commit 8167486b99920f48db48ebc1574b5c8032647555
Author: Gary Lockyer
Date: Tue Dec 11 11:04:25 2018 +1300
s4 messaging: support smbcontrol inject fault command
Add support of the smbcontrol inject fault command to the samba daemon.
This is useful for manual testing of process restart etc.
command is only enabled for developer and self test builds
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
commit 8741af7af68b2d74123dc3f82dad3ca746f4caf5
Author: Gary Lockyer
Date: Tue Dec 11 11:01:09 2018 +1300
s4 messaging tests: Add inject fault command
Test for processing of the smbcontrol inject fault message in the samba
daemon.
Signed-off-by: Gary Lockyer
Reviewed-by: Andrew Bartlett
---
Summary of changes:
lib/util/tests/file.c | 152 ++
lib/util/util_file.c | 6 +-
librpc/idl/messaging.idl | 1 +
python/samba/tests/blackbox/smbcontrol_process.py | 124 ++
source3/smbd/server.c | 34 +
source3/utils/smbcontrol.c| 46 ++-
source4/lib/messaging/messaging.c | 10 ++
source4/lib/messaging/messaging_handlers.c
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via c817deca0c7 s4: Remove double init of kerberos error table from 90fab07f071 s3-smbd: avoid assuming fsp is always intact after close_file call. https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit c817deca0c7afc51a42b97c19ba31e495944a120 Author: Swen Schillig Date: Tue Dec 18 08:30:24 2018 +0100 s4: Remove double init of kerberos error table The initialization of the kerberos error table is already performed in smb_krb5_init_context_basic(), therefore, it can be removed from of its callees. Signed-off-by: Swen Schillig Reviewed-by: Andrew Bartlett Reviewed-by: Jeremy Allison Autobuild-User(master): Jeremy Allison Autobuild-Date(master): Wed Dec 19 04:51:27 CET 2018 on sn-devel-144 --- Summary of changes: source4/auth/kerberos/krb5_init_context.c | 2 -- 1 file changed, 2 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c index 5e771a87cc5..7e75d436922 100644 --- a/source4/auth/kerberos/krb5_init_context.c +++ b/source4/auth/kerberos/krb5_init_context.c @@ -541,8 +541,6 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx, krb5_log_facility *logf; #endif - initialize_krb5_error_table(); - tmp_ctx = talloc_new(parent_ctx); *smb_krb5_context = talloc_zero(tmp_ctx, struct smb_krb5_context); -- 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: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-19-0159/flakey.log The failure seems to be in the "samba-nt4" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-19-0159/samba-nt4.stderr https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-19-0159/samba-nt4.stdout The top commit at the time of the failure was: commit 90fab07f0710bb2061d3f14326c874dd049823fc Author: Günther Deschner Date: Tue Dec 18 11:10:04 2018 +0100 s3-smbd: avoid assuming fsp is always intact after close_file call. Instead use the already copied smb_fname directly. https://bugzilla.samba.org/show_bug.cgi?id=13720 Guenther Signed-off-by: Guenther Deschner Autobuild-User(master): Günther Deschner Autobuild-Date(master): Tue Dec 18 20:11:07 CET 2018 on sn-devel-144 and the last 50 lines of the stdout log were: [533(2464)/579 at 33m12s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local) [534(2465)/579 at 33m12s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local) [535(2466)/579 at 33m12s] samba.wbinfo_simple.change-secret.domain=$DOMAIN(nt4_dc:local) [536(2467)/579 at 33m12s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_dc:local) [537(2468)/579 at 33m12s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_dc:local) [538(2469)/579 at 33m13s] samba.wbinfo_simple.domain-users(nt4_dc:local) [539(2470)/579 at 33m13s] samba.wbinfo_simple.domain-groups(nt4_dc:local) [540(2471)/579 at 33m13s] samba.wbinfo_simple.name-to-sid=$DC_USERNAME(nt4_dc:local) [541(2472)/579 at 33m13s] samba.wbinfo_simple.name-to-sid=$DOMAIN/$DC_USERNAME(nt4_dc:local) [542(2473)/579 at 33m13s] samba.wbinfo_simple.user-info=$DOMAIN/$DC_USERNAME(nt4_dc:local) [543(2474)/579 at 33m13s] samba.wbinfo_simple.user-groups=$DOMAIN/$DC_USERNAME(nt4_dc:local) [544(2475)/579 at 33m13s] samba.wbinfo_simple.authenticate=$DOMAIN/$DC_USERNAME%$DC_PASSWORD(nt4_dc:local) [545(2476)/579 at 33m14s] samba.wbinfo_simple.allocate-uid(nt4_dc:local) [546(2477)/579 at 33m14s] samba.wbinfo_simple.allocate-gid(nt4_dc:local) [547(2478)/579 at 33m14s] samba.wbinfo_sids2xids.(nt4_dc:local)(nt4_dc:local) [548(2479)/579 at 33m22s] samba.ntlm_auth.diagnostics(nt4_dc:local)(nt4_dc:local) [549(2480)/579 at 33m22s] samba.ntlm_auth.(nt4_dc:local)(nt4_dc:local) [550(2499)/579 at 33m24s] samba.wbinfo_simple.ping(nt4_member:local) [551(2500)/579 at 33m25s] samba.wbinfo_simple.separator(nt4_member:local) [552(2501)/579 at 33m25s] samba.wbinfo_simple.own-domain(nt4_member:local) [553(2502)/579 at 33m25s] samba.wbinfo_simple.all-domains(nt4_member:local) [554(2503)/579 at 33m25s] samba.wbinfo_simple.trusted-domains(nt4_member:local) [555(2504)/579 at 33m25s] samba.wbinfo_simple.domain-info=BUILTIN(nt4_member:local) [556(2505)/579 at 33m25s] samba.wbinfo_simple.domain-info=$DOMAIN(nt4_member:local) [557(2506)/579 at 33m25s] samba.wbinfo_simple.online-status(nt4_member:local) [558(2507)/579 at 33m26s] samba.wbinfo_simple.online-status.domain=BUILTIN(nt4_member:local) [559(2508)/579 at 33m26s] samba.wbinfo_simple.online-status.domain=$DOMAIN(nt4_member:local) [560(2509)/579 at 33m26s] samba.wbinfo_simple.check-secret.domain=$DOMAIN(nt4_member:local) UNEXPECTED(failure): samba.wbinfo_simple.check-secret.domain=SAMBA-TEST.wbinfo(nt4_member:local) REASON: Exception: Exception: wbcCheckTrustCredentials(SAMBA-TEST): error code was NT_STATUS_DOMAIN_CONTROLLER_NOT_FOUND (0xc233) failed to call wbcCheckTrustCredentials: WBC_ERR_AUTH_ERROR Could not check secret checking the trust secret for domain SAMBA-TEST via RPC calls failed FAILED (1 failures, 0 errors and 0 unexpected successes in 0 testsuites) A summary with detailed information can be found in: ./bin/ab/summary TOP 10 slowest tests samba3.raw.notify(nt4_dc) -> 105 samba3.blackbox.net.rpc.conf(nt4_dc) -> 104 samba3.smb2.notify(nt4_dc) -> 82 samba3.blackbox.net.local.conf(nt4_dc:local) -> 79 samba3.smb2.compound_find(nt4_dc) -> 63 samba3.smb2.compound_find(nt4_dc) -> 62 samba3.rpc.samr.passwords.lockout(nt4_dc) -> 62 samba4.rpc.echo on ncacn_np with object(nt4_dc) -> 60 samba3.raw.search(nt4_dc) -> 56 samba3.base.dir2(nt4_dc) -> 53 ERROR: test failed with exit code 1
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 90fab07f071 s3-smbd: avoid assuming fsp is always intact after
close_file call.
from 944c92a15db ctdb-daemon: Modernise debug during record deletion for
vacuuming
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 90fab07f0710bb2061d3f14326c874dd049823fc
Author: Günther Deschner
Date: Tue Dec 18 11:10:04 2018 +0100
s3-smbd: avoid assuming fsp is always intact after close_file call.
Instead use the already copied smb_fname directly.
https://bugzilla.samba.org/show_bug.cgi?id=13720
Guenther
Signed-off-by: Guenther Deschner
Autobuild-User(master): Günther Deschner
Autobuild-Date(master): Tue Dec 18 20:11:07 CET 2018 on sn-devel-144
---
Summary of changes:
source3/smbd/smb2_close.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/smbd/smb2_close.c b/source3/smbd/smb2_close.c
index 33863d32f5f..1888736e4ae 100644
--- a/source3/smbd/smb2_close.c
+++ b/source3/smbd/smb2_close.c
@@ -263,7 +263,7 @@ static NTSTATUS smbd_smb2_close(struct smbd_smb2_request
*req,
status = close_file(smbreq, fsp, NORMAL_CLOSE);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(5,("smbd_smb2_close: close_file[%s]: %s\n",
-fsp_str_dbg(fsp), nt_errstr(status)));
+smb_fname_str_dbg(smb_fname), nt_errstr(status)));
return status;
}
--
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: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-18-1251/flakey.log The failure seems to be in the "samba-nt4" suite, whose build logs are available here: https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-18-1251/samba-nt4.stderr https://git.samba.org/autobuild.flakey.sn-devel-144/2018-12-18-1251/samba-nt4.stdout The top commit at the time of the failure was: commit 944c92a15dbbcaaea1cd4e63bf2a109a33126437 Author: Martin Schwenke Date: Wed Oct 24 12:29:54 2018 +1100 ctdb-daemon: Modernise debug during record deletion for vacuuming Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Tue Dec 18 10:13:50 CET 2018 on sn-devel-144 and the last 50 lines of the stdout log were: (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:12 2019 CET(13192199472000) => Mon Mar 18 12:51:12 2019 CET(13197383472000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:14 2019 CET(13192199474000) => Mon Mar 18 12:51:14 2019 CET(13197383474000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:16 2019 CET(13192199476000) => Mon Mar 18 12:51:16 2019 CET(13197383476000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:16 2019 CET(13192199476000) => Mon Mar 18 12:51:16 2019 CET(13197383476000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:16 2019 CET(13192199476000) => Mon Mar 18 12:51:16 2019 CET(13197383476000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:16 2019 CET(13192199476000) => Mon Mar 18 12:51:16 2019 CET(13197383476000) (../../source4/torture/smb2/util.c:158) change_time not setup correctly: Thu Jan 17 12:51:16 2019 CET(13192199476000) => Mon
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 944c92a15db ctdb-daemon: Modernise debug during record deletion for vacuuming via cdca0d7e78a ctdb-daemon Add extra debug during record deletion for vacuuming via 2e3ad8c20d2 ctdb-tests: Minimise chances of test interfering with itself via f1b594dce1c ctdb-daemon: Do not force full vacuum on first vacuuming run via 9bdd6814e4c ctdb-packaging: Update library versions to upstream versions via 59e244c9d04 ctdb-packaging: Match configure command as per spec file via 4443124fe8d ctdb-packaging: Call waf with python wrapper via 9912709eca2 ctdb-build: Use open() instead of file() for python3 via 1e061ff1e3f ctdb-tool: Avoid data uninitialized warnings from 1ed91f0e102 ctdb-tests: Do not force TEST_VAR_DIR to be absolute https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 944c92a15dbbcaaea1cd4e63bf2a109a33126437 Author: Martin Schwenke Date: Wed Oct 24 12:29:54 2018 +1100 ctdb-daemon: Modernise debug during record deletion for vacuuming Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs Autobuild-User(master): Amitay Isaacs Autobuild-Date(master): Tue Dec 18 10:13:50 CET 2018 on sn-devel-144 commit cdca0d7e78a4cad797ff457f860a37de78bcdb44 Author: Martin Schwenke Date: Mon Oct 15 21:21:25 2018 +1100 ctdb-daemon Add extra debug during record deletion for vacuuming It isn't currently possible to distinguish these 2 cases. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit 2e3ad8c20d2964fba14d0d5b0b36c334ac22caa5 Author: Martin Schwenke Date: Tue Dec 18 14:31:24 2018 +1100 ctdb-tests: Minimise chances of test interfering with itself Checking that the database contains 0 records cause a traverse. This may take a lock and cause vacuuming to fail (or be deferred for a particular record/chain). Minimise the chance of this happening by only checking for 0 records every 10 seconds. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit f1b594dce1c081924b16c52c8c50c984a16df098 Author: Martin Schwenke Date: Mon Oct 22 21:40:22 2018 +1100 ctdb-daemon: Do not force full vacuum on first vacuuming run When the number of fast path vacuuming runs is 0 then a full vacuuming run is done. This means the first one is a full run, which is almost certainly not what is intended. Combine the 2 conditionals to only flag a full vacuuming run when the count exceeds the configured limit. This means that the full_vacuum_run flag is set in both parent and child, but this is harmless... and is better than getting it wrong. Also tweak the comparison to be less-than-or-equal, since the zeroth run needs to be counted. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs commit 9bdd6814e4c64f3be04daa7e8739e141d2d664b7 Author: Amitay Isaacs Date: Tue Dec 18 13:37:40 2018 +1100 ctdb-packaging: Update library versions to upstream versions Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 59e244c9d0402062ae77c882e2af28d00da9 Author: Amitay Isaacs Date: Tue Dec 18 11:01:35 2018 +1100 ctdb-packaging: Match configure command as per spec file Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 4443124fe8d7c12dfab62f9962939d14cbed1291 Author: Amitay Isaacs Date: Tue Dec 18 11:03:51 2018 +1100 ctdb-packaging: Call waf with python wrapper This allows to build packages even when python3 is not available by setting PYTHON variable. Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 9912709eca29d21cf56f342079db6b5cc02bbea2 Author: Amitay Isaacs Date: Tue Dec 18 10:54:50 2018 +1100 ctdb-build: Use open() instead of file() for python3 Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke commit 1e061ff1e3fcfcd020df1a35c1c0697c114cb209 Author: Amitay Isaacs Date: Tue Dec 18 11:33:30 2018 +1100 ctdb-tool: Avoid data uninitialized warnings ../../tools/ctdb.c: In function 'str_to_data': ../../tools/ctdb.c:624: warning: 'data.dsize' may be used uninitialized in this function ../../tools/ctdb.c:624: warning: 'data.dptr' may be used uninitialized in this function Signed-off-by: Amitay Isaacs Reviewed-by: Martin Schwenke --- Summary of changes: ctdb/configure.rpm | 4 +++- ctdb/packaging/RPM/ctdb.spec.in| 7 --- ctdb/server/ctdb_recover.c | 23 -- ctdb/server/ctdb_vacuum.c | 13 ++-- ctdb/tests/simple/69_recovery_resurrect_deleted.sh | 5
