The branch, master has been updated
via 6083e62 ctdb-daemon: make bool assignment more obvious
from af08cb2 source4/scripting: add an option to samba_dnsupdate to add
ns records.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6083e62af527a99ec0b696528eaafd95b2590049
Author: Michael Adam <[email protected]>
Date: Mon Jun 20 10:42:43 2016 +0200
ctdb-daemon: make bool assignment more obvious
(showing what is the rule and what is the exception)
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Amitay Isaacs <[email protected]>
Autobuild-User(master): Michael Adam <[email protected]>
Autobuild-Date(master): Tue Jun 21 11:48:29 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
ctdb/server/ctdbd.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 420add4..e09611f 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -294,10 +294,9 @@ int main(int argc, const char *argv[])
}
ctdb->valgrinding = (options.valgrinding == 1);
- if ((options.valgrinding == 1) || (options.nosetsched == 1)) {
+ ctdb->do_setsched = (options.nosetsched != 1);
+ if (ctdb->valgrinding) {
ctdb->do_setsched = false;
- } else {
- ctdb->do_setsched = true;
}
ctdb->public_addresses_file = options.public_address_list;
--
Samba Shared Repository
