aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authortilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-26 16:15:40 +0000
committertilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b>2010-05-26 16:15:40 +0000
commita408b0dae26e4dbc72d3e1aebe2d3ff53bf1a0d5 (patch)
tree31ef43f6c23cbd586948b4546472c19425551971 /res
parenta1f6856a56e05b4f15d507e2a0b096e172b58826 (diff)
Merged revisions 265894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r265894 | tilghman | 2010-05-26 11:14:48 -0500 (Wed, 26 May 2010) | 8 lines Construct socket name, according to the Postgres docs, and document as such. (closes issue #17392) Reported by: dps Patches: 20100525__issue17392.diff.txt uploaded by tilghman (license 14) Tested by: dps ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@265895 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_config_pgsql.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index 7d53d6a59..fd0844571 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -1391,8 +1391,8 @@ static int parse_config(int is_reload)
/* No socket needed */
} else if (!(s = ast_variable_retrieve(config, "general", "dbsock"))) {
ast_log(LOG_WARNING,
- "PostgreSQL RealTime: No database socket found, using '/tmp/pgsql.sock' as default.\n");
- strcpy(dbsock, "/tmp/pgsql.sock");
+ "PostgreSQL RealTime: No database socket found, using '/tmp/.s.PGSQL.%d' as default.\n", dbport);
+ strcpy(dbsock, "/tmp");
} else {
ast_copy_string(dbsock, s, sizeof(dbsock));
}
@@ -1453,7 +1453,7 @@ static int pgsql_reconnect(const char *database)
struct ast_str *connInfo = ast_str_create(32);
ast_str_set(&connInfo, 0, "host=%s port=%d dbname=%s user=%s",
- dbhost, dbport, my_database, dbuser);
+ S_OR(dbhost, dbsock), dbport, my_database, dbuser);
if (!ast_strlen_zero(dbpass))
ast_str_append(&connInfo, 0, " password=%s", dbpass);