[svn-commits] branch 1.2 - r8112 /branches/1.2/asterisk.c

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Mon Jan 16 17:51:37 2006
New Revision: 8112

URL: http://svn.digium.com/view/asterisk?rev=8112&view=rev
Log:
do rlimit check _after_ reading config file, in case 'dumpcore' is specified there

Modified:
    branches/1.2/asterisk.c

Modified: branches/1.2/asterisk.c
URL: http://svn.digium.com/view/asterisk/branches/1.2/asterisk.c?rev=8112&r1=8111&r2=8112&view=diff
==============================================================================
--- branches/1.2/asterisk.c (original)
+++ branches/1.2/asterisk.c Mon Jan 16 17:51:37 2006
@@ -2138,6 +2138,10 @@
 		}
 	}
 
+	if (option_console && !option_verbose) 
+		ast_verbose("[ Reading Master Configuration ]");
+	ast_readconfig();
+
 	if (option_dumpcore) {
 		struct rlimit l;
 		memset(&l, 0, sizeof(l));
@@ -2147,10 +2151,6 @@
 			ast_log(LOG_WARNING, "Unable to disable core size resource limit: %s\n", strerror(errno));
 		}
 	}
-
-	if (option_console && !option_verbose) 
-		ast_verbose("[ Reading Master Configuration ]");
-	ast_readconfig();
 
 	if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP))
 		rungroup = ast_config_AST_RUN_GROUP;