From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 29 May 2007 00:59:12 +0000 (+1000)
Subject: rename ctdb_control utility to ctdb
X-Git-Tag: tevent-0.9.20~348^2~2664
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9838027ff8e47600caf00326b4d7219f97bf93d6;p=thirdparty%2Fsamba.git

rename ctdb_control utility to ctdb
(This used to be ctdb commit 7fc3868a1a49aa8b49b277793eede903606b4353)
---

diff --git a/ctdb/Makefile.in b/ctdb/Makefile.in
index 41839c7ed17..d4fbc95edea 100644
--- a/ctdb/Makefile.in
+++ b/ctdb/Makefile.in
@@ -68,7 +68,7 @@ bin/ctdbd: $(OBJS) direct/ctdbd.o
 	@echo Linking $@
 	@$(CC) $(CFLAGS) -o $@ direct/ctdbd.o $(OBJS) $(LIB_FLAGS)
 
-bin/ctdb_control: $(OBJS) tools/ctdb_control.o 
+bin/ctdb: $(OBJS) tools/ctdb_control.o 
 	@echo Linking $@
 	@$(CC) $(CFLAGS) -o $@ tools/ctdb_control.o $(OBJS) $(LIB_FLAGS)
 
diff --git a/ctdb/takeover/ctdb_takeover.c b/ctdb/takeover/ctdb_takeover.c
index cc2369f339a..f4a9540ba0d 100644
--- a/ctdb/takeover/ctdb_takeover.c
+++ b/ctdb/takeover/ctdb_takeover.c
@@ -252,14 +252,17 @@ int ctdb_takeover_run(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap)
 			for (j=(i+1)%nodemap->num;
 			     j != i;
 			     j=(j+1)%nodemap->num) {
-				if (nodemap->nodes[j].flags & NODE_FLAGS_CONNECTED) {
+				if ((nodemap->nodes[j].flags & NODE_FLAGS_CONNECTED) && 
+				    same_subnet(nodemap->nodes[j]->public_address, nodemap->nodes[i]->public_address, 
+						nodemap->nodes[i]->public_netmask)) {
 					ctdb->nodes[i]->takeover_vnn = nodemap->nodes[j].vnn;
 					break;
 				}
 			}
 			if (j == i) {
-				DEBUG(0,(__location__ " No node available to assign to??\n"));
-				return -1;
+				DEBUG(0,(__location__ " No node available on same network to take %s\n",
+					 nodemap->nodes[i]->public_address));
+				ctdb->nodes[i]->takeover_vnn = -1;	
 			}
 		}
 	}