automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11434 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/asterisk.c b/asterisk.c
index 4a0e7788533f54405a6253ce9d8ec646ca140ec0..42feb9f0fbe8b48cd8bd6ba03a7947a25d5ded86 100644 (file)
--- 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")) {

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 48e287abdfaf0d7922288e007644d5feff208f21..ec2dec5da21e619276adeb7aaa8b5c89b8951407 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -1958,7 +1958,7 @@ static int iax2_show_peer(int fd, int argc, char *argv[])
                ast_cli(fd, "  Status       : ");
                peer_status(peer, status, sizeof(status));      
                ast_cli(fd, "%s\n",status);
-               ast_cli(fd, " Qualify        : every %d when OK, every %d when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, (peer->smoothing == 1) ? "On" : "Off");
+               ast_cli(fd, " Qualify        : every %dms when OK, every %dms when UNREACHABLE (sample smoothing %s)\n", peer->pokefreqok, peer->pokefreqnotok, peer->smoothing ? "On" : "Off");
                ast_cli(fd,"\n");
                if (ast_test_flag(peer, IAX_TEMPONLY))
                        destroy_peer(peer);