From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Fri, 7 Sep 2007 05:39:26 +0000 (+1000)
Subject: remove the ctdb publicip  command
X-Git-Tag: tevent-0.9.20~348^2~2430^2~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3cad21d6be86d8adfba1fa117498d5c15b7db781;p=thirdparty%2Fsamba.git

remove the ctdb publicip  command
this command no longer makes sense when there is no on-to-one mapping
between a node and its default public ip

(This used to be ctdb commit 91280db7f6dd3d659edd86fae21ba347d6f9da9e)
---

diff --git a/ctdb/tools/ctdb.c b/ctdb/tools/ctdb.c
index 3815a5a78de..0417b27943d 100644
--- a/ctdb/tools/ctdb.c
+++ b/ctdb/tools/ctdb.c
@@ -560,31 +560,6 @@ static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv)
 	return 0;
 }
 
-/*
-  display public ip address of this node
- */
-static int control_publicip(struct ctdb_context *ctdb, int argc, const char **argv)
-{
-	int ret;
-	struct ctdb_all_public_ips *ips;
-	int mypnn;
-
-	mypnn = ctdb_ctrl_getpnn(ctdb, TIMELIMIT(), options.pnn);
-	if (mypnn == -1) {
-		return -1;
-	}
-
-	ret = ctdb_ctrl_get_public_ips(ctdb, TIMELIMIT(), options.pnn, ctdb, &ips);
-	if (ret != 0) {
-		DEBUG(0, ("Unable to get public ips from node %u\n", options.pnn));
-		return ret;
-	}
-
-	printf("%-16s\n", inet_ntoa(ips->ips[mypnn].sin.sin_addr));
-
-	return 0;
-}
-
 /*
   display pid of a ctdb daemon
  */
@@ -1050,7 +1025,6 @@ static const struct {
 	{ "statistics",      control_statistics,        false, "show statistics" },
 	{ "statisticsreset", control_statistics_reset,  true,  "reset statistics"},
 	{ "ip",              control_ip,                true,  "show which public ip's that ctdb manages" },
-	{ "publicip",        control_publicip,          false, "show the default public ip address for this node" },
 	{ "process-exists",  control_process_exists,    true,  "check if a process exists on a node",  "<pid>"},
 	{ "getdbmap",        control_getdbmap,          true,  "show the database map" },
 	{ "catdb",           control_catdb,             true,  "dump a database" ,                     "<dbname>"},