[SCM] Samba Shared Repository - branch master updated - tevent-0-9-8-309-gf410d23

[Björn Jacke]

The branch, master has been updated
       via  f410d23185f5c81dbc111285ea0ba9daf5fc111d (commit)
      from  24309bdb2efca36375f3c833f72ebec3908d31fd (commit)

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


- Log -----------------------------------------------------------------
commit f410d23185f5c81dbc111285ea0ba9daf5fc111d
Author: Björn Jacke <bj at sernet.de>
Date:   Tue Sep 15 06:48:49 2009 +0200

    s3: BSD needs sys/sysctl.h included to build properly
    
    FreeBSD (and other BSDs, too) need sys/sysctl.h inclueded to use sysctlbyname().
    
    Thanks to Timur Bakeyev for that.

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

Summary of changes:
 source3/configure.in     |    2 +-
 source3/lib/fault.c      |    5 +++++
 source3/param/loadparm.c |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 3255751..4eaebca 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -652,7 +652,7 @@ AC_CHECK_HEADERS(aio.h sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h
 AC_CHECK_HEADERS(unistd.h grp.h sys/id.h memory.h alloca.h)
 AC_CHECK_HEADERS(limits.h float.h pthread.h libintl.h)
 AC_CHECK_HEADERS(rpc/rpc.h rpcsvc/nis.h rpcsvc/ypclnt.h)
-AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h)
+AC_CHECK_HEADERS(sys/param.h ctype.h sys/wait.h sys/resource.h sys/ioctl.h sys/ipc.h sys/prctl.h sys/sysctl.h)
 AC_CHECK_HEADERS(sys/mman.h sys/filio.h sys/priv.h sys/shm.h string.h strings.h stdlib.h)
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs/s5param.h sys/filsys.h termios.h termio.h)
 AC_CHECK_HEADERS(sys/termio.h sys/statfs.h sys/dustat.h sys/statvfs.h stdarg.h)
diff --git a/source3/lib/fault.c b/source3/lib/fault.c
index 51fc53b..bf61bb2 100644
--- a/source3/lib/fault.c
+++ b/source3/lib/fault.c
@@ -20,6 +20,11 @@
 
 #include "includes.h"
 
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+
+
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c91f676..b278b96 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -54,6 +54,10 @@
 #include "includes.h"
 #include "printing.h"
 
+#ifdef HAVE_SYS_SYSCTL_H
+#include <sys/sysctl.h>
+#endif
+
 #ifdef HAVE_HTTPCONNECTENCRYPT
 #include <cups/http.h>
 #endif


-- 
Samba Shared Repository