kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-08-30 19:03:07 +00:00
parent 008cf36d00
commit aada1f902b
9 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_local.c
View File

@@ -339,7 +339,7 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
ast_set_callerid(p->chan,
p->owner->cid.cid_num, p->owner->cid.cid_name,
p->owner->cid.cid_ani ? p->chan->cid.cid_ani : p->owner->cid.cid_num);
p->owner->cid.cid_ani);
if (p->owner->cid.cid_rdnis)
p->chan->cid.cid_rdnis = strdup(p->owner->cid.cid_rdnis);