Rev 602: add back in --public-interface as a default in http://samba.org/~tridge/ctdb

[tridge at samba.org]

------------------------------------------------------------
revno: 602
revision-id: tridge at samba.org-20070910042635-zctpwiptwxw8ujff
parent: tridge at samba.org-20070910032111-5s3itxb86fh200zd
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge.test
timestamp: Mon 2007-09-10 14:26:35 +1000
message:
  add back in --public-interface as a default
modified:
  server/ctdbd.c                 ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
=== modified file 'server/ctdbd.c'
--- a/server/ctdbd.c	2007-09-04 00:09:58 +0000
+++ b/server/ctdbd.c	2007-09-10 04:26:35 +0000
@@ -46,6 +46,7 @@
 	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 @@
 		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 @@
 		}
 	}
 
+	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) {