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
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@151328 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_sip.c

@@ -21987,7 +21987,7 @@ static int reload_config(enum channelreloadreason reason)
 			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 {