From: Jason Parker <jparker@digium.com>
Date: Tue, 17 Mar 2009 20:13:40 +0000 (+0000)
Subject: Allow dahdichanname to work as advertised.
X-Git-Tag: 1.4.25-rc1~131
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=62fbf19157b3d5bd3fc2b22820a191fbf3d3e997;p=thirdparty%2Fasterisk.git

Allow dahdichanname to work as advertised.

(closes issue #14056)
Reported by: dsedivec
Patches:
      load_from_zapata_conf.patch uploaded by dsedivec (license 638)


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

diff --git a/apps/app_flash.c b/apps/app_flash.c
index 813294583c..2e980fd4cf 100644
--- a/apps/app_flash.c
+++ b/apps/app_flash.c
@@ -126,7 +126,7 @@ static int unload_module(void)
 
 static int load_module(void)
 {
-	if (dahdi_chan_mode == CHAN_ZAP_MODE) {
+	if (*dahdi_chan_mode == CHAN_ZAP_MODE) {
 		return ast_register_application(app, flash_exec, zap_synopsis, zap_descrip);
 	} else {
 		return ast_register_application(app, flash_exec, dahdi_synopsis, dahdi_descrip);
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 291dc47620..a8d2bd0567 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -11997,7 +11997,7 @@ static int setup_dahdi(int reload)
 #ifdef HAVE_ZAPTEL
 	int load_from_zapata_conf = 1;
 #else
-	int load_from_zapata_conf = (dahdi_chan_mode == CHAN_ZAP_MODE);
+	int load_from_zapata_conf = (*dahdi_chan_mode == CHAN_ZAP_MODE);
 #endif
 
 	if (load_from_zapata_conf) {