BUG #13741: vacuumdb does not accept valid password

*** a/src/bin/scripts/clusterdb.c
--- b/src/bin/scripts/clusterdb.c
***************
*** 203,209 **** cluster_one_database(const char *dbname, bool verbose, const char *table,
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 203,209 ----
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/common.c
--- b/src/bin/scripts/common.c
***************
*** 54,70 **** handle_help_version_opts(int argc, char *argv[],
  /*
   * Make a database connection with the given parameters.  An
   * interactive password prompt is automatically issued if required.
   */
  PGconn *
  connectDatabase(const char *dbname, const char *pghost, const char *pgport,
! 				const char *pguser, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	char	   *password = NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
--- 54,71 ----
  /*
   * Make a database connection with the given parameters.  An
   * interactive password prompt is automatically issued if required.
+  * Caller has to free the password if the output returns a password.
   */
  PGconn *
  connectDatabase(const char *dbname, const char *pghost, const char *pgport,
! 				const char *pguser, char **saved_password, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	char	   *password = saved_password ? *saved_password : NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES && password == NULL)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
***************
*** 116,122 **** connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  		}
  	} while (new_pass);
  
! 	if (password)
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
--- 117,129 ----
  		}
  	} while (new_pass);
  
! 	/*
! 	 * save the password for future reference,
! 	 * in case if caller requests it.
! 	 */
! 	if (saved_password)
! 		*saved_password = password;
! 	else if (password)
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
***************
*** 149,162 **** connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
  		return connectDatabase(maintenance_db, pghost, pgport, pguser,
! 							   prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   prompt_password, progname, false);
  
  	return conn;
  }
--- 156,169 ----
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
  		return connectDatabase(maintenance_db, pghost, pgport, pguser,
! 							   NULL, prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL, prompt_password,
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   NULL, prompt_password, progname, false);
  
  	return conn;
  }
*** a/src/bin/scripts/common.h
--- b/src/bin/scripts/common.h
***************
*** 30,36 **** extern void handle_help_version_opts(int argc, char *argv[],
  						 help_handler hlp);
  
  extern PGconn *connectDatabase(const char *dbname, const char *pghost,
! 				const char *pgport, const char *pguser,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
--- 30,36 ----
  						 help_handler hlp);
  
  extern PGconn *connectDatabase(const char *dbname, const char *pghost,
! 				const char *pgport, const char *pguser, char *saved_password,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
*** a/src/bin/scripts/createlang.c
--- b/src/bin/scripts/createlang.c
***************
*** 140,146 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 140,146 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 180,186 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 180,186 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/createuser.c
--- b/src/bin/scripts/createuser.c
***************
*** 250,256 **** main(int argc, char *argv[])
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 250,256 ----
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase("postgres", host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
*** a/src/bin/scripts/droplang.c
--- b/src/bin/scripts/droplang.c
***************
*** 139,145 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 139,145 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 181,187 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 181,187 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/dropuser.c
--- b/src/bin/scripts/dropuser.c
***************
*** 128,134 **** main(int argc, char *argv[])
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	if (echo)
--- 128,134 ----
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase("postgres", host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	if (echo)
*** a/src/bin/scripts/reindexdb.c
--- b/src/bin/scripts/reindexdb.c
***************
*** 297,303 **** reindex_one_database(const char *name, const char *dbname, const char *type,
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
--- 297,303 ----
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
***************
*** 372,378 **** reindex_system_catalogs(const char *dbname, const char *host, const char *port,
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 372,378 ----
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/vacuumdb.c
--- b/src/bin/scripts/vacuumdb.c
***************
*** 341,346 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
--- 341,347 ----
  	int			i;
  	bool		failed = false;
  	bool		parallel = concurrentCons > 1;
+ 	char		*saved_password = NULL;
  	const char *stage_commands[] = {
  		"SET default_statistics_target=1; SET vacuum_cost_delay=0;",
  		"SET default_statistics_target=10; RESET vacuum_cost_delay;",
***************
*** 365,371 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 366,372 ----
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, &saved_password, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
***************
*** 426,432 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  	{
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(dbname, host, port, username, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}
--- 427,433 ----
  	{
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(dbname, host, port, username, &saved_password, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}

*** a/src/bin/scripts/clusterdb.c
--- b/src/bin/scripts/clusterdb.c
***************
*** 203,209 **** cluster_one_database(const char *dbname, bool verbose, const char *table,
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 203,209 ----
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/common.c
--- b/src/bin/scripts/common.c
***************
*** 54,70 **** handle_help_version_opts(int argc, char *argv[],
  /*
   * Make a database connection with the given parameters.  An
   * interactive password prompt is automatically issued if required.
   */
  PGconn *
  connectDatabase(const char *dbname, const char *pghost, const char *pgport,
! 				const char *pguser, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	char	   *password = NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
--- 54,71 ----
  /*
   * Make a database connection with the given parameters.  An
   * interactive password prompt is automatically issued if required.
+  * Caller has to free the password if the output returns a password.
   */
  PGconn *
  connectDatabase(const char *dbname, const char *pghost, const char *pgport,
! 				const char *pguser, char **saved_password, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	char	   *password = saved_password ? *saved_password : NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES && password == NULL)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
***************
*** 116,122 **** connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  		}
  	} while (new_pass);
  
! 	if (password)
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
--- 117,129 ----
  		}
  	} while (new_pass);
  
! 	/*
! 	 * save the password for future reference,
! 	 * in case if caller requests it.
! 	 */
! 	if (saved_password)
! 		*saved_password = password;
! 	else if (password)
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
***************
*** 149,162 **** connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
  		return connectDatabase(maintenance_db, pghost, pgport, pguser,
! 							   prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   prompt_password, progname, false);
  
  	return conn;
  }
--- 156,169 ----
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
  		return connectDatabase(maintenance_db, pghost, pgport, pguser,
! 							   NULL, prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL, prompt_password,
  						   progname, true);
  	if (!conn)
  		conn = connectDatabase("template1", pghost, pgport, pguser,
! 							   NULL, prompt_password, progname, false);
  
  	return conn;
  }
*** a/src/bin/scripts/common.h
--- b/src/bin/scripts/common.h
***************
*** 30,36 **** extern void handle_help_version_opts(int argc, char *argv[],
  						 help_handler hlp);
  
  extern PGconn *connectDatabase(const char *dbname, const char *pghost,
! 				const char *pgport, const char *pguser,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
--- 30,36 ----
  						 help_handler hlp);
  
  extern PGconn *connectDatabase(const char *dbname, const char *pghost,
! 				const char *pgport, const char *pguser, char **saved_password,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
*** a/src/bin/scripts/createlang.c
--- b/src/bin/scripts/createlang.c
***************
*** 140,146 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 140,146 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 180,186 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 180,186 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/createuser.c
--- b/src/bin/scripts/createuser.c
***************
*** 250,256 **** main(int argc, char *argv[])
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 250,256 ----
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase("postgres", host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
*** a/src/bin/scripts/droplang.c
--- b/src/bin/scripts/droplang.c
***************
*** 139,145 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 139,145 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 181,187 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 181,187 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/dropuser.c
--- b/src/bin/scripts/dropuser.c
***************
*** 128,134 **** main(int argc, char *argv[])
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	if (echo)
--- 128,134 ----
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase("postgres", host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	if (echo)
*** a/src/bin/scripts/reindexdb.c
--- b/src/bin/scripts/reindexdb.c
***************
*** 297,303 **** reindex_one_database(const char *name, const char *dbname, const char *type,
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
--- 297,303 ----
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
***************
*** 372,378 **** reindex_system_catalogs(const char *dbname, const char *host, const char *port,
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 372,378 ----
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/vacuumdb.c
--- b/src/bin/scripts/vacuumdb.c
***************
*** 341,346 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
--- 341,347 ----
  	int			i;
  	bool		failed = false;
  	bool		parallel = concurrentCons > 1;
+ 	char		*saved_password = NULL;
  	const char *stage_commands[] = {
  		"SET default_statistics_target=1; SET vacuum_cost_delay=0;",
  		"SET default_statistics_target=10; RESET vacuum_cost_delay;",
***************
*** 365,371 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 366,372 ----
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, &saved_password, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
***************
*** 426,437 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  	{
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(dbname, host, port, username, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}
  	}
  
  	/*
  	 * Prepare all the connections to run the appropriate analyze stage, if
  	 * caller requested that mode.
--- 427,442 ----
  	{
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(dbname, host, port, username, &saved_password, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}
  	}
  
+ 	/* Free up the saved password after it's use */
+ 	if (saved_password)
+ 		free(saved_password);
+ 
  	/*
  	 * Prepare all the connections to run the appropriate analyze stage, if
  	 * caller requested that mode.

*** a/src/bin/scripts/clusterdb.c
--- b/src/bin/scripts/clusterdb.c
***************
*** 203,209 **** cluster_one_database(const char *dbname, bool verbose, const char *table,
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 203,209 ----
  		appendPQExpBuffer(&sql, " %s", table);
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/common.c
--- b/src/bin/scripts/common.c
***************
*** 56,70 **** handle_help_version_opts(int argc, char *argv[],
   * interactive password prompt is automatically issued if required.
   */
  PGconn *
! connectDatabase(const char *dbname, const char *pghost, const char *pgport,
! 				const char *pguser, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
  	char	   *password = NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
--- 56,78 ----
   * interactive password prompt is automatically issued if required.
   */
  PGconn *
! connectDatabase(PGconn *parent_conn, const char *dbname, const char *pghost,
! 				const char *pgport,	const char *pguser, enum trivalue prompt_password,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
  	char	   *password = NULL;
  	bool		new_pass;
  
! 	/*
! 	 * Check if any parent connection exists and used a password to
! 	 * connect to the server. If exists, use the same password for the
! 	 * child connection also.
! 	 */
! 	if (PQconnectionUsedPassword(parent_conn))
! 		password = PQpass(parent_conn);
! 
! 	if (prompt_password == TRI_YES && password == NULL)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
***************
*** 116,122 **** connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  		}
  	} while (new_pass);
  
! 	if (password)
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
--- 124,131 ----
  		}
  	} while (new_pass);
  
! 	/* Free the password, if it is allocated locally */
! 	if (password && !PQconnectionUsedPassword(parent_conn))
  		free(password);
  
  	/* check to see that the backend connection was successfully made */
***************
*** 148,161 **** connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
  
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
! 		return connectDatabase(maintenance_db, pghost, pgport, pguser,
  							   prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
  						   progname, true);
  	if (!conn)
! 		conn = connectDatabase("template1", pghost, pgport, pguser,
  							   prompt_password, progname, false);
  
  	return conn;
--- 157,170 ----
  
  	/* If a maintenance database name was specified, just connect to it. */
  	if (maintenance_db)
! 		return connectDatabase(NULL, maintenance_db, pghost, pgport, pguser,
  							   prompt_password, progname, false);
  
  	/* Otherwise, try postgres first and then template1. */
! 	conn = connectDatabase(NULL, "postgres", pghost, pgport, pguser, prompt_password,
  						   progname, true);
  	if (!conn)
! 		conn = connectDatabase(NULL, "template1", pghost, pgport, pguser,
  							   prompt_password, progname, false);
  
  	return conn;
*** a/src/bin/scripts/common.h
--- b/src/bin/scripts/common.h
***************
*** 29,36 **** extern void handle_help_version_opts(int argc, char *argv[],
  						 const char *fixed_progname,
  						 help_handler hlp);
  
! extern PGconn *connectDatabase(const char *dbname, const char *pghost,
! 				const char *pgport, const char *pguser,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
--- 29,36 ----
  						 const char *fixed_progname,
  						 help_handler hlp);
  
! extern PGconn *connectDatabase(PGconn *parent_conn, const char *dbname,
! 				const char *pghost, const char *pgport, const char *pguser,
  				enum trivalue prompt_password, const char *progname,
  				bool fail_ok);
  
*** a/src/bin/scripts/createlang.c
--- b/src/bin/scripts/createlang.c
***************
*** 140,146 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 140,146 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 180,186 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 180,186 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/createuser.c
--- b/src/bin/scripts/createuser.c
***************
*** 250,256 **** main(int argc, char *argv[])
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 250,256 ----
  	if (login == 0)
  		login = TRI_YES;
  
! 	conn = connectDatabase(NULL, "postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
*** a/src/bin/scripts/droplang.c
--- b/src/bin/scripts/droplang.c
***************
*** 139,145 **** main(int argc, char *argv[])
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
--- 139,145 ----
  		printQueryOpt popt;
  		static const bool translate_columns[] = {false, true};
  
! 		conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  							   progname, false);
  
  		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
***************
*** 181,187 **** main(int argc, char *argv[])
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
--- 181,187 ----
  		if (*p >= 'A' && *p <= 'Z')
  			*p += ('a' - 'A');
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	/*
*** a/src/bin/scripts/dropuser.c
--- b/src/bin/scripts/dropuser.c
***************
*** 128,134 **** main(int argc, char *argv[])
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase("postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	if (echo)
--- 128,134 ----
  	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
  					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
  
! 	conn = connectDatabase(NULL, "postgres", host, port, username, prompt_password,
  						   progname, false);
  
  	if (echo)
*** a/src/bin/scripts/reindexdb.c
--- b/src/bin/scripts/reindexdb.c
***************
*** 297,303 **** reindex_one_database(const char *name, const char *dbname, const char *type,
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
--- 297,303 ----
  		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
  	appendPQExpBufferChar(&sql, ';');
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
***************
*** 372,378 **** reindex_system_catalogs(const char *dbname, const char *host, const char *port,
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
--- 372,378 ----
  
  	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  	if (!executeMaintenanceCommand(conn, sql.data, echo))
  	{
*** a/src/bin/scripts/vacuumdb.c
--- b/src/bin/scripts/vacuumdb.c
***************
*** 365,371 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
--- 365,371 ----
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(NULL, dbname, host, port, username, prompt_password,
  						   progname, false);
  
  	initPQExpBuffer(&sql);
***************
*** 424,432 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  	init_slot(slots, conn);
  	if (parallel)
  	{
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(dbname, host, port, username, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}
--- 424,434 ----
  	init_slot(slots, conn);
  	if (parallel)
  	{
+ 		PGconn	   *parent_conn = conn;
+ 
  		for (i = 1; i < concurrentCons; i++)
  		{
! 			conn = connectDatabase(parent_conn, dbname, host, port, username, prompt_password,
  								   progname, false);
  			init_slot(slots + i, conn);
  		}

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 8c0e7cf..2f15c82 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -203,7 +203,7 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 		appendPQExpBuffer(&sql, " %s", table);
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
+	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
 						   progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 0deadec..cfac32d 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -53,18 +53,21 @@ handle_help_version_opts(int argc, char *argv[],
 
 /*
  * Make a database connection with the given parameters.  An
- * interactive password prompt is automatically issued if required.
+ * interactive password prompt is automatically issued if required
+ * depending on if a user password is defined directly by the caller
+ * of this routine via password_user.
  */
 PGconn *
 connectDatabase(const char *dbname, const char *pghost, const char *pgport,
-				const char *pguser, enum trivalue prompt_password,
-				const char *progname, bool fail_ok)
+				const char *pguser, const char *password_user,
+				enum trivalue prompt_password, const char *progname,
+				bool fail_ok)
 {
 	PGconn	   *conn;
-	char	   *password = NULL;
+	char	   *password = password_user ? strdup(password_user) : NULL;
 	bool		new_pass;
 
-	if (prompt_password == TRI_YES)
+	if (prompt_password == TRI_YES && password == NULL)
 		password = simple_prompt("Password: ", 100, false);
 
 	/*
@@ -148,14 +151,14 @@ connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
 
 	/* If a maintenance database name was specified, just connect to it. */
 	if (maintenance_db)
-		return connectDatabase(maintenance_db, pghost, pgport, pguser,
+		return connectDatabase(maintenance_db, pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	/* Otherwise, try postgres first and then template1. */
-	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-						   progname, true);
+	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL,
+						   prompt_password, progname, true);
 	if (!conn)
-		conn = connectDatabase("template1", pghost, pgport, pguser,
+		conn = connectDatabase("template1", pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	return conn;
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index b5ce1ed..13d9d8c 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -31,8 +31,8 @@ extern void handle_help_version_opts(int argc, char *argv[],
 
 extern PGconn *connectDatabase(const char *dbname, const char *pghost,
 				const char *pgport, const char *pguser,
-				enum trivalue prompt_password, const char *progname,
-				bool fail_ok);
+				const char *password_user, enum trivalue prompt_password,
+				const char *progname, bool fail_ok);
 
 extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
 				  const char *pghost, const char *pgport, const char *pguser,
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 228215c..38cc20d 100644
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -140,8 +140,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -180,8 +180,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Make sure the language isn't already installed
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index c8bcf0d..9e7f84d 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -250,8 +250,8 @@ main(int argc, char *argv[])
 	if (login == 0)
 		login = TRI_YES;
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 7467328..502ec64 100644
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -139,8 +139,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -181,8 +181,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Force schema search path to be just pg_catalog, so that we don't have
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 9160566..10d0691 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
 	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
 					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index decb753..fbf436c 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -297,8 +297,8 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
@@ -372,8 +372,8 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 
 	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 4ce27b7..897d8aa 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -365,8 +365,8 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		fflush(stdout);
 	}
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	initPQExpBuffer(&sql);
 
@@ -424,10 +424,15 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	init_slot(slots, conn);
 	if (parallel)
 	{
+		const char *password = NULL;
+
+		if (PQconnectionUsedPassword(conn))
+			password = PQpass(conn);
+
 		for (i = 1; i < concurrentCons; i++)
 		{
-			conn = connectDatabase(dbname, host, port, username, prompt_password,
-								   progname, false);
+			conn = connectDatabase(dbname, host, port, username, password,
+								   prompt_password, progname, false);
 			init_slot(slots + i, conn);
 		}
 	}

*** a/src/bin/scripts/vacuumdb.c
--- b/src/bin/scripts/vacuumdb.c
***************
*** 41,48 **** static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  					int stage,
  					SimpleStringList *tables,
  					const char *host, const char *port,
! 					const char *username, enum trivalue prompt_password,
! 					int concurrentCons,
  					const char *progname, bool echo, bool quiet);
  
  static void vacuum_all_databases(vacuumingOptions *vacopts,
--- 41,48 ----
  					int stage,
  					SimpleStringList *tables,
  					const char *host, const char *port,
! 					const char *username, char **password_user,
! 					enum trivalue prompt_password, int concurrentCons,
  					const char *progname, bool echo, bool quiet);
  
  static void vacuum_all_databases(vacuumingOptions *vacopts,
***************
*** 275,280 **** main(int argc, char *argv[])
--- 275,282 ----
  	}
  	else
  	{
+ 		char *password = NULL;
+ 
  		if (dbname == NULL)
  		{
  			if (getenv("PGDATABASE"))
***************
*** 294,300 **** main(int argc, char *argv[])
  				vacuum_one_database(dbname, &vacopts,
  									stage,
  									&tables,
! 									host, port, username, prompt_password,
  									concurrentCons,
  									progname, echo, quiet);
  			}
--- 296,303 ----
  				vacuum_one_database(dbname, &vacopts,
  									stage,
  									&tables,
! 									host, port, username,
! 									&password, prompt_password,
  									concurrentCons,
  									progname, echo, quiet);
  			}
***************
*** 303,311 **** main(int argc, char *argv[])
  			vacuum_one_database(dbname, &vacopts,
  								ANALYZE_NO_STAGE,
  								&tables,
! 								host, port, username, prompt_password,
  								concurrentCons,
  								progname, echo, quiet);
  	}
  
  	exit(0);
--- 306,319 ----
  			vacuum_one_database(dbname, &vacopts,
  								ANALYZE_NO_STAGE,
  								&tables,
! 								host, port, username,
! 								&password, prompt_password,
  								concurrentCons,
  								progname, echo, quiet);
+ 
+ 		/* Free the password memory in case if it supplied */
+ 		if (password)
+ 			pfree(password);
  	}
  
  	exit(0);
***************
*** 329,336 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  					int stage,
  					SimpleStringList *tables,
  					const char *host, const char *port,
! 					const char *username, enum trivalue prompt_password,
! 					int concurrentCons,
  					const char *progname, bool echo, bool quiet)
  {
  	PQExpBufferData sql;
--- 337,344 ----
  					int stage,
  					SimpleStringList *tables,
  					const char *host, const char *port,
! 					const char *username, char **password_user,
! 					enum trivalue prompt_password, int concurrentCons,
  					const char *progname, bool echo, bool quiet)
  {
  	PQExpBufferData sql;
***************
*** 354,359 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
--- 362,368 ----
  
  	Assert(stage == ANALYZE_NO_STAGE ||
  		   (stage >= 0 && stage < ANALYZE_NUM_STAGES));
+ 	Assert(password_user != NULL);
  
  	if (!quiet)
  	{
***************
*** 365,373 **** vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, NULL,
  						   prompt_password, progname, false);
  
  	initPQExpBuffer(&sql);
  
  	/*
--- 374,392 ----
  		fflush(stdout);
  	}
  
! 	conn = connectDatabase(dbname, host, port, username, *password_user,
  						   prompt_password, progname, false);
  
+ 	/*
+ 	 * The following code is required to handle the case of vacuumdb --all.
+ 	 * By the configuration, if user doesn't supply a password during the
+ 	 * connection to the maintainance database and it may be required for
+ 	 * the user database. So we will use this password for the rest of the
+ 	 * connections to the server.
+ 	 */
+ 	if (PQconnectionUsedPassword(conn) && (*password_user == NULL))
+ 		*password_user = pstrdup(PQpass(conn));
+ 
  	initPQExpBuffer(&sql);
  
  	/*
***************
*** 547,555 **** vacuum_all_databases(vacuumingOptions *vacopts,
--- 566,578 ----
  	PGresult   *result;
  	int			stage;
  	int			i;
+ 	char	   *password = NULL;
  
  	conn = connectMaintenanceDatabase(maintenance_db, host, port,
  									  username, prompt_password, progname);
+ 	if (PQconnectionUsedPassword(conn))
+ 		password = pstrdup(PQpass(conn));
+ 
  	result = executeQuery(conn,
  			"SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
  						  progname, echo);
***************
*** 575,581 **** vacuum_all_databases(vacuumingOptions *vacopts,
  				vacuum_one_database(dbname, vacopts,
  									stage,
  									NULL,
! 									host, port, username, prompt_password,
  									concurrentCons,
  									progname, echo, quiet);
  			}
--- 598,605 ----
  				vacuum_one_database(dbname, vacopts,
  									stage,
  									NULL,
! 									host, port, username,
! 									&password, prompt_password,
  									concurrentCons,
  									progname, echo, quiet);
  			}
***************
*** 591,602 **** vacuum_all_databases(vacuumingOptions *vacopts,
  			vacuum_one_database(dbname, vacopts,
  								ANALYZE_NO_STAGE,
  								NULL,
! 								host, port, username, prompt_password,
  								concurrentCons,
  								progname, echo, quiet);
  		}
  	}
  
  	PQclear(result);
  }
  
--- 615,629 ----
  			vacuum_one_database(dbname, vacopts,
  								ANALYZE_NO_STAGE,
  								NULL,
! 								host, port, username,
! 								&password, prompt_password,
  								concurrentCons,
  								progname, echo, quiet);
  		}
  	}
  
+ 	if (password)
+ 		pfree(password);
  	PQclear(result);
  }
  

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 8c0e7cf..2f15c82 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -203,7 +203,7 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 		appendPQExpBuffer(&sql, " %s", table);
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
+	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
 						   progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 0deadec..321fc10 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -53,18 +53,21 @@ handle_help_version_opts(int argc, char *argv[],
 
 /*
  * Make a database connection with the given parameters.  An
- * interactive password prompt is automatically issued if required.
+ * interactive password prompt is automatically issued if required
+ * depending on if a user password is defined directly by the caller
+ * of this routine via password_user.
  */
 PGconn *
 connectDatabase(const char *dbname, const char *pghost, const char *pgport,
-				const char *pguser, enum trivalue prompt_password,
-				const char *progname, bool fail_ok)
+				const char *pguser, const char *password_user,
+				enum trivalue prompt_password, const char *progname,
+				bool fail_ok)
 {
 	PGconn	   *conn;
-	char	   *password = NULL;
+	char	   *password = password_user ? pg_strdup(password_user) : NULL;
 	bool		new_pass;
 
-	if (prompt_password == TRI_YES)
+	if (prompt_password == TRI_YES && password == NULL)
 		password = simple_prompt("Password: ", 100, false);
 
 	/*
@@ -148,14 +151,14 @@ connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
 
 	/* If a maintenance database name was specified, just connect to it. */
 	if (maintenance_db)
-		return connectDatabase(maintenance_db, pghost, pgport, pguser,
+		return connectDatabase(maintenance_db, pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	/* Otherwise, try postgres first and then template1. */
-	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-						   progname, true);
+	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL,
+						   prompt_password, progname, true);
 	if (!conn)
-		conn = connectDatabase("template1", pghost, pgport, pguser,
+		conn = connectDatabase("template1", pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	return conn;
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index b5ce1ed..13d9d8c 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -31,8 +31,8 @@ extern void handle_help_version_opts(int argc, char *argv[],
 
 extern PGconn *connectDatabase(const char *dbname, const char *pghost,
 				const char *pgport, const char *pguser,
-				enum trivalue prompt_password, const char *progname,
-				bool fail_ok);
+				const char *password_user, enum trivalue prompt_password,
+				const char *progname, bool fail_ok);
 
 extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
 				  const char *pghost, const char *pgport, const char *pguser,
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 228215c..38cc20d 100644
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -140,8 +140,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -180,8 +180,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Make sure the language isn't already installed
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index c8bcf0d..9e7f84d 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -250,8 +250,8 @@ main(int argc, char *argv[])
 	if (login == 0)
 		login = TRI_YES;
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 7467328..502ec64 100644
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -139,8 +139,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -181,8 +181,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Force schema search path to be just pg_catalog, so that we don't have
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 9160566..10d0691 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
 	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
 					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index decb753..fbf436c 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -297,8 +297,8 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
@@ -372,8 +372,8 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 
 	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 4ce27b7..8c8d105 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -41,7 +41,8 @@ static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					int stage,
 					SimpleStringList *tables,
 					const char *host, const char *port,
-					const char *username, enum trivalue prompt_password,
+					const char *username, const char *password,
+					enum trivalue prompt_password,
 					int concurrentCons,
 					const char *progname, bool echo, bool quiet);
 
@@ -294,7 +295,8 @@ main(int argc, char *argv[])
 				vacuum_one_database(dbname, &vacopts,
 									stage,
 									&tables,
-									host, port, username, prompt_password,
+									host, port, username, NULL,
+									prompt_password,
 									concurrentCons,
 									progname, echo, quiet);
 			}
@@ -303,7 +305,8 @@ main(int argc, char *argv[])
 			vacuum_one_database(dbname, &vacopts,
 								ANALYZE_NO_STAGE,
 								&tables,
-								host, port, username, prompt_password,
+								host, port, username, NULL,
+								prompt_password,
 								concurrentCons,
 								progname, echo, quiet);
 	}
@@ -323,13 +326,18 @@ main(int argc, char *argv[])
  * If concurrentCons is > 1, multiple connections are used to vacuum tables
  * in parallel.  In this case and if the table list is empty, we first obtain
  * a list of tables from the database.
+ *
+ * If 'password' is provided by caller, enforce the password used for
+ * subsequent connections to this value without asking a new value from
+ * prompt.
  */
 static void
 vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					int stage,
 					SimpleStringList *tables,
 					const char *host, const char *port,
-					const char *username, enum trivalue prompt_password,
+					const char *username, const char *password,
+					enum trivalue prompt_password,
 					int concurrentCons,
 					const char *progname, bool echo, bool quiet)
 {
@@ -365,8 +373,8 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		fflush(stdout);
 	}
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, password,
+						   prompt_password, progname, false);
 
 	initPQExpBuffer(&sql);
 
@@ -424,10 +432,15 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	init_slot(slots, conn);
 	if (parallel)
 	{
+		const char *password_user = NULL;
+
+		if (PQconnectionUsedPassword(conn))
+			password_user = PQpass(conn);
+
 		for (i = 1; i < concurrentCons; i++)
 		{
-			conn = connectDatabase(dbname, host, port, username, prompt_password,
-								   progname, false);
+			conn = connectDatabase(dbname, host, port, username, password_user,
+								   prompt_password, progname, false);
 			init_slot(slots + i, conn);
 		}
 	}
@@ -542,12 +555,19 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 	PGresult   *result;
 	int			stage;
 	int			i;
+	char	   *password = NULL;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port,
 									  username, prompt_password, progname);
+
 	result = executeQuery(conn,
 			"SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
 						  progname, echo);
+
+	/* Save password already given by user for subsequent operations */
+	if (PQconnectionUsedPassword(conn))
+		password = pg_strdup(PQpass(conn));
+
 	PQfinish(conn);
 
 	if (analyze_in_stages)
@@ -570,7 +590,8 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 				vacuum_one_database(dbname, vacopts,
 									stage,
 									NULL,
-									host, port, username, prompt_password,
+									host, port, username, password,
+									prompt_password,
 									concurrentCons,
 									progname, echo, quiet);
 			}
@@ -586,13 +607,16 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 			vacuum_one_database(dbname, vacopts,
 								ANALYZE_NO_STAGE,
 								NULL,
-								host, port, username, prompt_password,
+								host, port, username, password,
+								prompt_password,
 								concurrentCons,
 								progname, echo, quiet);
 		}
 	}
 
 	PQclear(result);
+	if (password)
+		free(password);
 }
 
 /*

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 8c0e7cf..2f15c82 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -203,7 +203,7 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 		appendPQExpBuffer(&sql, " %s", table);
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
+	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
 						   progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 0deadec..cfac32d 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -53,18 +53,21 @@ handle_help_version_opts(int argc, char *argv[],
 
 /*
  * Make a database connection with the given parameters.  An
- * interactive password prompt is automatically issued if required.
+ * interactive password prompt is automatically issued if required
+ * depending on if a user password is defined directly by the caller
+ * of this routine via password_user.
  */
 PGconn *
 connectDatabase(const char *dbname, const char *pghost, const char *pgport,
-				const char *pguser, enum trivalue prompt_password,
-				const char *progname, bool fail_ok)
+				const char *pguser, const char *password_user,
+				enum trivalue prompt_password, const char *progname,
+				bool fail_ok)
 {
 	PGconn	   *conn;
-	char	   *password = NULL;
+	char	   *password = password_user ? strdup(password_user) : NULL;
 	bool		new_pass;
 
-	if (prompt_password == TRI_YES)
+	if (prompt_password == TRI_YES && password == NULL)
 		password = simple_prompt("Password: ", 100, false);
 
 	/*
@@ -148,14 +151,14 @@ connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
 
 	/* If a maintenance database name was specified, just connect to it. */
 	if (maintenance_db)
-		return connectDatabase(maintenance_db, pghost, pgport, pguser,
+		return connectDatabase(maintenance_db, pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	/* Otherwise, try postgres first and then template1. */
-	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-						   progname, true);
+	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL,
+						   prompt_password, progname, true);
 	if (!conn)
-		conn = connectDatabase("template1", pghost, pgport, pguser,
+		conn = connectDatabase("template1", pghost, pgport, pguser, NULL,
 							   prompt_password, progname, false);
 
 	return conn;
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index b5ce1ed..13d9d8c 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -31,8 +31,8 @@ extern void handle_help_version_opts(int argc, char *argv[],
 
 extern PGconn *connectDatabase(const char *dbname, const char *pghost,
 				const char *pgport, const char *pguser,
-				enum trivalue prompt_password, const char *progname,
-				bool fail_ok);
+				const char *password_user, enum trivalue prompt_password,
+				const char *progname, bool fail_ok);
 
 extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
 				  const char *pghost, const char *pgport, const char *pguser,
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 228215c..38cc20d 100644
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -140,8 +140,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -180,8 +180,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Make sure the language isn't already installed
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index c8bcf0d..9e7f84d 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -250,8 +250,8 @@ main(int argc, char *argv[])
 	if (login == 0)
 		login = TRI_YES;
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 7467328..502ec64 100644
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -139,8 +139,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, prompt_password,
-							   progname, false);
+		conn = connectDatabase(dbname, host, port, username, NULL,
+							   prompt_password, progname, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -181,8 +181,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	/*
 	 * Force schema search path to be just pg_catalog, so that we don't have
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 9160566..10d0691 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
 	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
 					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase("postgres", host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index decb753..fbf436c 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -297,8 +297,8 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
@@ -372,8 +372,8 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 
 	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, NULL,
+						   prompt_password, progname, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 4ce27b7..67cb975 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -41,7 +41,8 @@ static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					int stage,
 					SimpleStringList *tables,
 					const char *host, const char *port,
-					const char *username, enum trivalue prompt_password,
+					const char *username, char **password,
+					enum trivalue prompt_password,
 					int concurrentCons,
 					const char *progname, bool echo, bool quiet);
 
@@ -275,6 +276,8 @@ main(int argc, char *argv[])
 	}
 	else
 	{
+		char *password = NULL;
+
 		if (dbname == NULL)
 		{
 			if (getenv("PGDATABASE"))
@@ -294,7 +297,8 @@ main(int argc, char *argv[])
 				vacuum_one_database(dbname, &vacopts,
 									stage,
 									&tables,
-									host, port, username, prompt_password,
+									host, port, username, &password,
+									prompt_password,
 									concurrentCons,
 									progname, echo, quiet);
 			}
@@ -303,9 +307,14 @@ main(int argc, char *argv[])
 			vacuum_one_database(dbname, &vacopts,
 								ANALYZE_NO_STAGE,
 								&tables,
-								host, port, username, prompt_password,
+								host, port, username, &password,
+								prompt_password,
 								concurrentCons,
 								progname, echo, quiet);
+
+		/* free the password if supplied by user */
+		if (password)
+			pfree(password);
 	}
 
 	exit(0);
@@ -323,13 +332,18 @@ main(int argc, char *argv[])
  * If concurrentCons is > 1, multiple connections are used to vacuum tables
  * in parallel.  In this case and if the table list is empty, we first obtain
  * a list of tables from the database.
+ *
+ * If 'password' is provided by caller, enforce the password used for
+ * subsequent connections to this value without asking a new value from
+ * prompt.
  */
 static void
 vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					int stage,
 					SimpleStringList *tables,
 					const char *host, const char *port,
-					const char *username, enum trivalue prompt_password,
+					const char *username, char **password,
+					enum trivalue prompt_password,
 					int concurrentCons,
 					const char *progname, bool echo, bool quiet)
 {
@@ -365,8 +379,19 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		fflush(stdout);
 	}
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, *password,
+						   prompt_password, progname, false);
+
+	/*
+	 * If no password has been specified by the caller of this routine, save
+	 * any password used by the connection previously established. This is
+	 * useful from the user prospective to not have to specify multiple times
+	 * the same password, particularly in the case of vacuum_all_databases
+	 * where the maintenance database used for the first connection may not
+	 * have needed a password for connection.
+	 */
+	if (PQconnectionUsedPassword(conn) && *password == NULL)
+		*password = pstrdup(PQpass(conn));
 
 	initPQExpBuffer(&sql);
 
@@ -424,10 +449,15 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	init_slot(slots, conn);
 	if (parallel)
 	{
+		const char *password_user = NULL;
+
+		if (PQconnectionUsedPassword(conn))
+			password_user = PQpass(conn);
+
 		for (i = 1; i < concurrentCons; i++)
 		{
-			conn = connectDatabase(dbname, host, port, username, prompt_password,
-								   progname, false);
+			conn = connectDatabase(dbname, host, port, username, password_user,
+								   prompt_password, progname, false);
 			init_slot(slots + i, conn);
 		}
 	}
@@ -542,12 +572,19 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 	PGresult   *result;
 	int			stage;
 	int			i;
+	char	   *password = NULL;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port,
 									  username, prompt_password, progname);
+
 	result = executeQuery(conn,
 			"SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
 						  progname, echo);
+
+	/* Save password already given by user for subsequent operations */
+	if (PQconnectionUsedPassword(conn))
+		password = pg_strdup(PQpass(conn));
+
 	PQfinish(conn);
 
 	if (analyze_in_stages)
@@ -570,7 +607,8 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 				vacuum_one_database(dbname, vacopts,
 									stage,
 									NULL,
-									host, port, username, prompt_password,
+									host, port, username, &password,
+									prompt_password,
 									concurrentCons,
 									progname, echo, quiet);
 			}
@@ -586,13 +624,16 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 			vacuum_one_database(dbname, vacopts,
 								ANALYZE_NO_STAGE,
 								NULL,
-								host, port, username, prompt_password,
+								host, port, username, &password,
+								prompt_password,
 								concurrentCons,
 								progname, echo, quiet);
 		}
 	}
 
 	PQclear(result);
+	if (password)
+		free(password);
 }
 
 /*

*** a/src/bin/scripts/common.c
--- b/src/bin/scripts/common.c
***************
*** 61,70 **** connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	char	   *password = NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
--- 61,70 ----
  				const char *progname, bool fail_ok)
  {
  	PGconn	   *conn;
! 	static char	   *password = NULL;
  	bool		new_pass;
  
! 	if (prompt_password == TRI_YES && password == NULL)
  		password = simple_prompt("Password: ", 100, false);
  
  	/*
***************
*** 116,124 **** connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  		}
  	} while (new_pass);
  
- 	if (password)
- 		free(password);
- 
  	/* check to see that the backend connection was successfully made */
  	if (PQstatus(conn) == CONNECTION_BAD)
  	{
--- 116,121 ----

diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index 2f15c82..f87a9ce 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -203,8 +203,8 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 		appendPQExpBuffer(&sql, " %s", table);
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, NULL, prompt_password,
-						   progname, false);
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		if (table)
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index d26a4ed..83ddb00d 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -54,22 +54,27 @@ handle_help_version_opts(int argc, char *argv[],
 /*
  * Make a database connection with the given parameters.
  *
- * A password can be given, but if not (or if user forces us to) we prompt
- * interactively for one, unless caller prohibited us from doing so.
+ * Interactive password prompt is automatically issued if required, and
+ * existing password can be reused as well by user in case of repetitive
+ * calls to this routine.
  */
 PGconn *
 connectDatabase(const char *dbname, const char *pghost, const char *pgport,
-				const char *pguser, const char *pgpassword,
-				enum trivalue prompt_password, const char *progname,
-				bool fail_ok)
+				const char *pguser, enum trivalue prompt_password,
+				const char *progname, bool fail_ok, bool allow_password_reuse)
 {
-	PGconn	   *conn;
-	char	   *password;
-	bool		new_pass;
+	PGconn		   *conn;
+	static char	   *password = NULL;
+	bool			new_pass;
 
-	password = pgpassword ? strdup(pgpassword) : NULL;
+	if (!allow_password_reuse)
+	{
+		if (password)
+			free(password);
+		password = NULL;
+	}
 
-	if (prompt_password == TRI_YES && !pgpassword)
+	if (password == NULL && prompt_password == TRI_YES)
 		password = simple_prompt("Password: ", 100, false);
 
 	/*
@@ -100,34 +105,27 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
 		new_pass = false;
 		conn = PQconnectdbParams(keywords, values, true);
 
+		free(keywords);
+		free(values);
+
 		if (!conn)
 		{
-			fprintf(stderr, _("%s: could not connect to database %s: out of memory\n"),
+			fprintf(stderr, _("%s: could not connect to database %s\n"),
 					progname, dbname);
 			exit(1);
 		}
 
-		pg_free(keywords);
-		pg_free(values);
-
-		/*
-		 * No luck?  Trying asking (again) for a password.
-		 */
 		if (PQstatus(conn) == CONNECTION_BAD &&
 			PQconnectionNeedsPassword(conn) &&
+			password == NULL &&
 			prompt_password != TRI_NO)
 		{
 			PQfinish(conn);
-			if (password)
-				free(password);
 			password = simple_prompt("Password: ", 100, false);
 			new_pass = true;
 		}
 	} while (new_pass);
 
-	if (password)
-		free(password);
-
 	/* check to see that the backend connection was successfully made */
 	if (PQstatus(conn) == CONNECTION_BAD)
 	{
@@ -157,15 +155,15 @@ connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
 
 	/* If a maintenance database name was specified, just connect to it. */
 	if (maintenance_db)
-		return connectDatabase(maintenance_db, pghost, pgport, pguser, NULL,
-							   prompt_password, progname, false);
+		return connectDatabase(maintenance_db, pghost, pgport, pguser,
+							   prompt_password, progname, false, false);
 
 	/* Otherwise, try postgres first and then template1. */
-	conn = connectDatabase("postgres", pghost, pgport, pguser, NULL,
-						   prompt_password, progname, true);
+	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
+						   progname, true, false);
 	if (!conn)
-		conn = connectDatabase("template1", pghost, pgport, pguser, NULL,
-							   prompt_password, progname, false);
+		conn = connectDatabase("template1", pghost, pgport, pguser,
+							   prompt_password, progname, false, false);
 
 	return conn;
 }
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index dafd58f..9038295 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -31,8 +31,8 @@ extern void handle_help_version_opts(int argc, char *argv[],
 
 extern PGconn *connectDatabase(const char *dbname, const char *pghost,
 				const char *pgport, const char *pguser,
-				const char *pgpassword, enum trivalue prompt_password,
-				const char *progname, bool fail_ok);
+				enum trivalue prompt_password, const char *progname,
+				bool fail_ok, bool allow_password_reuse);
 
 extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
 				  const char *pghost, const char *pgport, const char *pguser,
diff --git a/src/bin/scripts/createlang.c b/src/bin/scripts/createlang.c
index 38cc20d..3120e2f 100644
--- a/src/bin/scripts/createlang.c
+++ b/src/bin/scripts/createlang.c
@@ -140,8 +140,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, NULL,
-							   prompt_password, progname, false);
+		conn = connectDatabase(dbname, host, port, username, prompt_password,
+							   progname, false, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -180,8 +180,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 
 	/*
 	 * Make sure the language isn't already installed
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 9e7f84d..dc358e4 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -250,8 +250,8 @@ main(int argc, char *argv[])
 	if (login == 0)
 		login = TRI_YES;
 
-	conn = connectDatabase("postgres", host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase("postgres", host, port, username, prompt_password,
+						   progname, false, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/droplang.c b/src/bin/scripts/droplang.c
index 502ec64..b2d2996 100644
--- a/src/bin/scripts/droplang.c
+++ b/src/bin/scripts/droplang.c
@@ -139,8 +139,8 @@ main(int argc, char *argv[])
 		printQueryOpt popt;
 		static const bool translate_columns[] = {false, true};
 
-		conn = connectDatabase(dbname, host, port, username, NULL,
-							   prompt_password, progname, false);
+		conn = connectDatabase(dbname, host, port, username, prompt_password,
+							   progname, false, false);
 
 		printfPQExpBuffer(&sql, "SELECT lanname as \"%s\", "
 				"(CASE WHEN lanpltrusted THEN '%s' ELSE '%s' END) as \"%s\" "
@@ -181,8 +181,8 @@ main(int argc, char *argv[])
 		if (*p >= 'A' && *p <= 'Z')
 			*p += ('a' - 'A');
 
-	conn = connectDatabase(dbname, host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 
 	/*
 	 * Force schema search path to be just pg_catalog, so that we don't have
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 10d0691..1b0cf78 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -128,8 +128,8 @@ main(int argc, char *argv[])
 	appendPQExpBuffer(&sql, "DROP ROLE %s%s;",
 					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
-	conn = connectDatabase("postgres", host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase("postgres", host, port, username, prompt_password,
+						   progname, false, false);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index fbf436c..b6f3dcb 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -297,8 +297,8 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(name));
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
@@ -372,8 +372,8 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 
 	appendPQExpBuffer(&sql, " SYSTEM %s;", dbname);
 
-	conn = connectDatabase(dbname, host, port, username, NULL,
-						   prompt_password, progname, false);
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		fprintf(stderr, _("%s: reindexing of system catalogs failed: %s"),
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 6c67263..c8b40de 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -43,8 +43,7 @@ static void vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					const char *host, const char *port,
 					const char *username, enum trivalue prompt_password,
 					int concurrentCons,
-					const char *progname, bool echo, bool quiet,
-					char **password);
+					const char *progname, bool echo, bool quiet);
 
 static void vacuum_all_databases(vacuumingOptions *vacopts,
 					 bool analyze_in_stages,
@@ -276,8 +275,6 @@ main(int argc, char *argv[])
 	}
 	else
 	{
-		char *password = NULL;
-
 		if (dbname == NULL)
 		{
 			if (getenv("PGDATABASE"))
@@ -299,8 +296,7 @@ main(int argc, char *argv[])
 									&tables,
 									host, port, username, prompt_password,
 									concurrentCons,
-									progname, echo, quiet,
-									&password);
+									progname, echo, quiet);
 			}
 		}
 		else
@@ -309,10 +305,7 @@ main(int argc, char *argv[])
 								&tables,
 								host, port, username, prompt_password,
 								concurrentCons,
-								progname, echo, quiet,
-								&password);
-
-		pg_free(password);
+								progname, echo, quiet);
 	}
 
 	exit(0);
@@ -330,21 +323,15 @@ main(int argc, char *argv[])
  * If concurrentCons is > 1, multiple connections are used to vacuum tables
  * in parallel.  In this case and if the table list is empty, we first obtain
  * a list of tables from the database.
- *
- * 'password' is both an input and output parameter.  If one is not passed,
- * then whatever is used in a connection is returned so that caller can
- * reuse it in future connections.
  */
 static void
 vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 					int stage,
 					SimpleStringList *tables,
 					const char *host, const char *port,
-					const char *username,
-					enum trivalue prompt_password,
+					const char *username, enum trivalue prompt_password,
 					int concurrentCons,
-					const char *progname, bool echo, bool quiet,
-					char **password)
+					const char *progname, bool echo, bool quiet)
 {
 	PQExpBufferData sql;
 	PGconn	   *conn;
@@ -378,15 +365,8 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		fflush(stdout);
 	}
 
-	conn = connectDatabase(dbname, host, port, username, *password,
-						   prompt_password, progname, false);
-
-	/*
-	 * If no password was not specified by caller and the connection required
-	 * one, remember it; this suppresses further password prompts.
-	 */
-	if (PQconnectionUsedPassword(conn) && *password == NULL)
-		*password = pg_strdup(PQpass(conn));
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, false, true);
 
 	initPQExpBuffer(&sql);
 
@@ -444,20 +424,10 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 	init_slot(slots, conn);
 	if (parallel)
 	{
-		const char *pqpass;
-
-		/*
-		 * If a password was supplied for the initial connection, use it for
-		 * subsequent ones too.  (Note that since we're connecting to the same
-		 * database with the same user, there's no need to update the stored
-		 * password any further.)
-		 */
-		pqpass = PQpass(conn);
-
 		for (i = 1; i < concurrentCons; i++)
 		{
-			conn = connectDatabase(dbname, host, port, username, pqpass,
-								   prompt_password, progname, false);
+			conn = connectDatabase(dbname, host, port, username, prompt_password,
+								   progname, false, true);
 			init_slot(slots + i, conn);
 		}
 	}
@@ -572,23 +542,12 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 	PGresult   *result;
 	int			stage;
 	int			i;
-	char	   *password = NULL;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port,
 									  username, prompt_password, progname);
-
 	result = executeQuery(conn,
 			"SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
 						  progname, echo);
-
-	/*
-	 * Remember the password for further connections.  If no password was
-	 * required for the maintenance db connection, this gets updated for the
-	 * first connection that does.
-	 */
-	if (PQconnectionUsedPassword(conn))
-		password = pg_strdup(PQpass(conn));
-
 	PQfinish(conn);
 
 	if (analyze_in_stages)
@@ -613,8 +572,7 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 									NULL,
 									host, port, username, prompt_password,
 									concurrentCons,
-									progname, echo, quiet,
-									&password);
+									progname, echo, quiet);
 			}
 		}
 	}
@@ -630,13 +588,11 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 								NULL,
 								host, port, username, prompt_password,
 								concurrentCons,
-								progname, echo, quiet,
-								&password);
+								progname, echo, quiet);
 		}
 	}
 
 	PQclear(result);
-	pg_free(password);
 }
 
 /*