From 1d9aacfed93e969cb81054eb667b174cd1060d16 Mon Sep 17 00:00:00 2001
From: Ian Barwick <ian@2ndquadrant.com>
Date: Mon, 22 Dec 2014 16:01:58 +0900
Subject: [PATCH] Add -S/--superuser option for witness database creation

Previously the witness database creation code was hard-coding the
username 'postgres' when accessing the previously initialised database.
However initdb was not passed any explicit username, meaning the
default database superuser name was the same as the user running
repmgr.

With this patch, a superuser user name (default: postgres) will
be passed to initdb.

Per report by eggyknap [1]

[1] https://github.com/2ndQuadrant/repmgr/issues/38

Conflicts:
	repmgr.c
	repmgr.h
---
 repmgr.c | 23 ++++++++++++++++-------
 repmgr.h |  3 ++-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/repmgr.c b/repmgr.c
index c02709e6..4efe1874 100644
--- a/repmgr.c
+++ b/repmgr.c
@@ -100,6 +100,7 @@ main(int argc, char **argv)
 		{"host", required_argument, NULL, 'h'},
 		{"port", required_argument, NULL, 'p'},
 		{"username", required_argument, NULL, 'U'},
+		{"superuser", required_argument, NULL, 'S'},
 		{"dest-dir", required_argument, NULL, 'D'},
 		{"local-port", required_argument, NULL, 'l'},
 		{"config-file", required_argument, NULL, 'f'},
@@ -135,7 +136,7 @@ main(int argc, char **argv)
 	}
 
 
-	while ((c = getopt_long(argc, argv, "d:h:p:U:D:l:f:R:w:k:FWIvX", long_options,
+	while ((c = getopt_long(argc, argv, "d:h:p:U:S:D:l:f:R:w:k:FWIvX", long_options,
 							&optindex)) != -1)
 	{
 		switch (c)
@@ -153,6 +154,9 @@ main(int argc, char **argv)
 			case 'U':
 				strncpy(runtime_options.username, optarg, MAXLEN);
 				break;
+			case 'S':
+				strncpy(runtime_options.superuser, optarg, MAXLEN);
+				break;
 			case 'D':
 				strncpy(runtime_options.dest_dir, optarg, MAXFILENAME);
 				break;
@@ -1712,8 +1716,11 @@ do_witness_create(void)
 	 */
 
 	/* Create the cluster for witness */
-	sprintf(script, "%s/pg_ctl %s -D %s init -o \"-W\"", options.pg_bindir,
-			options.pgctl_options, runtime_options.dest_dir);
+	if (!runtime_options.superuser[0])
+		strncpy(runtime_options.superuser, "postgres", MAXLEN);
+
+	sprintf(script, "%s/pg_ctl %s -D %s init -o \"-W -U %s\"", options.pg_bindir,
+			options.pgctl_options, runtime_options.dest_dir, runtime_options.superuser);
 	log_info("Initialize cluster for witness: %s.\n", script);
 
 	r = system(script);
@@ -1771,8 +1778,8 @@ do_witness_create(void)
 	if (runtime_options.username[0] && runtime_options.localport[0] && strcmp(runtime_options.username,"postgres")!=0 )
         {
 		/* create required user needs to be superuser to create untrusted language function in c */
-		sprintf(script, "%s/createuser -p %s --superuser --login -U postgres %s", options.pg_bindir,
-			runtime_options.localport,runtime_options.username);
+		sprintf(script, "%s/createuser -p %s --superuser --login -U %s %s", options.pg_bindir,
+				runtime_options.localport, runtime_options.superuser, runtime_options.username);
 		log_info("Create user for witness db: %s.\n", script);
 
 		r = system(script);
@@ -1788,8 +1795,8 @@ do_witness_create(void)
 	if(runtime_options.dbname[0] && strcmp(runtime_options.dbname,"postgres")!=0 && runtime_options.localport[0])
 	{
 		/* create required db */
-		sprintf(script, "%s/createdb -p %s -U postgres --owner=%s %s", 
-			options.pg_bindir, runtime_options.localport,runtime_options.username, runtime_options.dbname);
+		sprintf(script, "%s/createdb -p %s -U %s --owner=%s %s",
+				options.pg_bindir, runtime_options.localport, runtime_options.superuser, runtime_options.username, runtime_options.dbname);
 		log_info("Create database for witness db: %s.\n", script);
 
 		r = system(script);
@@ -1941,6 +1948,8 @@ help(const char *progname)
 	printf(_("  -l, --local-port=PORT               standby or witness server local port\n"));
 	printf(_("  -f, --config-file=PATH              path to the configuration file\n"));
 	printf(_("  -R, --remote-user=USERNAME          database server username for rsync\n"));
+	printf(_("  -S, --superuser=USERNAME            superuser username for witness database\n" \
+			 "                                      (default: postgres)\n"));
 	printf(_("  -w, --wal-keep-segments=VALUE       minimum value for the GUC\n" \
 			 "                                      wal_keep_segments (default: 5000)\n"));
 	printf(_("  -I, --ignore-rsync-warning          ignore rsync partial transfer warning\n"));
diff --git a/repmgr.h b/repmgr.h
index 01001c4e..b57fb315 100644
--- a/repmgr.h
+++ b/repmgr.h
@@ -56,6 +56,7 @@ typedef struct
 	char		dest_dir[MAXFILENAME];
 	char		config_file[MAXFILENAME];
 	char		remote_user[MAXLEN];
+	char		superuser[MAXLEN];
 	char		wal_keep_segments[MAXLEN];
 	bool		verbose;
 	bool		force;
@@ -70,6 +71,6 @@ typedef struct
 	int			keep_history;
 }	t_runtime_options;
 
-#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, "", "", 0 }
+#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, "", "", 0}
 
 #endif