diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 19:32:39 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-02-28 19:32:39 +0000 |
| commit | 66bf32bf7ecddb8e3f9bd805f6709efbfd4f0406 (patch) | |
| tree | 57ecb7a054b83bcae3dfa803135791b7fc2ed62c /asterisk.c | |
| parent | 5767fde7d7fc9a5aca76756cc5bdf1ad33da16c6 (diff) | |
Merged revisions 11408 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r11408 | russell | 2006-02-28 14:31:10 -0500 (Tue, 28 Feb 2006) | 2 lines
adjust the keys directory when astvarlibdir is specified in asterisk.conf (issue #6602)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@11409 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 5577fd73b..c980352e6 100644 --- a/asterisk.c +++ b/asterisk.c @@ -1897,7 +1897,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")) { |