diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 16:08:03 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 16:08:03 +0000 |
| commit | 9e1d0d917f0516fe76299e3af77a610a726d7ffa (patch) | |
| tree | 926379b38418680499eba1953e547e616e543eeb /channels | |
| parent | f415f172cfef137d01b36ebc1e3cb37d42835ef9 (diff) | |
new installations should be using DAHDI instead of Zaptel, so the sample config file is now chan_dahdi.conf instead of zapata.conf
also, convert remaining references to zapata.conf in various places
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.4@130042 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_dahdi.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index e9c99c4eb..f74cd3169 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -163,8 +163,6 @@ static const char tdesc[] = "DAHDI Telephony Driver" #endif ; -static const char config[] = "chan_dahdi.conf"; - #define SIG_EM DAHDI_SIG_EM #define SIG_EMWINK (0x0100000 | DAHDI_SIG_EM) #define SIG_FEATD (0x0200000 | DAHDI_SIG_EM) @@ -11371,16 +11369,16 @@ static int setup_dahdi(int reload) #endif #ifdef HAVE_ZAPTEL - cfg = ast_config_load("zapata.conf"); + if (!(cfg = ast_config_load("zapata.conf"))) { + ast_log(LOG_ERROR, "Unable to load zapata.conf\n"); + return 0; + } #else - cfg = ast_config_load(config); -#endif - /* Error if we have no config file... */ - if (!cfg) { - ast_log(LOG_ERROR, "Unable to load either config %s or zapata.conf\n", config); - return 0; + if (!(cfg = ast_config_load("chan_dahdi.conf"))) { + ast_log(LOG_ERROR, "Unable to load chan_dahdi.conf\n"); + return 0; } - +#endif /* It's a little silly to lock it, but we mind as well just to be sure */ ast_mutex_lock(&iflock); #ifdef HAVE_PRI |