[svn-commits] file: trunk r76563 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jul 23 09:38:35 2007
New Revision: 76563

URL: http://svn.digium.com/view/asterisk?view=rev&rev=76563
Log:
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.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=76563&r1=76562&r2=76563
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Jul 23 09:38:35 2007
@@ -10205,9 +10205,10 @@
 		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 */