← Back to branch summary

~damg/ubuntu/quantal/asterisk/LP1097687

« back to all changes in this revision

Viewing changes to main/indications.c

  • Committer: Bazaar Package Importer
  • Author(s): Lorenzo De Liso
  • Date: 2010-10-15 22:24:34 UTC
  • mfrom: (1.2.8 upstream) (8.3.8 sid)
  • Revision ID: james.westby@ubuntu.com-20101015222434-iy328q8in3lajzlv
Tags: 1:1.6.2.9-2ubuntu1
* Merge from debian unstable, remaining changes:
  - debian/control:
    + Build-depend on hardening-wrapper
    + Change Maintainer
    + Removed Uploaders field.
    + Removed Debian Vcs-Svn entry and replaced with ubuntu-voip Vcs-Bzr,
      to reflect divergence in packages.
  - debian/rules: Make use of hardening-wrapper
  - debian/asterisk.init: chown /dev/dahdi
  - debian/backports/hardy: add file
  - debian/backports/asterisk.init.hardy: add file
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
main/indications.c
25
25
 
26
26
#include "asterisk.h"
27
27
 
28
 
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 211580 $")
 
28
ASTERISK_FILE_VERSION(__FILE__, "$Revision: 257950 $")
29
29
 
30
30
#include <math.h>
31
31
 
1038
1038
        cfg = ast_config_load2(config, "indications", config_flags);
1039
1039
 
1040
1040
        if (cfg == CONFIG_STATUS_FILEMISSING || cfg == CONFIG_STATUS_FILEINVALID) {
1041
 
                ast_log(LOG_ERROR, "Can't find indications config file %s.\n", config);
1042
 
                return -1;
 
1041
                ast_log(LOG_WARNING, "Can't find indications config file %s.\n", config);
 
1042
                return 0;
1043
1043
        } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) {
1044
1044
                return 0;
1045
1045
        }