Code refactoring ocerl libpq

Author: Fenimorkin

src/interfaces/libpq/fe-auth.c

@@ -950,29 +950,26 @@ pg_fe_sendauth(AuthRequest areq, int payloadlen, PGconn *conn)
 				conn->password_needed = true;
 				/* Get password from .pgpass */
 				password = conn->connhost[conn->whichhost].password;
-				/* Get password from ppassword prompt */
-				if (password == NULL) {
+				/* Get password from password prompt */
+				if (password == NULL)
 					password = conn->pgpass;
-				/* Get password from PGPASSWORD environment */
-				if ((password == NULL) &&
-						(conn->pgpassenv != NULL && conn->pgpassenv[0] != '\0'))
-								password = conn->pgpassenv;
-				}
 
 				if (password == NULL || password[0] == '\0')
 				{
 					printfPQExpBuffer(&conn->errorMessage,
 									  PQnoPasswordSupplied);
 					return STATUS_ERROR;
 				}
+
 				if (pg_password_sendauth(conn, password, areq) != STATUS_OK)
 				{
 					printfPQExpBuffer(&conn->errorMessage,
 									  "fe_sendauth: error sending password authentication\n");
 					return STATUS_ERROR;
 				}
-				/* Clean prompted passwored if we dont want to reuse password */
-				if (!conn->reusepass && conn->pgpass != NULL)
+
+				/* Clean prompted password if reusepass is set and not env password */
+				if (conn->pgpass && !conn->reusepass && !conn->pgpassenv_used)
 				{
 					memset(conn->pgpass, 0, strlen(conn->pgpass));
 					free(conn->pgpass);

src/interfaces/libpq/fe-connect.c

@@ -199,14 +199,10 @@ static const internalPQconninfoOption PQconninfoOptions[] = {
 		"Database-Reuse-Password", "D", 4,
 	offsetof(struct pg_conn, reusepass_str)},
 
-	{"password", NULL, NULL, NULL,
+	{"password", "PGPASSWORD", NULL, NULL,
 		"Database-Password", "*", 20,
 	offsetof(struct pg_conn, pgpass)},
 
-	{"pgpassword", "PGPASSWORD", NULL, NULL,
-		"Database-Password-env", "*", 20,
-	offsetof(struct pg_conn, pgpassenv)},
-
 	{"passfile", "PGPASSFILE", NULL, NULL,
 		"Database-Password-File", "", 64,
 	offsetof(struct pg_conn, pgpassfile)},
@@ -790,6 +786,10 @@ fillPGconn(PGconn *conn, PQconninfoOption *connOptions)
 									  libpq_gettext("out of memory\n"));
 					return false;
 				}
+				/* Catch case environment PGPASSWORD use*/
+				if (option->envvar && getenv(option->envvar)
+						&& strcmp(option->envvar, "PGPASSWORD") == 0)
+					conn->pgpassenv_used = true;
 			}
 		}
 	}
@@ -3703,6 +3703,7 @@ makeEmptyPGconn(void)
 	conn->auth_req_received = false;
 	conn->password_needed = false;
 	conn->pgpassfile_used = false;
+	conn->pgpassenv_used = false;
 #ifdef USE_SSL
 	conn->allow_ssl_try = true;
 	conn->wait_ssl_try = false;
@@ -3815,8 +3816,6 @@ freePGconn(PGconn *conn)
 		free(conn->reusepass_str);
 	if (conn->pgpass)
 		free(conn->pgpass);
-	if (conn->pgpassenv)
-		free(conn->pgpassenv);
 	if (conn->pgpassfile)
 		free(conn->pgpassfile);
 	if (conn->keepalives)

src/interfaces/libpq/libpq-int.h

@@ -348,7 +348,6 @@ struct pg_conn
 								   and save password after connection established.
 								   Default is "yes".*/
 	char	   *pgpass;
-	char	   *pgpassenv;
 	char	   *pgpassfile;		/* path to a file containing password(s) */
 	char	   *keepalives;		/* use TCP keepalives? */
 	char	   *keepalives_idle;	/* time between TCP keepalives */
@@ -420,6 +419,7 @@ struct pg_conn
 									   ie read from PGPASSWORD, pgpassfile,
 									   and not cleared after disconnect */
 	bool		pgpassfile_used;	/* true if password is from pgpassfile */
+	bool		pgpassenv_used;		/* true if password if from env PGPASSWORD */
 	bool		sigpipe_so;		/* have we masked SIGPIPE via SO_NOSIGPIPE? */
 	bool		sigpipe_flag;	/* can we mask SIGPIPE via MSG_NOSIGNAL? */