Merged revisions 119839 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
r119839 | russell | 2008-06-02 15:08:24 -0500 (Mon, 02 Jun 2008) | 15 lines

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/branches/1.6.0@119840 65c4cc65-6c06-0410-ace0-fbb531ad65f3

channels/chan_iax2.c

@@ -3487,10 +3487,7 @@ static int iax2_call(struct ast_channel *c, char *dest, int timeout)
 	}
 
 	if (!pds.exten) {
-		if (!ast_strlen_zero(c->exten))
+		pds.exten = defaultrdest;
-			pds.exten = c->exten;
-		else
-			pds.exten = defaultrdest;
 	}
 
 	if (create_addr(pds.peer, c, &sin, &cai)) {