diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-20 01:35:12 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-20 01:35:12 +0000 |
| commit | a0994f44476cf3f29a4b225b5b850680736b685c (patch) | |
| tree | 43a70d86f008e6e5965ee63c1ddb7fbfd0fb7806 /cdr | |
| parent | 1649bd82aa3ea58ba3410738cf4a57397f2e57e5 (diff) | |
remove an unused variable, and default the user to asterisk if not specified
in the config file (issue #7153, Mithraen)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@28936 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'cdr')
| -rw-r--r-- | cdr/cdr_pgsql.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cdr/cdr_pgsql.c b/cdr/cdr_pgsql.c index a62e9f206..356a2e5ab 100644 --- a/cdr/cdr_pgsql.c +++ b/cdr/cdr_pgsql.c @@ -63,7 +63,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") static char *desc = "PostgreSQL CDR Backend"; static char *name = "pgsql"; static char *config = "cdr_pgsql.conf"; -static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbsock = NULL, *pgdbport = NULL, *table = NULL; +static char *pghostname = NULL, *pgdbname = NULL, *pgdbuser = NULL, *pgpassword = NULL, *pgdbport = NULL, *table = NULL; static int connected = 0; AST_MUTEX_DEFINE_STATIC(pgsql_lock); @@ -195,8 +195,6 @@ static int my_unload_module(void) free(pgdbname); if (pgdbuser) free(pgdbuser); - if (pgdbsock) - free(pgdbsock); if (pgpassword) free(pgpassword); if (pgdbport) @@ -233,8 +231,8 @@ static int process_my_load_module(struct ast_config *cfg) return -1; if (!(tmp = ast_variable_retrieve(cfg, "global", "user"))) { - ast_log(LOG_WARNING,"PostgreSQL database user not specified. Assuming root\n"); - tmp = "root"; + ast_log(LOG_WARNING,"PostgreSQL database user not specified. Assuming asterisk\n"); + tmp = "asterisk"; } if (!(pgdbuser = ast_strdup(tmp))) |