farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed problem with interactive authentication handling.

Browse Source 
Previous pgut.c didn't handle any user-input during interactive authentication.
This commit is contained in:
Masahiko Sakamoto
2010-09-29 07:29:29 +00:00
parent 8ab15f2e72
commit 7865250a19
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
bin/pgut/pgut.c
View File

@ -402,11 +402,15 @@ PGconn *
pgut_connect(const char *info, YesNo prompt, int elevel)
{
char *passwd;
CHECK_FOR_INTERRUPTS();
StringInfoData add_pass;
if (prompt == YES)
{
passwd = prompt_for_password();
initStringInfo(&add_pass);
appendStringInfo(&add_pass, info);
appendStringInfo(&add_pass, " password=%s ", passwd);
}
else
passwd = NULL;
@ -414,15 +418,17 @@ pgut_connect(const char *info, YesNo prompt, int elevel)
for (;;)
{
PGconn *conn;
CHECK_FOR_INTERRUPTS();
conn = PQconnectdb(info);
if(!passwd)
conn = PQconnectdb(info);
else
conn = PQconnectdb(add_pass.data);
if (PQstatus(conn) == CONNECTION_OK)
{
pgutConn *c;
free(passwd);
c = pgut_new(pgutConn);
c->conn = conn;
c->cancel = NULL;
@ -432,6 +438,10 @@ pgut_connect(const char *info, YesNo prompt, int elevel)
pgut_connections = c;
pgut_conn_unlock();
if(passwd)
termStringInfo(&add_pass);
free(passwd);
return conn;
}
@ -440,6 +450,9 @@ pgut_connect(const char *info, YesNo prompt, int elevel)
PQfinish(conn);
free(passwd);
passwd = prompt_for_password();
initStringInfo(&add_pass);
appendStringInfo(&add_pass, info);
appendStringInfo(&add_pass, " password=%s ", passwd);
continue;
}
ereport(elevel,