automerge commit

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

diff --git a/channels/chan_local.c b/channels/chan_local.c
index f843fd95d5cb02731a38f161a213ecd66735ebe0..14ef083f64a270d108656c8b95099498fba0612a 100644 (file)
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -344,6 +344,8 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
        else
                p->chan->cid.cid_ani = NULL;
 
+       p->chan->cid.cid_pres = p->owner->cid.cid_pres;
+
        strncpy(p->chan->language, p->owner->language, sizeof(p->chan->language) - 1);
        strncpy(p->chan->accountcode, p->owner->accountcode, sizeof(p->chan->accountcode) - 1);
        p->chan->cdrflags = p->owner->cdrflags;