diff options
author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-13 00:18:04 +0000 |
---|---|---|
committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-12-13 00:18:04 +0000 |
commit | fa4043b087edca30cb3d524020d282c91bfc2890 (patch) | |
tree | 00870dc3ef56b770fbdb2955b062a1b51edd9980 /main/config.c | |
parent | 6132c7f5415a3ccf4cb65888f8b16f84aeffbecf (diff) |
Merged revisions 92696 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
(closes issue #10690)
........
r92696 | qwell | 2007-12-12 18:11:09 -0600 (Wed, 12 Dec 2007) | 7 lines
If a typo is found in a config file, we previous continued on with what was already loaded.
We do not want to do this (see bug below for details).
This makes it so that if a [ is found without a ], the entire config will fail, and nothing in it will be loaded.
Issue 10690.
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@92697 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/config.c')
-rw-r--r-- | main/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/config.c b/main/config.c index 379aa2b36..f2b54bc2d 100644 --- a/main/config.c +++ b/main/config.c @@ -1008,7 +1008,7 @@ static int process_text_line(struct ast_config *cfg, struct ast_category **cat, if (!ast_strlen_zero(exec_file)) unlink(exec_file); if (!do_include) - return 0; + return -1; /* XXX otherwise what ? the default return is 0 anyways */ } else { |