From 0e83c804802f39b653de8afa413cc70338483e29 Mon Sep 17 00:00:00 2001
From: Jason Parker <jparker@digium.com>
Date: Fri, 17 Aug 2007 17:45:01 +0000
Subject: [PATCH] Merged revisions 79902 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10485)
........
r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines

Re-add the setting of callerid name and number.

Issue 10485, reported by and fix explained by paradise.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@79903 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 channels/chan_local.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/channels/chan_local.c b/channels/chan_local.c
index 46015a14e1..17d6b7f4be 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -453,6 +453,12 @@ static int local_call(struct ast_channel *ast, char *dest, int timeout)
 	
 	ast_mutex_lock(&p->lock);
 
+	/*
+	 * Note that cid_num and cid_name aren't passed in the ast_channel_alloc
+	 * call, so it's done here instead.
+	 */
+	p->chan->cid.cid_num = ast_strdup(p->owner->cid.cid_num);
+	p->chan->cid.cid_name = ast_strdup(p->owner->cid.cid_name);
 	p->chan->cid.cid_rdnis = ast_strdup(p->owner->cid.cid_rdnis);
 	p->chan->cid.cid_ani = ast_strdup(p->owner->cid.cid_ani);
 	p->chan->cid.cid_pres = p->owner->cid.cid_pres;
-- 
GitLab