Warn if unable to open an overridden config file (but #2285)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3669 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/Makefile b/apps/Makefile
index a1504f5ee3ae6b6ddd55b2f85e36cfdc4f01161d..d81b2154d7c4694c77a80d3402d2003561c85789 100755 (executable)
--- 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 50dbedeaef6333708991bd5f7b712c9050eebbf8..db54f330b2cb1994deb68b89a7d21f532e39cfb7 100755 (executable)
--- 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);
        }