[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  7b047e3 s3-param: Make "rlimit_max below minimum Windows limit" notification less scary
      from  59cddbd Detect Mac OS X as a separate client type. (cherry picked from commit 8dcdebe6ea5a1f2074a60ead803379fcd22df549)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 7b047e3f0d27771996df0ad1435816405c38b80d
Author: Jonathan Nieder <jrnieder at gmail.com>
Date:   Sun Jan 2 02:40:09 2011 -0600

    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 at sapo.pt>
    Signed-off-by: Jonathan Nieder <jrnieder at gmail.com>

-----------------------------------------------------------------------

Summary of changes:
 source3/param/loadparm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

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));


-- 
Samba Shared Repository