Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitca902ad

Browse files
committed
createuser: fix parsing of --connection-limit argument
The original coding failed to quote the argument properly.Reported-by: Daniel GustafssonDiscussion: 1B8AE66C-85AB-4728-9BB4-612E8E61C219@yesql.se
1 parentbdd19e4 commitca902ad

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

‎src/bin/scripts/createuser.c

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ main(int argc, char *argv[])
6262
enumtrivalueprompt_password=TRI_DEFAULT;
6363
boolecho= false;
6464
boolinteractive= false;
65-
char*conn_limit=NULL;
65+
intconn_limit=-2;/* less than minimum valid value */
6666
boolpwprompt= false;
6767
char*newpassword=NULL;
6868
charnewuser_buf[128];
@@ -89,6 +89,8 @@ main(int argc, char *argv[])
8989
while ((c=getopt_long(argc,argv,"h:p:U:g:wWedDsSaArRiIlLc:PE",
9090
long_options,&optindex))!=-1)
9191
{
92+
char*endptr;
93+
9294
switch (c)
9395
{
9496
case'h':
@@ -145,7 +147,14 @@ main(int argc, char *argv[])
145147
login=TRI_NO;
146148
break;
147149
case'c':
148-
conn_limit=pg_strdup(optarg);
150+
conn_limit=strtol(optarg,&endptr,10);
151+
if (*endptr!='\0'||conn_limit<-1)/* minimum valid value */
152+
{
153+
fprintf(stderr,
154+
_("%s: invalid value for --connection-limit: %s\n"),
155+
progname,optarg);
156+
exit(1);
157+
}
149158
break;
150159
case'P':
151160
pwprompt= true;
@@ -300,8 +309,8 @@ main(int argc, char *argv[])
300309
appendPQExpBufferStr(&sql," REPLICATION");
301310
if (replication==TRI_NO)
302311
appendPQExpBufferStr(&sql," NOREPLICATION");
303-
if (conn_limit!=NULL)
304-
appendPQExpBuffer(&sql," CONNECTION LIMIT %s",conn_limit);
312+
if (conn_limit>=-1)
313+
appendPQExpBuffer(&sql," CONNECTION LIMIT %d",conn_limit);
305314
if (roles.head!=NULL)
306315
{
307316
SimpleStringListCell*cell;

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp