s3-param: Make "rlimit_max below minimum Windows limit" notification less scary
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 2 Jan 2011 08:40:09 +0000 (02:40 -0600)
committerJeremy Allison <jra@samba.org>
Fri, 25 Feb 2011 02:06:43 +0000 (18:06 -0800)
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>
source3/param/loadparm.c

index 8a3d86731b45b0726361fa4241b06413e0899b5a..284f40acc016a8c46ba7714a3f7b6a1024f0c7f4 100644 (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));