summaryrefslogtreecommitdiff
path: root/channels/chan_zap.c
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2007-08-18 13:52:44 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2007-08-18 13:52:44 +0000
commit749b67bd1d12523c4c307f8f50feb3b41c2f89e5 (patch)
treea73c0921d27ce721d81ef5a1f80114139d236d24 /channels/chan_zap.c
parentdc7d25ea63d0622b47662feebcd01481ce10a1bc (diff)
We weren't properly encapsulating the mtime ignores of config files (closes issue #10488)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79940 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/chan_zap.c')
-rw-r--r--channels/chan_zap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 60d9e2e9d..2bb905c60 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -10712,7 +10712,7 @@ static int zap_restart(void)
destroy_channel(NULL, iflist, 1);
}
ast_debug(1, "Channels destroyed. Now re-reading config.\n");
- if (setup_zap(1) != 0) {
+ if (setup_zap(2) != 0) {
ast_log(LOG_WARNING, "Reload channels from zap config failed!\n");
return 1;
}
@@ -12629,7 +12629,7 @@ static int setup_zap(int reload)
struct ast_variable *v;
struct zt_chan_conf base_conf = zt_chan_conf_default();
struct zt_chan_conf conf;
- struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
+ struct ast_flags config_flags = { reload == 1 ? CONFIG_FLAG_FILEUNCHANGED : 0 };
int res;
#ifdef HAVE_PRI