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/ctdb_daemon.c | |
| parent | 6fa8e1fddb621e42b5a18b2fdccf30e0089ee332 (diff) | |
| download | samba-83e68b62dd60653342cca21a88617514be4d9f38.tar.gz samba-83e68b62dd60653342cca21a88617514be4d9f38.tar.xz samba-83e68b62dd60653342cca21a88617514be4d9f38.zip | |
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/ctdb_daemon.c')
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index 0fb1a8de23..e322453272 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -704,7 +704,7 @@ static void ctdb_setup_event_callback(struct ctdb_context *ctdb, int status, /* start the protocol going as a daemon */ -int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog) +int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog, const char *public_address_list) { int res, ret = -1; struct fd_event *fde; @@ -791,6 +791,14 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog) if (ctdb->methods->initialise(ctdb) != 0) { ctdb_fatal(ctdb, "transport failed to initialise"); } + if (public_address_list) { + ret = ctdb_set_public_addresses(ctdb, public_address_list); + if (ret == -1) { + DEBUG(DEBUG_ALERT,("Unable to setup public address list\n")); + exit(1); + } + } + /* attach to existing databases */ if (ctdb_attach_databases(ctdb) != 0) { |