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 @@ | |||
1 | 20120223 | ||
2 | - (djm) [configure.ac includes.h loginrec.c mux.c sftp.c] Prefer | ||
3 | bsd/libutil.h to libutil.h to avoid deprecation warnings on Ubuntu. | ||
4 | ok tim | ||
5 | |||
1 | 20120222 | 6 | 20120222 |
2 | - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to | 7 | - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to |
3 | ssh(1) since they're not needed. Patch from Pierre Ossman, ok djm. | 8 | ssh(1) since they're not needed. Patch from Pierre Ossman, ok djm. |
diff --git a/configure.ac b/configure.ac index e526390f7..3ea3f8a35 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.ac,v 1.508 2013/02/22 00:37:00 djm Exp $ | 1 | # $Id: configure.ac,v 1.509 2013/02/22 22:12:24 djm Exp $ |
2 | # | 2 | # |
3 | # Copyright (c) 1999-2004 Damien Miller | 3 | # Copyright (c) 1999-2004 Damien Miller |
4 | # | 4 | # |
@@ -15,7 +15,7 @@ | |||
15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
16 | 16 | ||
17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) | 17 | AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org]) |
18 | AC_REVISION($Revision: 1.508 $) | 18 | AC_REVISION($Revision: 1.509 $) |
19 | AC_CONFIG_SRCDIR([ssh.c]) | 19 | AC_CONFIG_SRCDIR([ssh.c]) |
20 | AC_LANG([C]) | 20 | AC_LANG([C]) |
21 | 21 | ||
@@ -1163,7 +1163,7 @@ AC_CHECK_FUNCS([utimes], | |||
1163 | ) | 1163 | ) |
1164 | 1164 | ||
1165 | dnl Checks for libutil functions | 1165 | dnl Checks for libutil functions |
1166 | AC_CHECK_HEADERS([libutil.h]) | 1166 | AC_CHECK_HEADERS([bsd/libutil.h libutil.h]) |
1167 | AC_SEARCH_LIBS([fmt_scaled], [util bsd]) | 1167 | AC_SEARCH_LIBS([fmt_scaled], [util bsd]) |
1168 | AC_SEARCH_LIBS([login], [util bsd]) | 1168 | AC_SEARCH_LIBS([login], [util bsd]) |
1169 | AC_SEARCH_LIBS([logout], [util bsd]) | 1169 | AC_SEARCH_LIBS([logout], [util bsd]) |
diff --git a/includes.h b/includes.h index b4c53d9b4..3e206c899 100644 --- a/includes.h +++ b/includes.h | |||
@@ -137,8 +137,10 @@ | |||
137 | # include <tmpdir.h> | 137 | # include <tmpdir.h> |
138 | #endif | 138 | #endif |
139 | 139 | ||
140 | #ifdef HAVE_LIBUTIL_H | 140 | #if defined(HAVE_BSD_LIBUTIL_H) |
141 | # include <libutil.h> /* Openpty on FreeBSD at least */ | 141 | # include <bsd/libutil.h> |
142 | #elif defined(HAVE_LIBUTIL_H) | ||
143 | # include <libutil.h> | ||
142 | #endif | 144 | #endif |
143 | 145 | ||
144 | #if defined(KRB5) && defined(USE_AFS) | 146 | #if defined(KRB5) && defined(USE_AFS) |
diff --git a/loginrec.c b/loginrec.c index 32941c985..f9662fa5c 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -180,10 +180,6 @@ | |||
180 | # include <util.h> | 180 | # include <util.h> |
181 | #endif | 181 | #endif |
182 | 182 | ||
183 | #ifdef HAVE_LIBUTIL_H | ||
184 | # include <libutil.h> | ||
185 | #endif | ||
186 | |||
187 | /** | 183 | /** |
188 | ** prototypes for helper functions in this file | 184 | ** prototypes for helper functions in this file |
189 | **/ | 185 | **/ |
@@ -63,10 +63,6 @@ | |||
63 | # include <util.h> | 63 | # include <util.h> |
64 | #endif | 64 | #endif |
65 | 65 | ||
66 | #ifdef HAVE_LIBUTIL_H | ||
67 | # include <libutil.h> | ||
68 | #endif | ||
69 | |||
70 | #include "openbsd-compat/sys-queue.h" | 66 | #include "openbsd-compat/sys-queue.h" |
71 | #include "xmalloc.h" | 67 | #include "xmalloc.h" |
72 | #include "log.h" | 68 | #include "log.h" |
@@ -54,10 +54,6 @@ typedef void EditLine; | |||
54 | # include <util.h> | 54 | # include <util.h> |
55 | #endif | 55 | #endif |
56 | 56 | ||
57 | #ifdef HAVE_LIBUTIL_H | ||
58 | # include <libutil.h> | ||
59 | #endif | ||
60 | |||
61 | #include "xmalloc.h" | 57 | #include "xmalloc.h" |
62 | #include "log.h" | 58 | #include "log.h" |
63 | #include "pathnames.h" | 59 | #include "pathnames.h" |