[asterisk-commits] jpeeler: branch jpeeler/chan_dahdi r118823 - /team/jpeeler/chan_dahdi/pbx/

[SVN commits to the Asterisk project]

Author: jpeeler
Date: Wed May 28 16:46:03 2008
New Revision: 118823

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118823
Log:
add dahdichan item to users.conf with fallback to deprecated zapchan

Modified:
    team/jpeeler/chan_dahdi/pbx/pbx_config.c

Modified: team/jpeeler/chan_dahdi/pbx/pbx_config.c
URL: http://svn.digium.com/view/asterisk/team/jpeeler/chan_dahdi/pbx/pbx_config.c?view=diff&rev=118823&r1=118822&r2=118823
==============================================================================
--- team/jpeeler/chan_dahdi/pbx/pbx_config.c (original)
+++ team/jpeeler/chan_dahdi/pbx/pbx_config.c Wed May 28 16:46:03 2008
@@ -1588,6 +1588,16 @@
 		dahdichan = ast_variable_retrieve(cfg, cat, "dahdichan");
 		if (!dahdichan)
 			dahdichan = ast_variable_retrieve(cfg, "general", "dahdichan");
+		if (!dahdichan) {
+		/* no dahdichan, but look for zapchan too */
+			dahdichan = ast_variable_retrieve(cfg, cat, "zapchan");
+			if (!dahdichan) {
+				dahdichan = ast_variable_retrieve(cfg, "general", "zapchan");
+			}
+			if (!ast_strlen_zero(dahdichan)) {
+				ast_log(LOG_WARNING, "Use of zapchan in users.conf is deprecated. Please update configuration to use dahdichan instead.\n");
+			}
+		}
 		if (!ast_strlen_zero(dahdichan)) {
 			ast_copy_string(dahdicopy, dahdichan, sizeof(dahdicopy));
 			c = dahdicopy;