automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38927 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 1 deletions

diff --git a/channels/chan_vpb.c b/channels/chan_vpb.c
index f735e3d16..0b067124b 100644
--- a/channels/chan_vpb.c
+++ b/channels/chan_vpb.c
@@ -2647,7 +2647,12 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, int state, char *context)
 			cid_name[0] = '\0';
 			cid_num[0] = '\0';
 			ast_callerid_split(me->callerid, cid_name, sizeof(cid_name), cid_num, sizeof(cid_num));
-			ast_set_callerid(tmp, cid_num, cid_name, cid_num);
+			if (!ast_strlen_zero(cid_num)) {
+				tmp->cid.cid_num = strdup(cid_num);
+				tmp->cid.cid_ani = strdup(cid_num);
+			}
+			if (!ast_strlen_zero(cid_name))
+				tmp->cid.cid_name = strdup(cid_name);
 		}
 		tmp->tech_pvt = me;