diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-24 16:17:26 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-24 16:17:26 +0000 |
| commit | e770d2a13344fa0b805616f19ee32c58d65e9d3d (patch) | |
| tree | 59d0e2a9b82fdc0fa49287fb37b8b8da23401d22 /channels | |
| parent | 4ffc2ae9570837cd7df9a42bec29eb9600091cb7 (diff) | |
respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@29969 f38db490-d61c-443f-a65b-d21fe96a405b
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 847063a5b..c167db2ba 100644 --- a/channels/chan_zap.c +++ b/channels/chan_zap.c @@ -2119,9 +2119,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 |