diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-26 16:14:48 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-26 16:14:48 +0000 |
| commit | de6a20995ef10ad8d528a14b63d90bc6381cd5c8 (patch) | |
| tree | ddd69b29d1d3295bbe5676b8df5d5e30591726b5 /res/res_config_pgsql.c | |
| parent | 1d3ffd70db5a0a5f5b93630954ae5b90b9e57785 (diff) | |
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/trunk@265894 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_config_pgsql.c')
| -rw-r--r-- | res/res_config_pgsql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c index e4bffd307..9a6650fa4 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); |