summaryrefslogtreecommitdiff
path: root/source3/param
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2011-01-02 02:40:09 -0600
committerJeremy Allison <jra@samba.org>2011-02-25 03:56:40 +0100
commit1fbb3f25e972f81aa8322ca69371956789572aea (patch)
tree2202141ae1e56d0cc1ab43153544f903df3444e7 /source3/param
parent98052db487c4b9f8375e101883cde4ac814b7885 (diff)
downloadsamba-1fbb3f25e972f81aa8322ca69371956789572aea.tar.gz
samba-1fbb3f25e972f81aa8322ca69371956789572aea.tar.bz2
samba-1fbb3f25e972f81aa8322ca69371956789572aea.zip
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
Diffstat (limited to 'source3/param')
-rw-r--r--source3/param/loadparm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 8a3d86731b..284f40acc0 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -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));