diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 19:31:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 19:31:10 +0000 |
| commit | 8891e2ecca1ed446a8a720d777c4ba3c618b81f8 (patch) | |
| tree | a954acd87c419710b3cb537f5af0af90def53f2b /asterisk.c | |
| parent | e70531a7e119021f06a06275a2225b5973d1f76a (diff) | |
adjust the keys directory when astvarlibdir is specified in asterisk.conf (issue #6602)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@11408 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")) { |