s4:heimdal: fix build on FreeBSD

Patch from Timur I. Bakeyev sent to samba-technical:

Heimdal requires openpty() presence. FreeBSD has in in standard libc, so
autodetection works, but compilation fails, as declaration of this function is
missing.

This patch adds proper header detection and inclusion for openpty().

diff --git a/source4/heimdal/lib/roken/rkpty.c b/source4/heimdal/lib/roken/rkpty.c
index 309469722b8295c5f4a52f94b05f4daf5f601413..ebc3a5d208c5723b7a63a135d76841161c9552d4 100644 (file)
--- a/source4/heimdal/lib/roken/rkpty.c
+++ b/source4/heimdal/lib/roken/rkpty.c
@@ -48,6 +48,9 @@
 #ifdef HAVE_UTIL_H
 #include <util.h>
 #endif
+#ifdef HAVE_LIBUTIL_H
+#include <libutil.h>
+#endif
 
 #include "roken.h"
 #include <getarg.h>

diff --git a/source4/heimdal_build/internal.m4 b/source4/heimdal_build/internal.m4
index 4cd7521c3781f02082357b2334f1de4169598fd7..5c8d78e56d0346f7b486636924656b5abcfddaa7 100644 (file)
--- a/source4/heimdal_build/internal.m4
+++ b/source4/heimdal_build/internal.m4
@@ -52,7 +52,6 @@ AC_CHECK_HEADERS([                            \
        errno.h                                 \
        inttypes.h                              \
        netdb.h                                 \
-       pty.h                                   \
        signal.h                                \
        sys/bswap.h                             \
        sys/file.h                              \
@@ -164,6 +163,7 @@ m4_include(heimdal/cf/find-func-no-libs.m4)
 m4_include(heimdal/cf/find-func-no-libs2.m4)
 m4_include(heimdal/cf/resolv.m4)
 
+AC_CHECK_HEADERS([pty.h util.h libutil.h])
 
 AC_CHECK_LIB_EXT(util, OPENPTY_LIBS, openpty)