diff options
author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-05-01 15:27:12 +1000 |
---|---|---|
committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-05-01 15:34:26 +1000 |
commit | a367fa6138b59df2eae740de495de43dac46e163 (patch) | |
tree | 62c090db9cfb3509276d17227c3aeb9fa736737b /ctdb/server/ctdb_daemon.c | |
parent | 733bc2c03cec1db2a1f7d4812c08e37c32c4d639 (diff) | |
download | samba-a367fa6138b59df2eae740de495de43dac46e163.tar.gz samba-a367fa6138b59df2eae740de495de43dac46e163.tar.xz samba-a367fa6138b59df2eae740de495de43dac46e163.zip |
RELOADIPS: simplify the reloadips code a bit
and also update the "read public address file" to not check if the address exists already locally when we read if from the child process, to stop it
from spamming the logs with "We already host ..."
messages
(This used to be ctdb commit 334ea830f1bf33419f4a1e78f23afd41a852d0f4)
Diffstat (limited to 'ctdb/server/ctdb_daemon.c')
-rw-r--r-- | ctdb/server/ctdb_daemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 192dbff2f11..f946ac61da9 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1162,7 +1162,7 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog, } if (public_address_list) { ctdb->public_addresses_file = public_address_list; - ret = ctdb_set_public_addresses(ctdb); + ret = ctdb_set_public_addresses(ctdb, true); if (ret == -1) { DEBUG(DEBUG_ALERT,("Unable to setup public address list\n")); exit(1); |