rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-07-29 07:05:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

createuser: fix parsing of --connection-limit argument

Browse Source 
The original coding failed to quote the argument properly.

Reported-by: Daniel Gustafsson
Discussion: 1B8AE66C-85AB-4728-9BB4-612E8E61C219@yesql.se
This commit is contained in:
Alvaro Herrera 2020-02-10 12:14:58 -03:00
parent bdd19e48a8
commit ca902add69
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/bin/scripts/createuser.c
View File

@ -62,7 +62,7 @@ main(int argc, char *argv[])
enum trivalue prompt_password = TRI_DEFAULT; enum trivalue prompt_password = TRI_DEFAULT;
bool echo = false; bool echo = false;
bool interactive = false; bool interactive = false;
char *conn_limit = NULL; int conn_limit = -2; /* less than minimum valid value */
bool pwprompt = false; bool pwprompt = false;
char *newpassword = NULL; char *newpassword = NULL;
char newuser_buf[128]; char newuser_buf[128];
@ -89,6 +89,8 @@ main(int argc, char *argv[])
while ((c = getopt_long(argc, argv, "h:p:U:g:wWedDsSaArRiIlLc:PE", while ((c = getopt_long(argc, argv, "h:p:U:g:wWedDsSaArRiIlLc:PE",
long_options, &optindex)) != -1) long_options, &optindex)) != -1)
{ {
char *endptr;
switch (c) switch (c)
{ {
case 'h': case 'h':
@ -145,7 +147,14 @@ main(int argc, char *argv[])
login = TRI_NO; login = TRI_NO;
break; break;
case 'c': case 'c':
conn_limit = pg_strdup(optarg); conn_limit = strtol(optarg, &endptr, 10);
if (*endptr != '\0' || conn_limit < -1) /* minimum valid value */
{
fprintf(stderr,
_("%s: invalid value for --connection-limit: %s\n"),
progname, optarg);
exit(1);
}
break; break;
case 'P': case 'P':
pwprompt = true; pwprompt = true;
@ -300,8 +309,8 @@ main(int argc, char *argv[])
appendPQExpBufferStr(&sql, " REPLICATION"); appendPQExpBufferStr(&sql, " REPLICATION");
if (replication == TRI_NO) if (replication == TRI_NO)
appendPQExpBufferStr(&sql, " NOREPLICATION"); appendPQExpBufferStr(&sql, " NOREPLICATION");
if (conn_limit != NULL) if (conn_limit >= -1)
appendPQExpBuffer(&sql, " CONNECTION LIMIT %s", conn_limit); appendPQExpBuffer(&sql, " CONNECTION LIMIT %d", conn_limit);
if (roles.head != NULL) if (roles.head != NULL)
{ {
SimpleStringListCell *cell; SimpleStringListCell *cell;