[svn-commits] jpeeler: branch 1.4 r126680 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Jun 30 18:11:16 2008
New Revision: 126680

URL: http://svn.digium.com/view/asterisk?view=rev&rev=126680
Log:
Load the proper channel configuration file based on which driver was detected.


Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=126680&r1=126679&r2=126680
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Mon Jun 30 18:11:16 2008
@@ -11360,16 +11360,15 @@
 	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 */