diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-05-24 16:19:57 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-05-24 16:19:57 +0000 |
| commit | 11d13e1d4bddf963cc5871616d3ca7121400a574 (patch) | |
| tree | b4a7ccb3b8408b603d640e5b5a9b81ebccb9f60a /channels | |
| parent | 8122c35675e8fba60ed6077595f3afa0fc9065ce (diff) | |
Merged revisions 29969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r29969 | kpfleming | 2006-05-24 11:17:26 -0500 (Wed, 24 May 2006) | 2 lines
respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29970 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_zap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c index 771470e62..60b24e791 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2097,9 +2097,8 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout) prilocaldialplan = PRI_LOCAL_ISDN; } } - pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan, - l ? (p->use_callingpres ? ast->cid.cid_pres : PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN) : - PRES_NUMBER_NOT_AVAILABLE); + pri_sr_set_caller(sr, l ? (l + ldp_strip) : NULL, n, prilocaldialplan, + p->use_callingpres ? ast->cid.cid_pres : (l ? PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN : PRES_NUMBER_NOT_AVAILABLE)); pri_sr_set_redirecting(sr, ast->cid.cid_rdnis, p->pri->localdialplan - 1, PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN, PRI_REDIR_UNCONDITIONAL); #ifdef SUPPORT_USERUSER |