diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2012-04-04 14:42:23 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2012-04-13 15:38:11 +1000 |
| commit | 202791cf7258ca7946989112c5ed6fffbd10be7a (patch) | |
| tree | 74808845c6c4d6a4cfe084a355226a343e98e2b5 | |
| parent | ad4d5263e7211eb63587121b11dc1c24fda816f3 (diff) | |
| download | samba-202791cf7258ca7946989112c5ed6fffbd10be7a.tar.gz samba-202791cf7258ca7946989112c5ed6fffbd10be7a.tar.xz samba-202791cf7258ca7946989112c5ed6fffbd10be7a.zip | |
recoverd: Fix spurious warnings when running with --nopublicipcheck
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
(This used to be ctdb commit 7f8096f56d8274151705ac822b582d972078f8fe)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 97e46704b1..c079217868 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2775,13 +2775,13 @@ static int verify_local_ip_allocation(struct ctdb_context *ctdb, struct ctdb_rec ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; } else if (ips->ips[j].pnn == pnn) { - if (!ctdb_sys_have_ip(&ips->ips[j].addr)) { + if (ctdb->do_checkpublicip && !ctdb_sys_have_ip(&ips->ips[j].addr)) { DEBUG(DEBUG_CRIT,("Public address '%s' is missing and we should serve this ip\n", ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; } } else { - if (ctdb_sys_have_ip(&ips->ips[j].addr)) { + if (ctdb->do_checkpublicip && ctdb_sys_have_ip(&ips->ips[j].addr)) { DEBUG(DEBUG_CRIT,("We are still serving a public address '%s' that we should not be serving.\n", ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; |