The branch, v4-11-test has been updated
via d42c7ffa6cb pod2man is no longer needed
via 361f4f5d247 ctdb-tools: Stop deleted nodes from influencing ctdb
nodestatus exit code
via 4d41dc32653 s3:client:Use DEVICE_URI, instead of argv[0],for Device
URI
from d702f662901 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-11-test
- Log -----------------------------------------------------------------
commit d42c7ffa6cbd90d0e777e39b12eda5c69e186a2f
Author: Mathieu Parent <[email protected]>
Date: Wed Sep 18 03:15:47 2019 +0000
pod2man is no longer needed
Since e24e344d0da58013fd5fa404529fe1d25ef403bf.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14131
Signed-off-by: Mathieu Parent <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Reviewed-by: Andrew Bartlett <[email protected]>
(cherry picked from commit 8df123e7f7cb591f6673ccffefffc30b946f1a5b)
Autobuild-User(v4-11-test): Karolin Seeger <[email protected]>
Autobuild-Date(v4-11-test): Fri Sep 20 21:13:55 UTC 2019 on sn-devel-184
commit 361f4f5d24721d54558144a5905657d5cc7281a3
Author: Martin Schwenke <[email protected]>
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 <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
(cherry picked from commit 32b5ceb31936ec5447362236c1809db003561d29)
commit 4d41dc32653bd1ae7d87dcd5779c3586ae6561d3
Author: Bryan Mason <[email protected]>
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 <[email protected]>
Reviewed-by: Alexander Bokovoy <[email protected]>
Reviewed-by: Andreas Schneider <[email protected]>
Autobuild-User(master): Andreas Schneider <[email protected]>
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 +++++++-
pidl/wscript | 1 -
source3/client/smbspool.c | 16 +++++++++-------
3 files changed, 16 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 2cc72eedc76..6a15b61ccd1 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -5611,7 +5611,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/pidl/wscript b/pidl/wscript
index 01b71bd8b27..d1b8278990a 100644
--- a/pidl/wscript
+++ b/pidl/wscript
@@ -34,7 +34,6 @@ def configure(conf):
# yapp is used for building the parser
conf.find_program('yapp', var='YAPP')
- conf.find_program('pod2man', var='POD2MAN')
def build(bld):
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
