From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 10 Sep 2007 04:26:35 +0000 (+1000)
Subject: add back in --public-interface as a default
X-Git-Tag: tevent-0.9.20~348^2~2429
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=70ec39b1b13b76c470e4394be760178b35ea94e0;p=thirdparty%2Fsamba.git

add back in --public-interface as a default
(This used to be ctdb commit cdf56daf69b2c8381ee673943e982ad20f19affd)
---

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 218c6582907..500773375eb 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) {