From: Anoop C S Date: Wed, 29 May 2019 06:10:55 +0000 (+0530) Subject: s3-smbcontrol: Replace && with || to declare variables in do_sleep() X-Git-Tag: ldb-2.0.5~517 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eb2e29c354ceb7ffe3bcc786929006a6cf9b13ea;p=thirdparty%2Fsamba.git 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 Reviewed-by: Ralph Boehme Reviewed-by: Alexander Bokovoy Autobuild-User(master): Ralph Böhme Autobuild-Date(master): Fri May 31 20:38:09 UTC 2019 on sn-devel-184 --- 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 */