[svn-commits] qwell: branch 1.4 r180010 - /branches/1.4/channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Tue Mar  3 17:01:06 2009
New Revision: 180010

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180010
Log:
Make sure we still support zapchan in users.conf, in addition to dahdichan.

Modified:
    branches/1.4/channels/chan_dahdi.c

Modified: branches/1.4/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.4/channels/chan_dahdi.c?view=diff&rev=180010&r1=180009&r2=180010
==============================================================================
--- branches/1.4/channels/chan_dahdi.c (original)
+++ branches/1.4/channels/chan_dahdi.c Tue Mar  3 17:01:06 2009
@@ -12087,13 +12087,11 @@
 	cfg = ast_config_load("users.conf");
 	if (cfg) {
 		char *cat;
-		const char *chans;
 		process_dahdi(&conf, "", ast_variable_browse(cfg, "general"), 1, 1);
 		for (cat = ast_category_browse(cfg, NULL); cat ; cat = ast_category_browse(cfg, cat)) {
 			if (!strcasecmp(cat, "general"))
 				continue;
-			chans = ast_variable_retrieve(cfg, cat, "dahdichan");
-			if (!ast_strlen_zero(chans)) {
+			if (!ast_strlen_zero(ast_variable_retrieve(cfg, cat, "dahdichan")) || !ast_strlen_zero(ast_variable_retrieve(cfg, cat, "zapchan"))) {
 				struct dahdi_chan_conf sect_conf;
 				memcpy(&sect_conf, &conf, sizeof(sect_conf));