[svn-commits] bweschke: branch 1.6.1 r151328 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: bweschke
Date: Tue Oct 21 06:03:27 2008
New Revision: 151328

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

........
  r151327 | bweschke | 2008-10-21 07:02:08 -0400 (Tue, 21 Oct 2008) | 7 lines
  
   Fix configuration parsing so type=friend still identifies "friend" as a peer even though it is now a legacy configuration verb.
  
   (closes issue #13705)
   reported by: blitzrage
   patched by: bweschke
........

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

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=151328&r1=151327&r2=151328
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Oct 21 06:03:27 2008
@@ -21987,7 +21987,7 @@
 			if (!strcasecmp(utype, "user")) {
 				is_peer = 1;
 			} else if (!strcasecmp(utype, "friend")) {
-				is_peer = 1;
+				is_peer = 2;
 			} else if (!strcasecmp(utype, "peer"))
 				is_peer = 2;
 			else {