diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | includes.h | 6 | ||||
-rw-r--r-- | loginrec.c | 4 | ||||
-rw-r--r-- | mux.c | 4 | ||||
-rw-r--r-- | sftp.c | 4 |
6 files changed, 12 insertions, 17 deletions
@@ -1,3 +1,8 @@ +20120223 + - (djm) [configure.ac includes.h loginrec.c mux.c sftp.c] Prefer + bsd/libutil.h to libutil.h to avoid deprecation warnings on Ubuntu. + ok tim + 20120222 - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to ssh(1) since they're not needed. Patch from Pierre Ossman, ok djm. diff --git a/configure.ac b/configure.ac index e526390f..3ea3f8a3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.508 2013/02/22 00:37:00 djm Exp $ +# $Id: configure.ac,v 1.509 2013/02/22 22:12:24 djm Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) -AC_REVISION($Revision: 1.508 $) +AC_REVISION($Revision: 1.509 $) AC_CONFIG_SRCDIR([ssh.c]) AC_LANG([C]) @@ -1163,7 +1163,7 @@ AC_CHECK_FUNCS([utimes], ) dnl Checks for libutil functions -AC_CHECK_HEADERS([libutil.h]) +AC_CHECK_HEADERS([bsd/libutil.h libutil.h]) AC_SEARCH_LIBS([fmt_scaled], [util bsd]) AC_SEARCH_LIBS([login], [util bsd]) AC_SEARCH_LIBS([logout], [util bsd]) @@ -137,8 +137,10 @@ # include <tmpdir.h> #endif -#ifdef HAVE_LIBUTIL_H -# include <libutil.h> /* Openpty on FreeBSD at least */ +#if defined(HAVE_BSD_LIBUTIL_H) +# include <bsd/libutil.h> +#elif defined(HAVE_LIBUTIL_H) +# include <libutil.h> #endif #if defined(KRB5) && defined(USE_AFS) @@ -180,10 +180,6 @@ # include <util.h> #endif -#ifdef HAVE_LIBUTIL_H -# include <libutil.h> -#endif - /** ** prototypes for helper functions in this file **/ @@ -63,10 +63,6 @@ # include <util.h> #endif -#ifdef HAVE_LIBUTIL_H -# include <libutil.h> -#endif - #include "openbsd-compat/sys-queue.h" #include "xmalloc.h" #include "log.h" @@ -54,10 +54,6 @@ typedef void EditLine; # include <util.h> #endif -#ifdef HAVE_LIBUTIL_H -# include <libutil.h> -#endif - #include "xmalloc.h" #include "log.h" #include "pathnames.h" |