diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-07-12 04:24:43 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-12 04:24:43 -0500 |
| commit | 95b35cb1cba9cfa6aebca9fc2eccc25138526f44 (patch) | |
| tree | df86f72077486c80ced808eadcfc6a4fbe3873d3 /main | |
| parent | fbcfa6b4b24834e155585ab2d2255da33e762f2c (diff) | |
| parent | d58ef31acd94217ad51a8b91bb1a3e02fb2579af (diff) | |
Merge "Avoid setting maxfiles for a remote asterisk"
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 3e16d6950..04298385a 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3681,7 +3681,9 @@ static void ast_readconfig(void) /* Set the maximum amount of open files */ } else if (!strcasecmp(v->name, "maxfiles")) { ast_option_maxfiles = atoi(v->value); - set_ulimit(ast_option_maxfiles); + if (!ast_opt_remote) { + set_ulimit(ast_option_maxfiles); + } /* What user to run as */ } else if (!strcasecmp(v->name, "runuser")) { ast_copy_string(cfg_paths.run_user, v->value, sizeof(cfg_paths.run_user)); |