Make RDNIS really work right

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2456 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 4 insertions, 1 deletions

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 521903785..eb5419bcf 100755
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -224,7 +224,10 @@ static struct ast_channel *wait_for_answer(struct ast_channel *in, struct localu
 						}
 						if (o->chan->rdnis) 
 							free(o->chan->rdnis);
-						in->rdnis = strdup(in->exten);
+						if (strlen(in->macroexten))
+							o->chan->rdnis = strdup(in->macroexten);
+						else
+							o->chan->rdnis = strdup(in->exten);
 						if (ast_call(o->chan, tmpchan, 0)) {
 							ast_log(LOG_NOTICE, "Failed to dial on local channel for call forward to '%s'\n", tmpchan);
 							o->stillgoing = 0;