[asterisk-commits] file: branch 1.6.1 r174043 - in /branches/1.6.1: ./ channels/chan_dahdi.c

[SVN commits to the Asterisk project]

Author: file
Date: Fri Feb  6 13:30:29 2009
New Revision: 174043

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

........
  r174041 | file | 2009-02-06 15:28:53 -0400 (Fri, 06 Feb 2009) | 4 lines
  
  Don't subscribe to a mailbox on pseudo channels. It is futile. This solves an issue where duplicated pseudo channels would cause a crash because the first one would unsubscribe and the next one would also try to unsubscribe the same subscription.
  (closes issue #14322)
  Reported by: amessina
........

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

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

Modified: branches/1.6.1/channels/chan_dahdi.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.1/channels/chan_dahdi.c?view=diff&rev=174043&r1=174042&r2=174043
==============================================================================
--- branches/1.6.1/channels/chan_dahdi.c (original)
+++ branches/1.6.1/channels/chan_dahdi.c Fri Feb  6 13:30:29 2009
@@ -9120,7 +9120,7 @@
 		tmp->cid_ton = 0;
 		ast_copy_string(tmp->cid_name, conf->chan.cid_name, sizeof(tmp->cid_name));
 		ast_copy_string(tmp->mailbox, conf->chan.mailbox, sizeof(tmp->mailbox));
-		if (!ast_strlen_zero(tmp->mailbox)) {
+		if (channel != CHAN_PSEUDO && !ast_strlen_zero(tmp->mailbox)) {
 			char *mailbox, *context;
 			mailbox = context = ast_strdupa(tmp->mailbox);
 			strsep(&context, "@");