diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-16 23:51:37 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-01-16 23:51:37 +0000 |
| commit | cbb0eac48210eae9de5c79493e36a21f73d1ecfb (patch) | |
| tree | 83ed5ff37245aba46fe40c15fe6e17344cd34c2c /asterisk.c | |
| parent | 0eb552742489bf71808edddcd83f98ff8e545f03 (diff) | |
do rlimit check _after_ reading config file, in case 'dumpcore' is specified there
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@8112 f38db490-d61c-443f-a65b-d21fe96a405b
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 2bfbf452a..c7ed46860 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)) |