From 9bf264177f53dfe03ba1a9ba9bb352d5401f1ce9 Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Mon, 26 Jun 2017 10:22:27 +0900
Subject: [PATCH] Add checks for use of --upstream-node-id

---
 repmgr-client.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/repmgr-client.c b/repmgr-client.c
index 2a1ac901..8bcea049 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -281,6 +281,14 @@ main(int argc, char **argv)
 				strncpy(runtime_options.node_name, optarg, MAXLEN);
 				break;
 
+			/* standby options *
+			 * --------------- */
+
+			/* --upstream-node-id */
+			case OPT_UPSTREAM_NODE_ID:
+				runtime_options.upstream_node_id = repmgr_atoi(optarg, "--upstream-node-id", &cli_errors, false);
+				break;
+
 			/* standby clone options *
 			 * --------------------- */
 
@@ -311,7 +319,7 @@ main(int argc, char **argv)
 
 			/* -w/--wal-keep-segments */
 			case 'w':
-				repmgr_atoi(optarg, "-w/--wal-keep-segments", &cli_errors, false);
+				(void) repmgr_atoi(optarg, "-w/--wal-keep-segments", &cli_errors, false);
 				strncpy(runtime_options.wal_keep_segments,
 						optarg,
 						MAXLEN);
@@ -354,10 +362,6 @@ main(int argc, char **argv)
 				strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
 				break;
 
-			case OPT_UPSTREAM_NODE_ID:
-				//strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
-				break;
-
 			case OPT_USE_RECOVERY_CONNINFO_PASSWORD:
 				runtime_options.use_recovery_conninfo_password = true;
 				break;
@@ -1075,6 +1079,20 @@ check_cli_parameters(const int action)
 		}
 	}
 
+	if (runtime_options.upstream_node_id != UNKNOWN_NODE_ID)
+	{
+		switch (action)
+		{
+			case STANDBY_CLONE:
+			case STANDBY_REGISTER:
+				break;
+			default:
+				item_list_append_format(&cli_warnings,
+										_("--upstream-node-id will be ignored when executing %s"),
+										action_name(action));
+		}
+	}
+
 	if (runtime_options.event[0])
 	{
 		switch (action)