From 4fa1b9b1b08e0f270e2e3a7432923ff497a7ac81 Mon Sep 17 00:00:00 2001 From: oej Date: Thu, 26 Oct 2006 20:06:55 +0000 Subject: Issue #7240, by mistake only committed to trunk (now 1.4), reported by edgreenberg in Issue #7966. Thanks Ed! git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@46344 f38db490-d61c-443f-a65b-d21fe96a405b --- channels/chan_sip.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'channels') diff --git a/channels/chan_sip.c b/channels/chan_sip.c index c35eedcf9..c2063bb8d 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)) { -- cgit v1.2.3