[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1295-g9c86a96

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  9c86a96af381f2826456f91eb99073c9fca633de (commit)
      from  b22713717422b822c3b8fcba611fc01e262d52c9 (commit)

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


- Log -----------------------------------------------------------------
commit 9c86a96af381f2826456f91eb99073c9fca633de
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.
    
    Fix bug #6728.

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

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 40923c6..74012ed 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -695,7 +695,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 553938f..72c9950 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
+
 bool bLoaded = False;
 
 extern enum protocol_types Protocol;


-- 
Samba Shared Repository