From 271ccecaf2f040b182f677e8033bdcc76aaa3bda Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 28 Feb 2006 19:31:10 +0000 Subject: [PATCH] adjust the keys directory when astvarlibdir is specified in asterisk.conf (issue #6602) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@11408 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- asterisk.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/asterisk.c b/asterisk.c index 4a0e778853..42feb9f0fb 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")) {