sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-06-02 13:06:57 +03:00
Code

add back in --public-interface as a default

Browse Source 
(This used to be ctdb commit cdf56daf69b2c8381ee673943e982ad20f19affd)
This commit is contained in:
Andrew Tridgell 2007-09-10 14:26:35 +10:00
parent 42168177ef
commit 70ec39b1b1
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ctdb/server/ctdbd.c
View File

@ -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) {