The branch, v4-10-test has been updated via 1b4ccd961f1 ctdb-tools: Stop deleted nodes from influencing ctdb nodestatus exit code via 1d749a02fc9 s3:client:Use DEVICE_URI, instead of argv[0],for Device URI from 075b3fd1143 s3/4: libsmbclient test. Test using smbc_telldir/smbc_lseekdir with smbc_readdir/smbc_readdirplus/smbc_getdents.
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-10-test - Log ----------------------------------------------------------------- commit 1b4ccd961f1e07fd2e7a6697f2fae8d99cb8b78f Author: Martin Schwenke <mar...@meltin.net> Date: Tue Aug 13 21:42:15 2019 +1000 ctdb-tools: Stop deleted nodes from influencing ctdb nodestatus exit code Deleted nodes should simply be ignored. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14129 RN: Stop deleted nodes from influencing ctdb nodestatus exit code Signed-off-by: Martin Schwenke <mar...@meltin.net> Reviewed-by: Amitay Isaacs <ami...@gmail.com> (cherry picked from commit 32b5ceb31936ec5447362236c1809db003561d29) Autobuild-User(v4-10-test): Karolin Seeger <ksee...@samba.org> Autobuild-Date(v4-10-test): Fri Sep 20 23:03:22 UTC 2019 on sn-devel-144 commit 1d749a02fc97c93fbb670f0d0734af45d2bb1d22 Author: Bryan Mason <bma...@redhat.com> Date: Mon Sep 16 12:35:06 2019 -0700 s3:client:Use DEVICE_URI, instead of argv[0],for Device URI CUPS sanitizes argv[0] by removing username/password, so use DEVICE_URI environment variable first. BUG: https://bugzilla.samba.org/show_bug.cgi?id=14128 Signed-off-by: Bryan Mason <bma...@redhat.com> Reviewed-by: Alexander Bokovoy <a...@samba.org> Reviewed-by: Andreas Schneider <a...@samba.org> Autobuild-User(master): Andreas Schneider <a...@cryptomilk.org> Autobuild-Date(master): Wed Sep 18 12:31:11 UTC 2019 on sn-devel-184 (cherry picked from commit d65b17c3f7f9959ed95b03cc09e020d7387b7931) ----------------------------------------------------------------------- Summary of changes: ctdb/tools/ctdb.c | 8 +++++++- source3/client/smbspool.c | 16 +++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c index 27bb4f548bc..74790580229 100644 --- a/ctdb/tools/ctdb.c +++ b/ctdb/tools/ctdb.c @@ -5562,7 +5562,13 @@ static int control_nodestatus(TALLOC_CTX *mem_ctx, struct ctdb_context *ctdb, ret = 0; for (i=0; i<nodemap->num; i++) { - ret |= nodemap->node[i].flags; + uint32_t flags = nodemap->node[i].flags; + + if ((flags & NODE_FLAGS_DELETED) != 0) { + continue; + } + + ret |= flags; } return ret; diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c index ad988eb0df9..36f7f67ca94 100644 --- a/source3/client/smbspool.c +++ b/source3/client/smbspool.c @@ -256,13 +256,15 @@ main(int argc, /* I - Number of command-line arguments */ /* * Find the URI ... - */ - if (dev_uri == NULL) { - env = getenv("DEVICE_URI"); - if (env != NULL && env[0] != '\0') { - dev_uri = env; - } - } + * + * The URI in argv[0] is sanitized to remove username/password, so + * use DEVICE_URI if available. Otherwise keep the URI already + * discovered in argv. + */ + env = getenv("DEVICE_URI"); + if (env != NULL && env[0] != '\0') { + dev_uri = env; + } if (dev_uri == NULL) { fprintf(stderr, -- Samba Shared Repository