[Asterisk-cvs] asterisk/apps app_directory.c,1.42,1.43

[kpfleming]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv7114/apps

Modified Files:
	app_directory.c 
Log Message:
revert a portion of issue #5138 which broke this app (issue #5232)


Index: app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- app_directory.c	14 Sep 2005 20:46:49 -0000	1.42
+++ app_directory.c	15 Sep 2005 00:56:09 -0000	1.43
@@ -300,8 +300,11 @@
 		return -1;
 	}
 	if (digit == '0') {
-		if (ast_goto_if_exists(chan, chan->context, "o", 1) || 
-			 (!ast_strlen_zero(chan->macrocontext) && ast_goto_if_exists(chan, chan->macrocontext, "o", 1))) {
+		if (ast_exists_extension(chan,chan->context,"o",1,chan->cid.cid_num) || 
+		    (!ast_strlen_zero(chan->macrocontext) &&
+		     ast_exists_extension(chan, chan->macrocontext, "o", 1, chan->cid.cid_num))) {
+			strcpy(chan->exten, "o");
+			chan->priority = 0;
 			return 0;
 		} else {
 
@@ -311,8 +314,11 @@
 		}
 	}	
 	if (digit == '*') {
-		if (ast_goto_if_exists(chan, chan->context, "a", 1) || 
-			 (!ast_strlen_zero(chan->macrocontext) && ast_goto_if_exists(chan, chan->macrocontext, "a", 1))) {
+		if (ast_exists_extension(chan,chan->context,"a",1,chan->cid.cid_num) || 
+		    (!ast_strlen_zero(chan->macrocontext) &&
+		     ast_exists_extension(chan, chan->macrocontext, "a", 1, chan->cid.cid_num))) {
+			strcpy(chan->exten, "a");
+			chan->priority = 0;
 			return 0;
 		} else {
 			ast_log(LOG_WARNING, "Can't find extension 'a' in current context.  "