The branch, master has been updated
via 19fffeb ctdb-scripts: further untangle logic for success of
interface monitoring
via 93e48df ctdb: Fix the O3 developer build
from 0f57acc s4:acl LDB module - fix error message
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 19fffeb75a5b9e352f67cfdfbd45d0ac8ad5e4a3
Author: Michael Adam <[email protected]>
Date: Tue Jan 12 18:59:15 2016 +0100
ctdb-scripts: further untangle logic for success of interface monitoring
Reduces intentation by using early returns.
Signed-off-by: Michael Adam <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
Autobuild-User(master): Martin Schwenke <[email protected]>
Autobuild-Date(master): Thu Jan 14 22:41:29 CET 2016 on sn-devel-144
commit 93e48df86cb007ebd6ed14a425b9220dbb4d0ba6
Author: Volker Lendecke <[email protected]>
Date: Thu Jan 14 11:20:21 2016 +0100
ctdb: Fix the O3 developer build
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Uri Simchoni <[email protected]>
Reviewed-by: Martin Schwenke <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
ctdb/config/events.d/10.interface | 17 ++++++++++-------
ctdb/server/ipalloc.c | 2 +-
2 files changed, 11 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/ctdb/config/events.d/10.interface
b/ctdb/config/events.d/10.interface
index 4b9f31c..00b5f97 100755
--- a/ctdb/config/events.d/10.interface
+++ b/ctdb/config/events.d/10.interface
@@ -152,16 +152,19 @@ monitor_interfaces()
done
- if $fail ; then
- if $up_interfaces_found && \
- [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
+ if ! $fail ; then
return 0
- else
+ fi
+
+ if ! $up_interfaces_found ; then
+ return 1
+ fi
+
+ if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" != "yes" ]; then
return 1
- fi
- else
- return 0
fi
+
+ return 0
}
# Sets: iface, ip, maskbits, family
diff --git a/ctdb/server/ipalloc.c b/ctdb/server/ipalloc.c
index 9b5579c..ae9e8de 100644
--- a/ctdb/server/ipalloc.c
+++ b/ctdb/server/ipalloc.c
@@ -31,7 +31,7 @@
/* The calculation part of the IP allocation algorithm. */
bool ipalloc(struct ipalloc_state *ipalloc_state)
{
- bool ret;
+ bool ret = false;
switch (ipalloc_state->algorithm) {
case IPALLOC_LCP2:
--
Samba Shared Repository
