[asterisk-commits] rmudgett: branch 1.6.2 r274627 - in /branches/1.6.2: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Wed Jul  7 13:26:42 2010
New Revision: 274627

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=274627
Log:
Merged revisions 274595 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r274595 | rmudgett | 2010-07-07 13:20:00 -0500 (Wed, 07 Jul 2010) | 9 lines
  
  Merged revisions 274579 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r274579 | rmudgett | 2010-07-07 13:12:41 -0500 (Wed, 07 Jul 2010) | 1 line
    
    Close the DAHDI FD on error when processing chan_dahdi toneduration config parameter.
  ........
................

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

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.2/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/channels/chan_dahdi.c?view=diff&rev=274627&r1=274626&r2=274627
==============================================================================
--- branches/1.6.2/channels/chan_dahdi.c (original)
+++ branches/1.6.2/channels/chan_dahdi.c Wed Jul  7 13:26:42 2010
@@ -17116,6 +17116,7 @@
 					res = ioctl(ctlfd, DAHDI_SET_DIALPARAMS, &dps);
 					if (res < 0) {
 						ast_log(LOG_ERROR, "Invalid tone duration: %d ms at line %d: %s\n", toneduration, v->lineno, strerror(errno));
+						close(ctlfd);
 						return -1;
 					}
 				}