diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-19 21:50:14 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-04-19 21:50:14 +0000 |
| commit | 1cef7f224e8b75ea5d0f40251bc775cb98372620 (patch) | |
| tree | 126803f13ceb053cd54f4729363b2242783084bc /main | |
| parent | 9467eee838a1b8e888eaab3bb4f192afa85e097b (diff) | |
Merged revisions 257947 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r257947 | qwell | 2010-04-19 16:49:30 -0500 (Mon, 19 Apr 2010) | 6 lines
Don't consider a missing indications.conf to be a critical error.
There were many changes in revision 176627 which would avoid the error that a
missing config would have caused. Other than this, there are no other config
files (including asterisk.conf, surprisingly) that are required.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@257948 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/indications.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/indications.c b/main/indications.c index b658e3f51..9901d81dc 100644 --- a/main/indications.c +++ b/main/indications.c @@ -1039,7 +1039,7 @@ static int load_indications(int reload) if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "Can't find indications config file %s.\n", config); - return -1; + return 0; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) { return 0; } |