diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-11-10 12:59:25 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-11-10 14:55:24 +1100 |
| commit | 83e68b62dd60653342cca21a88617514be4d9f38 (patch) | |
| tree | 1e2cde546d579d6980da7d41a83b96d673382ebe /ctdb/server/ctdbd.c | |
| parent | 6fa8e1fddb621e42b5a18b2fdccf30e0089ee332 (diff) | |
| download | samba-83e68b62dd60653342cca21a88617514be4d9f38.tar.gz | |
delay loading the public ip address file until after we have started the transport and discovered ouw own pnn number
(This used to be ctdb commit 1b57fc866fc836b5dbd3ef7b646e5a0f4280e81e)
Diffstat (limited to 'ctdb/server/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 93a2d0823c3..b90dbcdf1e4 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -300,14 +300,6 @@ int main(int argc, const char *argv[]) } } - if (options.public_address_list) { - ret = ctdb_set_public_addresses(ctdb, options.public_address_list); - if (ret == -1) { - DEBUG(DEBUG_ALERT,("Unable to setup public address list\n")); - exit(1); - } - } - ret = ctdb_set_event_script_dir(ctdb, options.event_script_dir); if (ret == -1) { DEBUG(DEBUG_ALERT,("Unable to setup event script directory\n")); @@ -337,5 +329,5 @@ int main(int argc, const char *argv[]) } /* start the protocol running (as a child) */ - return ctdb_start_daemon(ctdb, interactive?False:True, options.use_syslog); + return ctdb_start_daemon(ctdb, interactive?False:True, options.use_syslog, options.public_address_list); } |