From: Alec L Davis <sivad.a@paradise.net.nz>
Date: Tue, 15 Dec 2009 02:42:33 +0000 (+0000)
Subject: Merged revisions 234893 via svnmerge from
X-Git-Tag: 1.6.1.13-rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91ce233c22c3708033ee5e5a3b0d3df46addb28e;p=thirdparty%2Fasterisk.git

Merged revisions 234893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r234893 | alecdavis | 2009-12-15 15:29:50 +1300 (Tue, 15 Dec 2009) | 9 lines

  fixes escape to extensions 'o' and 'a', for digits '0' and '*'

  (closes issue #16437)
  Reported by: alecdavis
  Tested by: alecdavis
  Patch
  	extension_o_a_fix.diff.txt uploaded by alecdavis (license 585)
........


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

diff --git a/apps/app_directory.c b/apps/app_directory.c
index 9e51bf2d47..a3dda4f17e 100644
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -578,11 +578,11 @@ static int do_directory(struct ast_channel *chan, struct ast_config *vmcfg, stru
 	}
 
 	if (digit == '0' && !goto_exten(chan, dialcontext, "o")) {
-		return 0;
+		return digit;
 	}
 
 	if (digit == '*' && !goto_exten(chan, dialcontext, "a")) {
-		return 0;
+		return digit;
 	}
 
 	ext[0] = digit;