automerge commit

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

channels/chan_sip.c

@@ -7569,6 +7569,11 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
 				ast_copy_flags(p, &global_flags, SIP_OSPAUTH);
 				res = check_auth(p, req, p->randdata, sizeof(p->randdata), "", "", "", sipmethod, uri2, reliable, ignore); 
 #endif
+			} else if (!ast_strlen_zero(rpid_num) && ast_test_flag(p, SIP_TRUSTRPID)) {
+				if (*calleridname)
+					ast_copy_string(p->cid_name, calleridname, sizeof(p->cid_name));
+				ast_copy_string(p->cid_num, rpid_num, sizeof(p->cid_num));
+				ast_shrink_phone_number(p->cid_num);
 			}
 		}