[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  eb2e29c354c s3-smbcontrol: Replace && with || to declare variables in do_sleep()
      from  b5bf1b66d55 .gitlab-ci.yml: avoid using != to compare variables to support old versions

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


- Log -----------------------------------------------------------------
commit eb2e29c354ceb7ffe3bcc786929006a6cf9b13ea
Author: Anoop C S <anoopcs at redhat.com>
Date:   Wed May 29 11:40:55 2019 +0530

    s3-smbcontrol: Replace && with || to declare variables in do_sleep()
    
    --enable-developer internally use --enable-selftest alongside. But when
    configured only with --enable-selftest the following code block becomes
    invalid:
    
     #if defined(DEVELOPER) && defined(ENABLE_SELFTEST)
            unsigned int seconds;
            long input;
            const long MAX_SLEEP = 60 * 60; /* One hour maximum sleep */
     #endif
    
    making those variables undeclared for further use. Therefore replace &&
    with || to have those variables declared with --enable-selftest
    configure option.
    
    Signed-off-by: Anoop C S <anoopcs at redhat.com>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Alexander Bokovoy <ab at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Fri May 31 20:38:09 UTC 2019 on sn-devel-184

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

Summary of changes:
 source3/utils/smbcontrol.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index 7a761a6ff59..b2aa1dfa2a6 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -415,7 +415,7 @@ static bool do_sleep(struct tevent_context *ev_ctx,
 		     const struct server_id pid,
 		     const int argc, const char **argv)
 {
-#if defined(DEVELOPER) && defined(ENABLE_SELFTEST)
+#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
 	unsigned int seconds;
 	long input;
 	const long MAX_SLEEP = 60 * 60; /* One hour maximum sleep */


-- 
Samba Shared Repository