diff options
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_skinny.c | 2 | ||||
| -rw-r--r-- | channels/chan_usbradio.c | 6 | ||||
| -rw-r--r-- | channels/chan_vpb.cc | 2 | ||||
| -rw-r--r-- | channels/iax2-provision.c | 2 | ||||
| -rw-r--r-- | channels/misdn_config.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index a72345cfe..04c700559 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -6477,7 +6477,7 @@ static struct ast_channel *skinny_request(const char *type, int format, void *da cfg = ast_config_load(config, config_flags); /* We *must* have a config file otherwise stop immediately */ - if (!cfg) { + if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_NOTICE, "Unable to load config %s, Skinny disabled.\n", config); return -1; } diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index bc1dbb3c2..df5bad541 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -3510,7 +3510,7 @@ static struct chan_usbradio_pvt *store_config(struct ast_config *cfg, char *ctg) o->txctcssadj = 200; o->rxsquelchadj = 500; o->devstr[0] = 0; - if (cfg1) { + if (cfg1 && cfg1 != CONFIG_STATUS_FILEINVALID) { for (v = ast_variable_browse(cfg1, o->name); v; v = v->next) { M_START((char *)v->name, (char *)v->value); @@ -3942,9 +3942,9 @@ static int load_module(void) /* load config file */ #ifdef NEW_ASTERISK - if (!(cfg = ast_config_load(config,zeroflag))) { + if (!(cfg = ast_config_load(config,zeroflag)) || cfg == CONFIG_STATUS_FILEINVALID) { #else - if (!(cfg = ast_config_load(config))) { + if (!(cfg = ast_config_load(config))) || cfg == CONFIG_STATUS_FILEINVALID { #endif ast_log(LOG_NOTICE, "Unable to load config %s\n", config); return AST_MODULE_LOAD_DECLINE; diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc index b8ca24011..f72231276 100644 --- a/channels/chan_vpb.cc +++ b/channels/chan_vpb.cc @@ -2714,7 +2714,7 @@ static enum ast_module_load_result load_module() cfg = ast_config_load(config, config_flags); /* We *must* have a config file otherwise stop immediately */ - if (!cfg) { + if (!cfg || cfg == CONFIG_STATUS_FILEINVALID) { ast_log(LOG_ERROR, "Unable to load config %s\n", config); return AST_MODULE_LOAD_DECLINE; } diff --git a/channels/iax2-provision.c b/channels/iax2-provision.c index 8bdfdbfb7..7278819b7 100644 --- a/channels/iax2-provision.c +++ b/channels/iax2-provision.c @@ -493,7 +493,7 @@ int iax_provision_reload(int reload) iax_provision_init(); cfg = ast_config_load2("iaxprov.conf", "chan_iax2", config_flags); - if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED) { + if (cfg != NULL && cfg != CONFIG_STATUS_FILEUNCHANGED && cfg != CONFIG_STATUS_FILEINVALID) { /* Mark all as dead. No need for locking */ cur = templates; while(cur) { diff --git a/channels/misdn_config.c b/channels/misdn_config.c index fb0739356..12a742cf3 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -1101,8 +1101,8 @@ int misdn_cfg_init(int this_max_ports, int reload) struct ast_variable *v; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; - if (!(cfg = ast_config_load2(config, "chan_misdn", config_flags))) { - ast_log(LOG_WARNING, "missing file: misdn.conf\n"); + if (!(cfg = ast_config_load2(config, "chan_misdn", config_flags)) || cfg == CONFIG_STATUS_FILEINVALID) { + ast_log(LOG_WARNING, "missing or invalid file: misdn.conf\n"); return -1; } else if (cfg == CONFIG_STATUS_FILEUNCHANGED) return 0; |