To: pgsql-hackers <pgsql-hackers@postgresql.org>
From: Alexander Lakhin <exclusion@gmail.com>
Subject: Remove obsolete options for createuser
Message-ID: <5da284a2-62d9-e338-88d1-26ee5009d93e@gmail.com>
Date: Sat, 19 Oct 2019 15:34:56 +0300
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.7.2
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------42DD991531184ECA86F40A45"
Content-Language: en-US
Precedence: bulk

This is a multi-part message in MIME format.
--------------42DD991531184ECA86F40A45
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit

Hello hackers,

I've noticed that the createuser utility supports two undocumented
options (--adduser, --no-adduser), that became obsolete in 2005.
I believe that their existence should come to end someday (maybe
today?). The patch to remove them is attached.

Best regards.
Alexander


--------------42DD991531184ECA86F40A45
Content-Type: text/x-patch;
 name="remove-createuser-adduser.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="remove-createuser-adduser.patch"

diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 973ba525b2..c8db5e0bd1 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -43,9 +43,6 @@ main(int argc, char *argv[])
 		{"replication", no_argument, NULL, 1},
 		{"no-replication", no_argument, NULL, 2},
 		{"interactive", no_argument, NULL, 3},
-		/* adduser is obsolete, undocumented spelling of superuser */
-		{"adduser", no_argument, NULL, 'a'},
-		{"no-adduser", no_argument, NULL, 'A'},
 		{"connection-limit", required_argument, NULL, 'c'},
 		{"pwprompt", no_argument, NULL, 'P'},
 		{"encrypted", no_argument, NULL, 'E'},
@@ -88,7 +85,7 @@ main(int argc, char *argv[])
 
 	handle_help_version_opts(argc, argv, "createuser", help);
 
-	while ((c = getopt_long(argc, argv, "h:p:U:g:wWedDsSaArRiIlLc:PE",
+	while ((c = getopt_long(argc, argv, "h:p:U:g:wWedDsSrRiIlLc:PE",
 							long_options, &optindex)) != -1)
 	{
 		switch (c)
@@ -121,11 +118,9 @@ main(int argc, char *argv[])
 				createdb = TRI_NO;
 				break;
 			case 's':
-			case 'a':
 				superuser = TRI_YES;
 				break;
 			case 'S':
-			case 'A':
 				superuser = TRI_NO;
 				break;
 			case 'r':

--------------42DD991531184ECA86F40A45--