aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--channels/chan_dahdi.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f1c54460c..4e3871f8a 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -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 */