pgpool2.git / summary / log / commit / refs

commit    8e11be020e82694de70a7709a8e306050a9eacc7
Author:   Muhammad Usama <m.usama@gmail.com>
Date:     Thu Mar 19 13:57:01 2015 +0000

    Fix incorrect expression in code, as per coverity 1288502


 src/libs/pcp/pcp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/pcp/pcp.c b/src/libs/pcp/pcp.c
index cbd75bd2e..38ab4824f 100644
--- a/src/libs/pcp/pcp.c
+++ b/src/libs/pcp/pcp.c
@@ -227,7 +227,7 @@ pcp_connect(char *hostname, int port, char *username, char *password, FILE *Pfde
 	{
 		char port_str[100];
 		snprintf(port_str, sizeof(port_str), "%d",port);
-		password_fron_file = PasswordFromFile(pcpConn,(hostname == UNIX_DOMAIN_PATH)?DefaultHost:hostname, port_str, username);
+		password_fron_file = PasswordFromFile(pcpConn, hostname, port_str, username);
 		password = password_fron_file;
 	}
 
@@ -1820,6 +1820,8 @@ PasswordFromFile(PCPConnInfo* pcpConn, char *hostname, char *port, char *usernam
 
 	if (hostname == NULL)
 		hostname = DefaultHost;
+	else if(strcmp(hostname , UNIX_DOMAIN_PATH) == 0)
+		hostname = DefaultHost;
 
 	if (!getPoolPassFilename(pgpassfile))
 		return NULL;


[parent: 85e7862ddc6e]