Commit25762c2

committed

add check for interrupt in prompt for password

1 parentdfdebfc commit25762c2Copy full SHA for 25762c2

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -447,8 +447,7 @@ do_backup(void)`
`447`	`447`	`elog(ERROR,"Options for connection to master must be provided to perform backup from replica");`
`448`	`448`
`449`	`449`	`/* Create connection to master server */`
`450`		`-master_conn=pgut_connect_extended(master_host,master_port,`
`451`		`-master_db,master_user,password);`
	`450`	`+master_conn=pgut_connect_extended(master_host,master_port,master_db,master_user);`
`452`	`451`	`}`
`453`	`452`
`454`	`453`	`/* Get exclusive lock of backup catalog */`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1015,12 +1015,12 @@ prompt_for_password(const char *username)`
`1015`	`1015`	`PGconn*`
`1016`	`1016`	`pgut_connect(constchar*dbname)`
`1017`	`1017`	`{`
`1018`		`-returnpgut_connect_extended(host,port,dbname,username,password);`
	`1018`	`+returnpgut_connect_extended(host,port,dbname,username);`
`1019`	`1019`	`}`
`1020`	`1020`
`1021`	`1021`	`PGconn*`
`1022`	`1022`	`pgut_connect_extended(constcharpghost,constcharpgport,`
`1023`		`-constchardbname,constcharlogin,constchar*pwd)`
	`1023`	`+constchardbname,constcharlogin)`
`1024`	`1024`	`{`
`1025`	`1025`	`PGconn*conn;`
`1026`	`1026`
`@@ -1031,7 +1031,7 @@ pgut_connect_extended(const char pghost, const char pgport,`
`1031`	`1031`	`for (;;)`
`1032`	`1032`	`{`
`1033`	`1033`	`conn=PQsetdbLogin(pghost,pgport,NULL,NULL,`
`1034`		`-dbname,login,pwd);`
	`1034`	`+dbname,login,password);`
`1035`	`1035`
`1036`	`1036`	`if (PQstatus(conn)==CONNECTION_OK)`
`1037`	`1037`	`returnconn;`
`@@ -1040,6 +1040,10 @@ pgut_connect_extended(const char pghost, const char pgport,`
`1040`	`1040`	`{`
`1041`	`1041`	`PQfinish(conn);`
`1042`	`1042`	`prompt_for_password(username);`
	`1043`	`+`
	`1044`	`+if (interrupted)`
	`1045`	`+elog(ERROR,"interrupted");`
	`1046`	`+`
`1043`	`1047`	`continue;`
`1044`	`1048`	`}`
`1045`	`1049`	`elog(ERROR,"could not connect to database %s: %s",`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,8 +117,7 @@ extern void pgut_atexit_pop(pgut_atexit_callback callback, void *userdata);`
`117`	`117`	`*/`
`118`	`118`	`externPGconnpgut_connect(constchardbname);`
`119`	`119`	`externPGconnpgut_connect_extended(constcharpghost,constchar*pgport,`
`120`		`-constchardbname,constcharlogin,`
`121`		`-constchar*pwd);`
	`120`	`+constchardbname,constcharlogin);`
`122`	`121`	`externvoidpgut_disconnect(PGconn*conn);`
`123`	`122`	`externPGresultpgut_execute(PGconnconn,constcharquery,intnParams,constchar*params);`
`124`	`123`	`externboolpgut_send(PGconnconn,constcharquery,intnParams,constchar**params,intelevel);`

Comments

(0)