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 813294583cd842007e76ee28d026f4a290415662..2e980fd4cfc36c22525345ca5dff9146ee324444 100644 (file)
--- 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 291dc4762049d4150ddb5f613144cb6ed38aef9a..a8d2bd0567f9efbf482eacdf96ec173c3b36c012 100644 (file)
--- 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) {