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

[Jeremy Allison]

The branch, v3-5-test has been updated
       via  776b519... Final part of the fix for 6837 - "Too many open files" when trying to access large number of files
      from  88d2eca3.. Add helpful debug of DACL for errors on ACL access. Jeremy. (cherry picked from commit b8c87c43dd9309b3d2fed5d5db5b38057a8e4e90)

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


- Log -----------------------------------------------------------------
commit 776b5192423d02cbdb861c7cb4af325d4958db34
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Dec 16 10:20:34 2009 -0800

    Final part of the fix for 6837 - "Too many open files" when trying to access large number of files
    
    Win7 needs a min of 16k file handles to work against a
    server.
    
    Jeremy.

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

Summary of changes:
 source3/include/local.h |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/local.h b/source3/include/local.h
index de54ea5..a88b17b 100644
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -56,17 +56,6 @@
 #define SYSLOG_FACILITY LOG_DAEMON
 #endif
 
-/* 
- * Default number of maximum open files per smbd. This is
- * also limited by the maximum available file descriptors
- * per process and can also be set in smb.conf as "max open files"
- * in the [global] section.
- */
-
-#ifndef MAX_OPEN_FILES
-#define MAX_OPEN_FILES 10000
-#endif
-
 /*
  * Fudgefactor required for open tdb's, etc.
  */
@@ -82,7 +71,18 @@
  */
 
 #ifndef MIN_OPEN_FILES_WINDOWS
-#define MIN_OPEN_FILES_WINDOWS 1050
+#define MIN_OPEN_FILES_WINDOWS 16384
+#endif
+
+/*
+ * Default number of maximum open files per smbd. This is
+ * also limited by the maximum available file descriptors
+ * per process and can also be set in smb.conf as "max open files"
+ * in the [global] section.
+ */
+
+#ifndef MAX_OPEN_FILES
+#define MAX_OPEN_FILES (MIN_OPEN_FILES_WINDOWS + MAX_OPEN_FUDGEFACTOR)
 #endif
 
 #define WORDMAX 0xFFFF


-- 
Samba Shared Repository