[Asterisk-cvs] asterisk/pbx pbx_config.c,1.45.2.2,1.45.2.3

[russell at lists.digium.com]

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

Modified Files:
      Tag: v1-0
	pbx_config.c 
Log Message:
fix callerid matching in extensions.conf
formatting fixes for the ChangeLog


Index: pbx_config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/pbx/pbx_config.c,v
retrieving revision 1.45.2.2
retrieving revision 1.45.2.3
diff -u -d -r1.45.2.2 -r1.45.2.3
--- pbx_config.c	19 May 2005 02:51:00 -0000	1.45.2.2
+++ pbx_config.c	29 Jun 2005 21:02:35 -0000	1.45.2.3
@@ -1687,15 +1687,10 @@
 								else
 									data = "";
 							}
-							pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);	
-							cidmatch = strchr(ext, '/');
-							if (cidmatch) {
-								*cidmatch = '\0';
-								cidmatch++;
-							}
-							stringp=ext;
-							strsep(&stringp, "/");
-
+							pbx_substitute_variables_helper(NULL, ext, realext, sizeof(realext)-1);
+							stringp = realext;
+							ext = strsep(&stringp, "/");
+							cidmatch = stringp;
 							if (!data)
 								data="";
 							while(*appl && (*appl < 33)) appl++;