[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  c59d5e1 build: fix standalone ctdb build --with-systemd
       via  b4aa16b ctdb/pmda: fix num_recoveries metric store
       via  db4d72d ldb: Directly return an error and do not fall through
      from  ffcc367 tests/smbcontrol: reduce ping test false positive rate

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit c59d5e11967b9b0afb16fcffc023c1437bf9ad21
Author: David Disseldorp <ddiss at samba.org>
Date:   Mon Mar 5 15:08:55 2018 +0100

    build: fix standalone ctdb build --with-systemd
    
    For standalone ctdb builds, a samba-util-core dependency is added,
    without corresponding systemd libraries, which are needed when
    become_daemon.c is built --with-systemd. This results in:
      default/lib/util/become_daemon_20.o: In function `daemon_status':
      become_daemon.c:(.text+0x456): undefined reference to `sd_notifyf'
      collect2: error: ld returned 1 exit status
    
    Fix this by moving the systemd library dependencies from samba-util to
    samba-util-core, the become_daemon.c base build target.
    
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Mar  5 20:49:51 CET 2018 on sn-devel-144

commit b4aa16b9edbd9fee9ec2e9cc9c925fbeb7281921
Author: David Disseldorp <ddiss at samba.org>
Date:   Mon Mar 5 11:55:00 2018 +0100

    ctdb/pmda: fix num_recoveries metric store
    
    The num_recoveries metric is declared as PM_TYPE_U32, so should be
    used accordingly.
    
    Suggested-by: Nathan Scott <nathans at redhat.com>
    Signed-off-by: David Disseldorp <ddiss at samba.org>
    Reviewed-by: Andreas Schneider <asn at samba.org>

commit db4d72d21c263dc50851dc9b36ee0de61ee5fef2
Author: Andreas Schneider <asn at samba.org>
Date:   Mon Mar 5 08:43:17 2018 +0100

    ldb: Directly return an error and do not fall through
    
    Detected by -Wimplicit-fallthrough.
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Andrew Bartlet <abartlet at samba.org>

-----------------------------------------------------------------------

Summary of changes:
 ctdb/utils/pmda/pmda_ctdb.c | 2 +-
 lib/ldb/ldb_tdb/ldb_index.c | 2 +-
 lib/util/wscript_build      | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/utils/pmda/pmda_ctdb.c b/ctdb/utils/pmda/pmda_ctdb.c
index 45ec5f1..4f7933d 100644
--- a/ctdb/utils/pmda/pmda_ctdb.c
+++ b/ctdb/utils/pmda/pmda_ctdb.c
@@ -302,7 +302,7 @@ fill_base(unsigned int item, pmAtomValue *atom)
 		atom->d = stats->childwrite_latency.max;
 		break;
 	case 22:
-		atom->d = stats->num_recoveries;
+		atom->ul = stats->num_recoveries;
 		break;
 	default:
 		return PM_ERR_PMID;
diff --git a/lib/ldb/ldb_tdb/ldb_index.c b/lib/ldb/ldb_tdb/ldb_index.c
index 17cb267..739cab0 100644
--- a/lib/ldb/ldb_tdb/ldb_index.c
+++ b/lib/ldb/ldb_tdb/ldb_index.c
@@ -1862,7 +1862,7 @@ int ltdb_search_indexed(struct ltdb_context *ac, uint32_t *match_count)
 		 * The only caller will have filtered the operation out
 		 * so we should never get here
 		 */
-		ldb_operr(ldb);
+		return ldb_operr(ldb);
 
 	case LDB_SCOPE_ONELEVEL:
 		/*
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 615ff75..deed2b0 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -75,6 +75,7 @@ bld.SAMBA_SUBSYSTEM('samba-util-core',
                               become_daemon.c mkdir_p.c''',
                     deps='''time-basic samba-debug socket-blocking talloc
                             tevent execinfo pthread strv''',
+                    public_deps='systemd systemd-daemon',
                     local_include=False)
 
 bld.SAMBA_LIBRARY('iov_buf',
@@ -124,7 +125,7 @@ else:
                     server_id.c dprintf.c
                     tevent_debug.c memcache.c unix_match.c tfork.c''',
                   deps='samba-util-core DYNCONFIG close-low-fd tini tiniparser genrand util_str_hex',
-                  public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid systemd systemd-daemon',
+                  public_deps='talloc tevent execinfo pthread LIBCRYPTO charset util_setid',
                   public_headers='debug.h attr.h byteorder.h data_blob.h memory.h safe_string.h time.h talloc_stack.h string_wrappers.h idtree.h idtree_random.h blocking.h signal.h substitute.h fault.h genrand.h tfork.h',
                   header_path= [ ('dlinklist.h samba_util.h', '.'), ('*', 'util') ],
                   local_include=False,


-- 
Samba Shared Repository