1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00

ctdb-daemon: Drop special case handling for new IP already on interface

The address may already be assigned to another node, so this is wrong.
It also leaves the interface unknown.

This is better left to code that handles rogue IP addresses.  A
takeover run should correctly takeover the address if it is assigned
to this node or release it if it is assigned to another node.  Coming
soon...

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-08-17 14:43:05 +10:00 committed by Martin Schwenke
parent d2a91394f5
commit a10545ab6b

View File

@ -1080,12 +1080,6 @@ static int ctdb_add_public_address(struct ctdb_context *ctdb,
vnn->public_address = *addr;
vnn->public_netmask_bits = mask;
vnn->pnn = -1;
if (check_address) {
if (ctdb_sys_have_ip(addr)) {
DEBUG(DEBUG_ERR,("We are already hosting public address '%s'. setting PNN to ourself:%d\n", ctdb_addr_to_str(addr), ctdb->pnn));
vnn->pnn = ctdb->pnn;
}
}
for (i=0; vnn->ifaces[i]; i++) {
ret = ctdb_add_local_iface(ctdb, vnn->ifaces[i]);