diff options
| author | Andrew Tridgell <tridge@samba.org> | 2007-09-10 14:26:35 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2007-09-10 14:26:35 +1000 |
| commit | 70ec39b1b13b76c470e4394be760178b35ea94e0 (patch) | |
| tree | b2f1fd279b44d8ce4c8f32c125158a06fb640d73 /ctdb/server/ctdbd.c | |
| parent | 42168177ef3a75534827e3e4b7d143d273bff465 (diff) | |
| download | samba-70ec39b1b13b76c470e4394be760178b35ea94e0.tar.gz samba-70ec39b1b13b76c470e4394be760178b35ea94e0.tar.xz samba-70ec39b1b13b76c470e4394be760178b35ea94e0.zip | |
add back in --public-interface as a default
(This used to be ctdb commit cdf56daf69b2c8381ee673943e982ad20f19affd)
Diffstat (limited to 'ctdb/server/ctdbd.c')
| -rw-r--r-- | ctdb/server/ctdbd.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 218c658290..500773375e 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -46,6 +46,7 @@ static struct { const char *logfile; const char *recovery_lock_file; const char *db_dir; + const char *public_interface; int no_setsched; } options = { .nlist = ETCDIR "/ctdb/nodes", @@ -100,6 +101,7 @@ int main(int argc, const char *argv[]) POPT_CTDB_CMDLINE { "interactive", 'i', POPT_ARG_NONE, &interactive, 0, "don't fork", NULL }, { "public-addresses", 0, POPT_ARG_STRING, &options.public_address_list, 0, "public address list file", "filename" }, + { "public-interface", 0, POPT_ARG_STRING, &options.public_interface, 0, "public interface", "interface"}, { "event-script-dir", 0, POPT_ARG_STRING, &options.event_script_dir, 0, "event script directory", "dirname" }, { "logfile", 0, POPT_ARG_STRING, &options.logfile, 0, "log file location", "filename" }, { "nlist", 0, POPT_ARG_STRING, &options.nlist, 0, "node list file", "filename" }, @@ -198,6 +200,11 @@ int main(int argc, const char *argv[]) } } + if (options.public_interface) { + ctdb->default_public_interface = talloc_strdup(ctdb, options.public_interface); + CTDB_NO_MEMORY(ctdb, ctdb->default_public_interface); + } + if (options.public_address_list) { ret = ctdb_set_public_addresses(ctdb, options.public_address_list); if (ret == -1) { |