Remove obsolete options for createuser

Started by Alexander Lakhinabout 6 years ago3 messages
#1Alexander Lakhin
exclusion@gmail.com
1 attachment(s)

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

Attachments:

remove-createuser-adduser.patchtext/x-patch; name=remove-createuser-adduser.patchDownload
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':
#2Michael Paquier
michael@paquier.xyz
In reply to: Alexander Lakhin (#1)
Re: Remove obsolete options for createuser

On Sat, Oct 19, 2019 at 03:34:56PM +0300, Alexander Lakhin wrote:

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.

The commit in question is 8ae0d47 from 2005. So let's remove it. It
is not even documented for ages.

Perhaps somebody thinks it is not a good idea?
--
Michael

#3Michael Paquier
michael@paquier.xyz
In reply to: Michael Paquier (#2)
Re: Remove obsolete options for createuser

On Mon, Oct 21, 2019 at 01:33:08PM +0900, Michael Paquier wrote:

The commit in question is 8ae0d47 from 2005. So let's remove it. It
is not even documented for ages.

Perhaps somebody thinks it is not a good idea?

Done. A similar move could be done for --encrypted which has been
made a no-op as of eb61136, still that feels way too early.
--
Michael