From: Jason Parker <jparker@digium.com>
Date: Mon, 19 Apr 2010 21:50:14 +0000 (+0000)
Subject: Merged revisions 257947 via svnmerge from
X-Git-Tag: 1.6.2.8-rc1~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8ba363a43739a634f78ed8f47ec0c1b2697c318;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@257948 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/main/indications.c b/main/indications.c
index b658e3f511..9901d81dc9 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;
 	}