s3-smbcontrol: Replace && with || to declare variables in do_sleep() master4-dcerpc-base master4-dcerpc-ok
authorAnoop C S <anoopcs@redhat.com>
Wed, 29 May 2019 06:10:55 +0000 (11:40 +0530)
committerRalph Boehme <slow@samba.org>
Fri, 31 May 2019 20:38:09 +0000 (20:38 +0000)
--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@redhat.com>
Reviewed-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
Autobuild-User(master): Ralph Böhme <slow@samba.org>
Autobuild-Date(master): Fri May 31 20:38:09 UTC 2019 on sn-devel-184

source3/utils/smbcontrol.c

index 7a761a6ff5946c7b07406e1dd1368d24a5a222e0..b2aa1dfa2a684ac1909202a478acb5535d8d73eb 100644 (file)
@@ -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 */