From: Olle Johansson <oej@edvina.net>
Date: Thu, 26 Oct 2006 20:06:55 +0000 (+0000)
Subject: Issue #7240, by mistake only committed to trunk (now 1.4), reported by
X-Git-Tag: 1.2.14~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a5dd9d78ba31409c0db37bf1400de84e39a6514;p=thirdparty%2Fasterisk.git

Issue #7240, by mistake only committed to trunk (now 1.4), reported by
edgreenberg in Issue #7966. Thanks Ed!


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c35eedcf93..c2063bb8d9 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7261,7 +7261,8 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
 			p->amaflags = user->amaflags;
 			p->callgroup = user->callgroup;
 			p->pickupgroup = user->pickupgroup;
-			p->callingpres = user->callingpres;
+			if (user->callingpres)
+				p->callingpres = user->callingpres;
 			p->capability = user->capability;
 			p->jointcapability = user->capability;
 			if (p->peercapability)
@@ -7324,7 +7325,8 @@ static int check_user_full(struct sip_pvt *p, struct sip_request *req, int sipme
 			ast_copy_string(p->subscribecontext, peer->subscribecontext, sizeof(p->subscribecontext));
 			ast_copy_string(p->peermd5secret, peer->md5secret, sizeof(p->peermd5secret));
 			p->peermd5secret[sizeof(p->peermd5secret)-1] = '\0';
-			p->callingpres = peer->callingpres;
+			if (peer->callingpres)
+				p->callingpres = peer->callingpres;
 			if (peer->maxms && peer->lastms)
 				p->timer_t1 = peer->lastms;
 			if (ast_test_flag(peer, SIP_INSECURE_INVITE)) {