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

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

Reply via email to