kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Load the proper channel configuration file based on which driver was detected.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@126680 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2008-06-30 23:11:16 +00:00
parent 84ab258c12
commit 95961ba037
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_dahdi.c
View File

@@ -11360,16 +11360,15 @@ static int setup_dahdi(int reload)
int dchannels[NUM_DCHANS];
#endif
#ifdef HAVE_ZAPTEL
cfg = ast_config_load("zapata.conf");
#else
cfg = ast_config_load(config);
/* Error if we have no chan_dahdi config file... */
#endif
/* Error if we have no config file... */
if (!cfg) {
/* ...so try and load zapata.conf */
cfg = ast_config_load("zapata.conf");
if (!cfg) {
ast_log(LOG_ERROR, "Unable to load either config %s or zapata.conf\n", config);
return 0;
}
}
/* It's a little silly to lock it, but we mind as well just to be sure */