Merged revisions 76560 via svnmerge from

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

........
r76560 | file | 2007-07-23 11:32:07 -0300 (Mon, 23 Jul 2007) | 6 lines

(closes issue #10236)
Reported by: homesick
Patches:
      rpid_1.4_75840.patch uploaded by homesick (license 91)
Accept Remote Party ID on guest calls.

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a99872ad946329aa59cfe0285815a6aabb0dcffe..79eea0e2419bc984aa377b52969c0dd5bbe614b5 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9335,7 +9335,14 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
                                        res = AUTH_FAKE_AUTH; /* reject with fake authorization request */
                                else
                                        res = AUTH_SECRET_FAILED; /* we don't want any guests, authentication will fail */
-                       }
+                       } else if (!ast_strlen_zero(rpid_num) && ast_test_flag(&p->flags[0], SIP_TRUSTRPID)) {
+                               char *tmp = ast_strdupa(rpid_num);
+                               if (*calleridname)
+                                       ast_string_field_set(p, cid_name, calleridname);
+                               if (ast_is_shrinkable_phonenumber(tmp))
+                                       ast_shrink_phone_number(tmp);
+                               ast_string_field_set(p, cid_num, tmp);
+                        }
                }
 
        }