Make voicemail not terminate asterisk if no config file

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

diff --git a/ChangeLog b/ChangeLog
index 2e84164e7b6dabc0d9d12d8e54b29f12ec26a6ce..6cf269d7703d703fc0486b516846a92021f7d68e 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Jeremy McNamara <jj@nufone.net>
+
+       * apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
+
 2005-11-16  Josh Roberson <josh@asteriasgi.com>
 
        * Makefile:  Update to fix non-responsive remote console on Darwin (OSX)(issue #5757)

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 238623fed1f437703f8abfb88e47af519c926ef9..487d6e9fec2728443500a3772590aa287c6273ec 100755 (executable)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -6228,8 +6228,8 @@ static int load_config(void)
                return 0;
        } else {
                ast_mutex_unlock(&vmlock);
-               ast_log(LOG_WARNING, "Error reading voicemail config\n");
-               return -1;
+               ast_log(LOG_WARNING, "Failed to load configuration file. Module not activated.\n");
+               return 0;
        }
 }