summaryrefslogtreecommitdiff
path: root/channels
diff options
context:
space:
mode:
authorJoshua Colp <jcolp@digium.com>2007-07-23 14:38:35 +0000
committerJoshua Colp <jcolp@digium.com>2007-07-23 14:38:35 +0000
commit90dc0cfa85dbe55c7f34e59fb56b97f582d57db4 (patch)
treef3b15e6b720a1d27771a3ca96656bd9cc94664f8 /channels
parent7a2772c1513a651ac3970c7a9790e9b2be792a35 (diff)
Merged revisions 76561 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r76561 | file | 2007-07-23 11:34:21 -0300 (Mon, 23 Jul 2007) | 14 lines 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/trunk@76563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 0371de8c6..b8092fb76 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -10205,9 +10205,10 @@ static enum check_auth_result check_user_full(struct sip_pvt *p, struct sip_requ
return res;
/* Finally, apply the guest policy */
- if (global_allowguest)
+ if (global_allowguest) {
+ replace_cid(p, rpid_num, calleridname);
res = AUTH_SUCCESSFUL;
- else if (global_alwaysauthreject)
+ } else if (global_alwaysauthreject)
res = AUTH_FAKE_AUTH; /* reject with fake authorization request */
else
res = AUTH_SECRET_FAILED; /* we don't want any guests, authentication will fail */