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.
(cherry picked from commit 9c86a96af381f2826456f91eb99073c9fca633de)

diff --git a/source3/configure.in b/source3/configure.in
index 40923c6c252a66a0443eca5f617fb669eb463777..74012ed7a3d77c76e5ca378da4d5b70118ba3948 100644 (file)
--- 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 51fc53bb0d17d90c2fe69b1d7e55135ec11e676f..bf61bb26c43ca8fa7e0bf3b4ba12b6c41872d8a6 100644 (file)
--- 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 4fd25c15bf0046d7e0c698f64753999af80039b9..4bd48abfdaef3506994769643d60d4a4f1f95c41 100644 (file)
--- 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;