Build status as of Mon Feb 23 00:00:01 2009

[build]

URL: http://build.samba.org/

--- /home/build/master/cache/broken_results.txt.old 2009-02-22 
00:00:13.0 +
+++ /home/build/master/cache/broken_results.txt 2009-02-23 00:00:28.0 
+
@@ -1,22 +1,22 @@
-Build status as of Sun Feb 22 00:00:02 2009
+Build status as of Mon Feb 23 00:00:01 2009
 
 Build counts:
 Tree Total  Broken Panic 
 build_farm   0  0  0 
-ccache   28 5  0 
+ccache   29 5  0 
 ctdb 0  0  0 
 distcc   0  0  0 
 ldb  29 28 0 
 libreplace   29 11 0 
-lorikeet-heimdal 26 14 0 
+lorikeet-heimdal 25 14 0 
 pidl 20 3  0 
 ppp  12 0  0 
-rsync28 9  0 
+rsync29 9  0 
 samba-docs   0  0  0 
 samba-gtk5  5  0 
-samba_3_X_devel 28 27 2 
+samba_3_X_devel 28 27 1 
 samba_3_X_test 27 25 3 
-samba_4_0_test 29 26 1 
+samba_4_0_test 27 26 1 
 smb-build28 6  0 
 talloc   29 28 0 
 tdb  27 9  0 

[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-1072-gac0d452

[Steven Danneman]

The branch, master has been updated
   via  ac0d452ac64cae90645ad49b1bb04f2e8bf89c9b (commit)
  from  4e5997736c6e173ddfd735239ac5c77d2353a5f6 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -
commit ac0d452ac64cae90645ad49b1bb04f2e8bf89c9b
Author: Steven Danneman steven.danne...@isilon.com
Date:   Sun Feb 22 21:55:25 2009 -0800

s3: Wrap usage of rlimit in configure checks

---

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


Changeset truncated at 500 lines:

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index e50ab92..89c706d 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -4656,32 +4656,31 @@ static void init_printer_values(struct service 
*pService)
 static int max_open_files(void)
 {
int sysctl_max = MAX_OPEN_FILES;
-   struct rlimit rl;
-   bool sysctl_worked = false, rlimit_worked = false;
+   int rlimit_max = MAX_OPEN_FILES;
 
 #ifdef HAVE_SYSCTLBYNAME
-   size_t size = sizeof(sysctl_max);
-   if (sysctlbyname(kern.maxfilesperproc, sysctl_max, size, NULL,0)==0)
-   sysctl_worked = true;
+   {
+   size_t size = sizeof(sysctl_max);
+   sysctlbyname(kern.maxfilesperproc, sysctl_max, size, NULL,
+0);
+   }
 #endif
 
-   if (getrlimit(RLIMIT_NOFILE, rl) == 0)
-   rlimit_worked = true;
+#if (defined(HAVE_GETRLIMIT)  defined(RLIMIT_NOFILE))
+   {
+   struct rlimit rl = {};
 
-   if (sysctl_worked) {
-   if ((!rlimit_worked) ||
-   (rl.rlim_cur == RLIM_INFINITY) ||
-   (rl.rlim_cur  sysctl_max))
-   return sysctl_max;
-   else
-   return rl.rlim_cur;
-   } else {
-   if ((!rlimit_worked) ||
-   (rl.rlim_cur == RLIM_INFINITY))
-   return MAX_OPEN_FILES;
-   else
-   return rl.rlim_cur;
+   if (getrlimit(RLIMIT_NOFILE, rl) == 0)
+   rlimit_max = rl.rlim_cur;
+
+#if defined(RLIM_INFINITY)
+   if(rl.rlim_cur == RLIM_INFINITY)
+   rlimit_max = MAX_OPEN_FILES;
}
+#endif
+#endif
+
+   return MIN(sysctl_max, rlimit_max);
 }
 
 /**


-- 
Samba Shared Repository