Attachment 6269 Details for Bug 7898 – s3-param: Make "rlimit_max below minimum Windows limit" notification less scary

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

less-scary-rlimit_max-notification.patch (text/plain), 1.46 KB, created by Jonathan Nieder on 2011-02-24 16:47:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Nieder

Created: 2011-02-24 16:47:25 UTC

Size: 1.46 KB

patch

obsolete

>From: Jonathan Nieder <jrnieder@gmail.com>
>Date: Sun, 2 Jan 2011 02:40:09 -0600
>Subject: [PATCH] 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>
>---
> source3/param/loadparm.c |    4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
>index 8a3d867..284f40a 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));
>-- 
>1.7.4.1
>

Actions: View

Attachments on bug 7898: 6269