postgrespro.git / summary / log / commit / refs

commit    4fa5edcd1a45cb11bc52b612e12bb29ab39cb895
Author:   Michael Paquier <michael@paquier.xyz>
Date:     Wed Oct 23 03:27:03 2019 +0000

    Remove last traces of --adduser/--no-adduser in createuser
    
    8ae0d47 marked those options as obsolete back in 2005, with the options
    removed from the documentation.  This removes the last references to
    both options in the code which were kept around for compatibility
    purposes with past commands.
    
    Author: Alexander Lakhin
    Discussion: https://postgr.es/m/5da284a2-62d9-e338-88d1-26ee5009d93e@gmail.com


 src/bin/scripts/createuser.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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':


[parent: 57379cd5ac56]