[asterisk-commits] rmudgett: trunk r335853 - in /trunk: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Sep 14 11:05:38 2011
New Revision: 335853

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

................
  r335852 | rmudgett | 2011-09-14 11:00:37 -0500 (Wed, 14 Sep 2011) | 18 lines
  
  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:
    trunk/   (props changed)
    trunk/channels/chan_dahdi.c

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

Modified: trunk/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_dahdi.c?view=diff&rev=335853&r1=335852&r2=335853
==============================================================================
--- trunk/channels/chan_dahdi.c (original)
+++ trunk/channels/chan_dahdi.c Wed Sep 14 11:05:38 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;