aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xapps/Makefile3
-rwxr-xr-xasterisk.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/apps/Makefile b/apps/Makefile
index a1504f5ee..d81b2154d 100755
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -28,7 +28,8 @@ APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so\
app_setcdruserfield.so app_random.so app_ices.so app_eval.so \
app_nbscat.so app_sendtext.so app_exec.so app_sms.so \
app_groupcount.so app_txtcidname.so app_controlplayback.so \
- app_talkdetect.so app_alarmreceiver.so app_userevent.so app_verbose.so
+ app_talkdetect.so app_alarmreceiver.so app_userevent.so app_verbose.so \
+ app_test.so
ifneq (${OSARCH},Darwin)
APPS+=app_intercom.so
diff --git a/asterisk.c b/asterisk.c
index 50dbedeae..db54f330b 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -1486,6 +1486,8 @@ static void ast_readconfig(void) {
if (option_overrideconfig == 1) {
cfg = ast_load((char *)ast_config_AST_CONFIG_FILE);
+ if (!cfg)
+ ast_log(LOG_WARNING, "Unable to open specified master config file '%s', using builtin defaults\n", ast_config_AST_CONFIG_FILE);
} else {
cfg = ast_load(config);
}