diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 20:04:13 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 20:04:13 +0000 |
commit | 95c202f43a28c135dac157dd127eb089e2acc7dd (patch) | |
tree | 6ac3c4e9107901ff304f6d6fc59d7799126dd77c /asterisk.c | |
parent | f7f5d3e115f56a86ecb11a15cd9e0a5d55bfd00a (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@11434 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rw-r--r-- | asterisk.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/asterisk.c b/asterisk.c index 4a0e77885..42feb9f0f 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1909,7 +1909,8 @@ static void ast_readconfig(void) { snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); - snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/%s", v->value, "astdb"); + snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); + snprintf(ast_config_AST_KEY_DIR, sizeof(ast_config_AST_KEY_DIR), "%s/keys", v->value); } else if (!strcasecmp(v->name, "astlogdir")) { ast_copy_string(ast_config_AST_LOG_DIR, v->value, sizeof(ast_config_AST_LOG_DIR)); } else if (!strcasecmp(v->name, "astagidir")) { |