diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-16 23:52:51 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-01-16 23:52:51 +0000 |
| commit | 97ef58e4eb400708e2f3fcac5f2c6a38b5e28313 (patch) | |
| tree | 22835d95b692bfeb1576a04072b5827b1f9386a8 /asterisk.c | |
| parent | f9f9769502cd1c792285c0503cb3e3b2f731d1b6 (diff) | |
check rlimit _after_ reading config file, so that if 'dumpcore' is specified there it will take effect
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@8114 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'asterisk.c')
| -rw-r--r-- | asterisk.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asterisk.c b/asterisk.c index ca75659ed..f9e8716f7 100644 --- a/asterisk.c +++ b/asterisk.c @@ -2129,6 +2129,10 @@ int main(int argc, char *argv[]) } } + if (ast_opt_console && !option_verbose) + ast_verbose("[ Reading Master Configuration ]"); + ast_readconfig(); + if (ast_opt_dump_core) { struct rlimit l; memset(&l, 0, sizeof(l)); @@ -2139,10 +2143,6 @@ int main(int argc, char *argv[]) } } - if (ast_opt_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)) |