isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FreeBSD has libutil.h not util.h

Browse Source
This commit is contained in:
Todd C. Miller
2011-09-21 09:52:33 -04:00
parent 441abee4e8
commit 4724e313e0
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@@ -314,6 +314,9 @@
/* Define to 1 if you have the <libintl.h> header file. */ /* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H #undef HAVE_LIBINTL_H
/* Define to 1 if you have the <libutil.h> header file. */
#undef HAVE_LIBUTIL_H
/* Define to 1 to enable Linux audit support. */ /* Define to 1 to enable Linux audit support. */
#undef HAVE_LINUX_AUDIT #undef HAVE_LINUX_AUDIT

4
configure vendored
View File

@@ -16345,7 +16345,7 @@ if test "x$ac_cv_func_openpty" = xyes; then :
cat >>confdefs.h <<_ACEOF cat >>confdefs.h <<_ACEOF
#define HAVE_OPENPTY 1 #define HAVE_OPENPTY 1
_ACEOF _ACEOF
for ac_header in util.h pty.h for ac_header in libutil.h util.h pty.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -16398,7 +16398,7 @@ fi
$as_echo "$ac_cv_lib_util_openpty" >&6; } $as_echo "$ac_cv_lib_util_openpty" >&6; }
if test "x$ac_cv_lib_util_openpty" = xyes; then : if test "x$ac_cv_lib_util_openpty" = xyes; then :
for ac_header in util.h pty.h for ac_header in libutil.h util.h pty.h
do : do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"

4
configure.in
View File

@@ -2086,9 +2086,9 @@ if test "$utmp_style" = "LEGACY"; then
AC_CHECK_FUNCS(getttyent ttyslot, [break]) AC_CHECK_FUNCS(getttyent ttyslot, [break])
fi fi
AC_CHECK_FUNCS(openpty, [AC_CHECK_HEADERS(util.h pty.h, [break])], [ AC_CHECK_FUNCS(openpty, [AC_CHECK_HEADERS(libutil.h util.h pty.h, [break])], [
AC_CHECK_LIB(util, openpty, [ AC_CHECK_LIB(util, openpty, [
AC_CHECK_HEADERS(util.h pty.h, [break]) AC_CHECK_HEADERS(libutil.h util.h pty.h, [break])
case "$SUDO_LIBS" in case "$SUDO_LIBS" in
*-lutil*) ;; *-lutil*) ;;
*) SUDO_LIBS="${SUDO_LIBS} -lutil";; *) SUDO_LIBS="${SUDO_LIBS} -lutil";;

4
src/get_pty.c
View File

@@ -46,7 +46,9 @@
#include <grp.h> #include <grp.h>
#include <pwd.h> #include <pwd.h>
#ifdef HAVE_UTIL_H #if defined(HAVE_LIBUTIL_H)
# include <libutil.h>
#elif defined(HAVE_UTIL_H)
# include <util.h> # include <util.h>
#endif #endif
#ifdef HAVE_PTY_H #ifdef HAVE_PTY_H