summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac12
2 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index aaf8563c3..818cb9774 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120060908 120060908
2 - (dtucker) [auth-sia.c] Add includes required for build on Tru64. Patch 2 - (dtucker) [auth-sia.c] Add includes required for build on Tru64. Patch
3 from Chris Adams. 3 from Chris Adams.
4 - (dtucker) [configure.ac] The BSM header test needs time.h in some cases.
4 5
520060907 620060907
6 - (djm) [sshd.c auth.c] Set up fakepw() with privsep uid/gid, so it can 7 - (djm) [sshd.c auth.c] Set up fakepw() with privsep uid/gid, so it can
@@ -5414,4 +5415,4 @@
5414 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5415 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5415 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5416 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5416 5417
5417$Id: ChangeLog,v 1.4536 2006/09/07 23:54:41 dtucker Exp $ 5418$Id: ChangeLog,v 1.4537 2006/09/08 15:05:21 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 493409f4d..4a3c39fcb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.361 2006/09/07 01:11:29 tim Exp $ 1# $Id: configure.ac,v 1.362 2006/09/08 15:05:21 dtucker 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
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.361 $) 18AC_REVISION($Revision: 1.362 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -1166,7 +1166,13 @@ AC_ARG_WITH(audit,
1166 AUDIT_MODULE=bsm 1166 AUDIT_MODULE=bsm
1167 dnl Checks for headers, libs and functions 1167 dnl Checks for headers, libs and functions
1168 AC_CHECK_HEADERS(bsm/audit.h, [], 1168 AC_CHECK_HEADERS(bsm/audit.h, [],
1169 [AC_MSG_ERROR(BSM enabled and bsm/audit.h not found)]) 1169 [AC_MSG_ERROR(BSM enabled and bsm/audit.h not found)],
1170 [
1171#ifdef HAVE_TIME_H
1172# include <time.h>
1173#endif
1174 ]
1175)
1170 AC_CHECK_LIB(bsm, getaudit, [], 1176 AC_CHECK_LIB(bsm, getaudit, [],
1171 [AC_MSG_ERROR(BSM enabled and required library not found)]) 1177 [AC_MSG_ERROR(BSM enabled and required library not found)])
1172 AC_CHECK_FUNCS(getaudit, [], 1178 AC_CHECK_FUNCS(getaudit, [],