Merged revisions 11408 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 28 Feb 2006 19:32:39 +0000 (19:32 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 28 Feb 2006 19:32:39 +0000 (19:32 +0000)
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: https://origsvn.digium.com/svn/asterisk/trunk@11409 65c4cc65-6c06-0410-ace0-fbb531ad65f3

asterisk.c

index 5577fd7..c980352 100644 (file)
@@ -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")) {