1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

s3-param: Make "rlimit_max below minimum Windows limit" notification less scary

The fix to bug #6837 results in messages from testparm that look
like a misconfiguration even though they aren't:

 rlimit_max: rlimit_max (8192) below minimum Windows limit (16384)

Apply a slight change in wording ("increasing rlimit_max to minimum
Windows limit") to make it clearer that the user has done nothing
wrong.  (Similarly for sysctl_max.)

Reported-by: Miguel Medalha <miguelmedalha@sapo.pt>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Feb 25 03:56:40 CET 2011 on sn-devel-104
This commit is contained in:
Jonathan Nieder 2011-01-02 02:40:09 -06:00 committed by Jeremy Allison
parent 98052db487
commit 1fbb3f25e9

View File

@ -4908,7 +4908,7 @@ static int max_open_files(void)
#endif
if (sysctl_max < MIN_OPEN_FILES_WINDOWS) {
DEBUG(2,("max_open_files: sysctl_max (%d) below "
DEBUG(2,("max_open_files: increasing sysctl_max (%d) to "
"minimum Windows limit (%d)\n",
sysctl_max,
MIN_OPEN_FILES_WINDOWS));
@ -4916,7 +4916,7 @@ static int max_open_files(void)
}
if (rlimit_max < MIN_OPEN_FILES_WINDOWS) {
DEBUG(2,("rlimit_max: rlimit_max (%d) below "
DEBUG(2,("rlimit_max: increasing rlimit_max (%d) to "
"minimum Windows limit (%d)\n",
rlimit_max,
MIN_OPEN_FILES_WINDOWS));