[Asterisk-cvs] asterisk pbx.c,1.152,1.153

[markster at lists.digium.com]

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

Modified Files:
	pbx.c 
Log Message:
Make sure patterns are always last (bug #2435)


Index: pbx.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- pbx.c	9 Sep 2004 20:05:57 -0000	1.152
+++ pbx.c	14 Sep 2004 22:35:53 -0000	1.153
@@ -3830,7 +3830,13 @@
 	}
 	e = con->root;
 	while(e) {
-		res= strcmp(e->exten, extension);
+		/* Make sure patterns are always last! */
+		if ((e->exten[0] != '_') && (extension[0] == '_'))
+			res = -1;
+		else if ((e->exten[0] == '_') && (extension[0] != '_'))
+			res = 1;
+		else
+			res= strcmp(e->exten, extension);
 		if (!res) {
 			if (!e->matchcid && !tmp->matchcid)
 				res = 0;