From 57144d5102bd97da9641d6bc6f5ed3b42caa9ead Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Mon, 16 Jan 2006 23:51:37 +0000 Subject: [PATCH] do rlimit check _after_ reading config file, in case 'dumpcore' is specified there git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2@8112 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- asterisk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/asterisk.c b/asterisk.c index 2bfbf452a9..c7ed468608 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2138,6 +2138,10 @@ int main(int argc, char *argv[]) } } + if (option_console && !option_verbose) + ast_verbose("[ Reading Master Configuration ]"); + ast_readconfig(); + if (option_dumpcore) { struct rlimit l; memset(&l, 0, sizeof(l)); @@ -2148,10 +2152,6 @@ int main(int argc, char *argv[]) } } - 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; if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER))