From 6f77e84b628442ea40b900ef37bc64c24d152295 Mon Sep 17 00:00:00 2001
From: Ian Barwick <barwick@gmail.com>
Date: Fri, 16 Jun 2017 22:10:07 +0900
Subject: [PATCH] Update handling of --replication-user

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

diff --git a/repmgr-client.c b/repmgr-client.c
index c99b82c5..361af093 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -204,6 +204,11 @@ main(int argc, char **argv)
 				runtime_options.force = true;
 				break;
 
+			/* --replication-user (master/standby register only) */
+			case OPT_REPLICATION_USER:
+				strncpy(runtime_options.replication_user, optarg, MAXLEN);
+				break;
+
 			/* -W/--wait */
 			case 'W':
 				runtime_options.wait = true;
@@ -350,10 +355,6 @@ main(int argc, char **argv)
 				break;
 			}
 
-			case OPT_REPLICATION_USER:
-				strncpy(runtime_options.replication_user, optarg, MAXLEN);
-				break;
-
 			case OPT_UPSTREAM_CONNINFO:
 				strncpy(runtime_options.upstream_conninfo, optarg, MAXLEN);
 				break;
@@ -1066,6 +1067,25 @@ check_cli_parameters(const int action)
 		}
 	}
 
+	if (runtime_options.replication_user[0])
+	{
+		switch (action)
+		{
+			case MASTER_REGISTER:
+			case STANDBY_REGISTER:
+				break;
+			case STANDBY_CLONE:
+			case STANDBY_FOLLOW:
+				item_list_append_format(&cli_warnings,
+										_("--replication-user ignored when executing %s)"),
+										action_name(action));
+			default:
+				item_list_append_format(&cli_warnings,
+										_("--replication-user not required when executing %s"),
+										action_name(action));
+		}
+	}
+
 	if (runtime_options.limit_provided)
 	{
 		switch (action)