sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

Revert "When adding an ip at runtime, it might not yet have an iface assigned to it, so ensure that the next takover_ip call will fall through to accept the ip and add it."

Browse Source 
This reverts commit 4136f2714578a9bc0e5632a21d287a50f9ec137a.

If the IP address is on an interface then it won't help to pretend
that it isn't.  This will simply cause a takeip event, which will fail
because the address can't be added.  Note that the IP address isn't
necessarily new - something unexpected may have happened.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2016-07-29 19:41:01 +10:00 committed by Martin Schwenke
parent 162857eff1
commit 81cba9054e
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ctdb/server/ctdb_takeover.c
View File

@ -763,12 +763,6 @@ int32_t ctdb_control_takeover_ip(struct ctdb_context *ctdb,
return -1;
}
if (vnn->iface == NULL && vnn->pnn == -1 && have_ip && best_iface != NULL) {
DEBUG(DEBUG_ERR,("Taking over newly created ip\n"));
have_ip = false;
}
if (vnn->iface == NULL && have_ip) {
DEBUG(DEBUG_CRIT,(__location__ " takeoverip of IP %s is known to the kernel, "
"but we have no interface assigned, has someone manually configured it? Ignore for now.\n",