[asterisk-commits] trunk r11409 - in /trunk: ./ asterisk.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Feb 28 13:32:39 2006
New Revision: 11409

URL: http://svn.digium.com/view/asterisk?rev=11409&view=rev
Log:
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)

........

Modified:
    trunk/   (props changed)
    trunk/asterisk.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/asterisk.c?rev=11409&r1=11408&r2=11409&view=diff
==============================================================================
--- trunk/asterisk.c (original)
+++ trunk/asterisk.c Tue Feb 28 13:32:39 2006
@@ -1897,7 +1897,8 @@
 			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")) {