[svn-commits] rmudgett: branch 10 r335852 - in /branches/10: ./ channels/chan_dahdi.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Wed Sep 14 11:00:37 2011
New Revision: 335852

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=335852
Log:
Merged revisions 335851 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r335851 | rmudgett | 2011-09-14 10:53:25 -0500 (Wed, 14 Sep 2011) | 11 lines
  
  Fixed cut-n-paste regression using the wrong variable.
  
  Fixes the missing DAHDI channels when using the newer chan_dahdi.conf
  sections for channel configuration.
  
  (closes issue ASTERISK-18496)
  Reported by: Sean Darcy
  Patches:
        jira_asterisk_18496_v1.8.patch (license #5621) patch uploaded by rmudgett
  Tested by: Sean Darcy, rmudgett
........

Modified:
    branches/10/   (props changed)
    branches/10/channels/chan_dahdi.c

Propchange: branches/10/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: branches/10/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/channels/chan_dahdi.c?view=diff&rev=335852&r1=335851&r2=335852
==============================================================================
--- branches/10/channels/chan_dahdi.c (original)
+++ branches/10/channels/chan_dahdi.c Wed Sep 14 11:00:37 2011
@@ -18381,7 +18381,7 @@
 			continue;
 		}
 
-		chans = ast_variable_retrieve(ucfg, cat, "dahdichan");
+		chans = ast_variable_retrieve(cfg, cat, "dahdichan");
 		if (ast_strlen_zero(chans)) {
 			/* Section is useless without a dahdichan value present. */
 			continue;