kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 20:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow database password to be NULL and several other cleanups.

Browse Source 
(closes issue #12048)
 Reported by: bukaj
 Patches: 
       20080222__bug12048.diff.txt uploaded by Corydon76 (license 14)
 Tested by: bukaj


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@104036 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-02-22 22:39:21 +00:00
parent 0bcd2ae4b0
commit 9392dae2d6
1 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/res_config_pgsql.c
View File

@@ -912,23 +912,21 @@ static int pgsql_reconnect(const char *database)
pgsqlConn = NULL; pgsqlConn = NULL;
} }
if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && !ast_strlen_zero(dbpass) && !ast_strlen_zero(my_database)) { /* DB password can legitimately be 0-length */
char *connInfo = NULL; if ((!pgsqlConn) && (!ast_strlen_zero(dbhost) || !ast_strlen_zero(dbsock)) && !ast_strlen_zero(dbuser) && dbpass && !ast_strlen_zero(my_database)) {
unsigned int size = 100 + strlen(dbhost) struct ast_str *connInfo = ast_str_create(32);
+ strlen(dbuser)
+ strlen(dbpass)
+ strlen(my_database);
if (!(connInfo = ast_malloc(size))) ast_str_set(&connInfo, 0, "host=%s port=%d dbname=%s user=%s",
return 0; dbhost, dbport, my_database, dbuser);
if (!ast_strlen_zero(dbpass))
ast_str_append(&connInfo, 0, " password=%s", dbpass);
sprintf(connInfo, "host=%s port=%d dbname=%s user=%s password=%s", ast_debug(1, "%u connInfo=%s\n", connInfo->len, connInfo->str);
dbhost, dbport, my_database, dbuser, dbpass); pgsqlConn = PQconnectdb(connInfo->str);
ast_debug(1, "%u connInfo=%s\n", size, connInfo); ast_debug(1, "%u connInfo=%s\n", connInfo->len, connInfo->str);
pgsqlConn = PQconnectdb(connInfo);
ast_debug(1, "%u connInfo=%s\n", size, connInfo);
ast_free(connInfo); ast_free(connInfo);
connInfo = NULL; connInfo = NULL;
ast_debug(1, "pgsqlConn=%p\n", pgsqlConn); ast_debug(1, "pgsqlConn=%p\n", pgsqlConn);
if (pgsqlConn && PQstatus(pgsqlConn) == CONNECTION_OK) { if (pgsqlConn && PQstatus(pgsqlConn) == CONNECTION_OK) {
ast_debug(1, "PostgreSQL RealTime: Successfully connected to database.\n"); ast_debug(1, "PostgreSQL RealTime: Successfully connected to database.\n");
@@ -936,13 +934,12 @@ static int pgsql_reconnect(const char *database)
return 1; return 1;
} else { } else {
ast_log(LOG_ERROR, ast_log(LOG_ERROR,
"PostgreSQL RealTime: Failed to connect database server %s on %s. Check debug for more info.\n", "PostgreSQL RealTime: Failed to connect database %s on %s: %s\n",
dbname, dbhost); dbname, dbhost, PQresultErrorMessage(NULL));
ast_debug(1, "PostgreSQL RealTime: Cannot Connect: %s\n", PQresultErrorMessage(NULL));
return 0; return 0;
} }
} else { } else {
ast_debug(1, "PostgreSQL RealTime: Everything is fine.\n"); ast_debug(1, "PostgreSQL RealTime: One or more of the parameters in the config does not pass our validity checks.\n");
return 1; return 1;
} }
} }