From: Joshua Colp <jcolp@digium.com>
Date: Fri, 13 Oct 2006 16:02:27 +0000 (+0000)
Subject: Merged revisions 45040 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~4422
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1bb0dab37a10df3f4bfa117884e61d315440d1b;p=thirdparty%2Fasterisk.git

Merged revisions 45040 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45040 | file | 2006-10-13 12:01:17 -0400 (Fri, 13 Oct 2006) | 2 lines

Complete merging in RPID screen changes (issue #8101 reported by hristo, patch by oej in revision 44757)

........


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 44dc0c2b7c..40c06614bc 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6303,11 +6303,11 @@ static void build_rpid(struct sip_pvt *p)
 		break;
 	case AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN:
 		privacy = "off";
-		screen = "pass";
+		screen = "yes";
 		break;
 	case AST_PRES_ALLOWED_USER_NUMBER_FAILED_SCREEN:
 		privacy = "off";
-		screen = "fail";
+		screen = "no";
 		break;
 	case AST_PRES_ALLOWED_NETWORK_NUMBER:
 		privacy = "off";
@@ -6319,15 +6319,15 @@ static void build_rpid(struct sip_pvt *p)
 		break;
 	case AST_PRES_PROHIB_USER_NUMBER_PASSED_SCREEN:
 		privacy = "full";
-		screen = "pass";
+		screen = "yes";
 		break;
 	case AST_PRES_PROHIB_USER_NUMBER_FAILED_SCREEN:
 		privacy = "full";
-		screen = "fail";
+		screen = "no";
 		break;
 	case AST_PRES_PROHIB_NETWORK_NUMBER:
 		privacy = "full";
-		screen = "pass";
+		screen = "yes";
 		break;
 	case AST_PRES_NUMBER_NOT_AVAILABLE:
 		send_pres_tags = FALSE;