From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 2 Jun 2008 20:08:24 +0000 (+0000)
Subject: Merged revisions 119838 via svnmerge from
X-Git-Tag: 1.6.2.0-beta1~2100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d6240ac21eb798f1c7cee4e72fbb1b5f730d4ffa;p=thirdparty%2Fasterisk.git

Merged revisions 119838 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r119838 | russell | 2008-06-02 15:08:04 -0500 (Mon, 02 Jun 2008) | 7 lines

Revert a change made for issue #12479.  This change caused a regression such that
a dial string such as (IAX2/foo) did not automatically fall back to dialing the 's'
extension anymore.

(closes issue #12770)
Reported by: dagmoller

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@119839 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 58f52f4961..dd465365be 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -3511,10 +3511,7 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
 	}
 
 	if (!pds.exten) {
-		if (!ast_strlen_zero(c->exten))
-			pds.exten = c->exten;
-		else
-			pds.exten = defaultrdest;
+		pds.exten = defaultrdest;
 	}
 
 	if (create_addr(pds.peer, c, &sin, &cai)) {