Merged revisions 103385 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r103385 | file | 2008-02-12 11:09:24 -0400 (Tue, 12 Feb 2008) | 4 lines

Even if no CallerID name or number has been provided by the remote party still use the configured sip.conf ones.
(closes issue #11977)
Reported by: pj

........


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

channels/chan_sip.c

@@ -11004,13 +11004,13 @@ static enum check_auth_result check_user_ok(struct sip_pvt *p, char *of,
 			ast_set_flag(&p->flags[0], SIP_CALL_LIMIT);
 		if (!ast_strlen_zero(user->context))
 			ast_string_field_set(p, context, user->context);
-		if (!ast_strlen_zero(user->cid_num) && !ast_strlen_zero(p->cid_num)) {
+		if (!ast_strlen_zero(user->cid_num)) {
 			char *tmp = ast_strdupa(user->cid_num);
 			if (ast_is_shrinkable_phonenumber(tmp))
 				ast_shrink_phone_number(tmp);
 			ast_string_field_set(p, cid_num, tmp);
 		}
-		if (!ast_strlen_zero(user->cid_name) && !ast_strlen_zero(p->cid_num))
+		if (!ast_strlen_zero(user->cid_name))
 			ast_string_field_set(p, cid_name, user->cid_name);
 		ast_string_field_set(p, username, user->name);
 		ast_string_field_set(p, peername, user->name);
@@ -11147,13 +11147,13 @@ static enum check_auth_result check_peer_ok(struct sip_pvt *p, char *of,
 			/* XXX this takes the name from the caller... can we override ? */
 			ast_string_field_set(p, authname, peer->username);
 		}
-		if (!ast_strlen_zero(peer->cid_num) && !ast_strlen_zero(p->cid_num)) {
+		if (!ast_strlen_zero(peer->cid_num)) {
 			char *tmp = ast_strdupa(peer->cid_num);
 			if (ast_is_shrinkable_phonenumber(tmp))
 				ast_shrink_phone_number(tmp);
 			ast_string_field_set(p, cid_num, tmp);
 		}
-		if (!ast_strlen_zero(peer->cid_name) && !ast_strlen_zero(p->cid_name)) 
+		if (!ast_strlen_zero(peer->cid_name)) 
 			ast_string_field_set(p, cid_name, peer->cid_name);
 		ast_string_field_set(p, fullcontact, peer->fullcontact);
 		if (!ast_strlen_zero(peer->context))