[Asterisk-cvs] asterisk config.c,1.36,1.37

markster at lists.digium.com markster at lists.digium.com
Sat Dec 11 15:06:36 CST 2004


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

Modified Files:
	config.c 
Log Message:
Restore ignoring missing include files (bug #2825)


Index: config.c
===================================================================
RCS file: /usr/cvsroot/asterisk/config.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- config.c	11 Dec 2004 05:16:30 -0000	1.36
+++ config.c	11 Dec 2004 20:03:42 -0000	1.37
@@ -303,8 +303,7 @@
 						if(arg && cur) {
 							ast_log(LOG_WARNING, "Including files with explicit config engine no longer permitted.  Please use extconfig.conf to specify all mappings\n");
 						} else {
-							if (!__ast_load(cur, tmp, _tmpc, _last, includelevel + 1))
-								return -1;
+							__ast_load(cur, tmp, _tmpc, _last, includelevel + 1);
 						}
 					} else
 						ast_log(LOG_WARNING, "Maximum Include level (%d) exceeded\n", includelevel);




More information about the svn-commits mailing list