From: Sean Bright <sean@malleable.com>
Date: Wed, 27 May 2009 13:05:27 +0000 (+0000)
Subject: Merged revisions 196988 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70b31d202a0ead850c69ff3c5dbdb123814ab17e;p=thirdparty%2Fasterisk.git

Merged revisions 196988 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r196988 | seanbright | 2009-05-27 09:02:54 -0400 (Wed, 27 May 2009) | 9 lines

  Display an error message when chan_alsa fails to load due to a missing
  or inaccessible configuration file.

  Before this change, when chan_alsa failed to load due to a missing or
  inaccessible configuration file, no message would be displayed.  With this
  change, when chan_alsa fails to load due to a missing or inaccessible
  configuration file, a message will be displayed.

  (closes issue #14760)
  Reported by: Nick_Lewis
  Patches:
        chan_alsa.c-confload.patch uploaded by Nick (license 657)
........


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

diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 2d41ee7c32..de726ac3f1 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -862,8 +862,10 @@ static int load_module(void)
 
 	strcpy(mohinterpret, "default");
 
-	if (!(cfg = ast_config_load(config, config_flags)))
+	if (!(cfg = ast_config_load(config, config_flags))) {
+		ast_log(LOG_ERROR, "Unable to read ALSA configuration file %s.  Aborting.\n", config);
 		return AST_MODULE_LOAD_DECLINE;
+	}
 
 	v = ast_variable_browse(cfg, "general");
 	for (; v; v = v->next) {