[svn-commits] russell: branch 1.6.1 r164524 - in /branches/1.6.1: ./ channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: russell
Date: Mon Dec 15 16:23:18 2008
New Revision: 164524

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

........
r164522 | russell | 2008-12-15 16:22:43 -0600 (Mon, 15 Dec 2008) | 4 lines

Fix log message to refer to the generic timing interface, not DAHDI specifically

(inspired by issue #14082)

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_iax2.c

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

Modified: branches/1.6.1/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_iax2.c?view=diff&rev=164524&r1=164523&r2=164524
==============================================================================
--- branches/1.6.1/channels/chan_iax2.c (original)
+++ branches/1.6.1/channels/chan_iax2.c Mon Dec 15 16:23:18 2008
@@ -10662,7 +10662,7 @@
 			} else if (!strcasecmp(v->name, "trunk")) {
 				ast_set2_flag(peer, ast_true(v->value), IAX_TRUNK);	
 				if (ast_test_flag(peer, IAX_TRUNK) && (timingfd < 0)) {
-					ast_log(LOG_WARNING, "Unable to support trunking on peer '%s' without DAHDI timing\n", peer->name);
+					ast_log(LOG_WARNING, "Unable to support trunking on peer '%s' without a timing interface\n", peer->name);
 					ast_clear_flag(peer, IAX_TRUNK);
 				}
 			} else if (!strcasecmp(v->name, "auth")) {