From: Tzafrir Cohen Date: Mon, 3 Jul 2017 12:30:37 +0000 (+0300) Subject: Avoid setting maxfiles for a remote asterisk X-Git-Tag: 13.18.0-rc1~139 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f2f3bfebfb3a49a0fe407aaba6608114f8bd0bf;p=thirdparty%2Fasterisk.git Avoid setting maxfiles for a remote asterisk Setting maxfiles (maximum number of open files) has no practical effect on a remote asterisk (rasterisk, rasterisk -x). It has an ill effect of printing an extra message, which may be annoying in case of -x. ASTERISK-27105 #close Change-Id: Iaf9eb344e4b4b517df91b736b27ec55f6a6921a2 --- diff --git a/main/asterisk.c b/main/asterisk.c index e2562764aa..ac078dd7ac 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -3811,7 +3811,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));