Merged revisions 206702 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r206702 | dvossel | 2009-07-15 15:20:01 -0500 (Wed, 15 Jul 2009) | 10 lines
  
  callerid(num) is wrong when username is missing 
  
  A domain only sip uri <sip:123.123.123.123> would return
  123.123.123.123 as callid num.  Now, if the username is
  missing from a uri, the callerid num field is left empty.
  
  (closes issue #15476)
  Reported by: viraptor
........


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

channels/chan_sip.c

@@ -12875,8 +12875,7 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
 		 * really a mistake and should go away.
 		 */
 		of = domain;
-	}
-	{
+	} else {
 		char *tmp = ast_strdupa(of);
 		/* We need to be able to handle auth-headers looking like
 			<sip:8164444422;phone-context=+1@1.2.3.4:5060;user=phone;tag=SDadkoa01-gK0c3bdb43>