summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a520f68fe..9376eab58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
120040211 120040211
2 - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check 2 - (dtucker) [auth-passwd.c auth-shadow.c] Only enable shadow expiry check
3 if HAS_SHADOW_EXPIRY is set. 3 if HAS_SHADOW_EXPIRY is set.
4 - (tim) [configure.ac] Fix comment to match code changes in ver 1.117
4 5
520040210 620040210
6 - (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c 7 - (dtucker) [auth-passwd.c auth.h openbsd-compat/port-aix.c
@@ -1844,4 +1845,4 @@
1844 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. 1845 - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
1845 Report from murple@murple.net, diagnosis from dtucker@zip.com.au 1846 Report from murple@murple.net, diagnosis from dtucker@zip.com.au
1846 1847
1847$Id: ChangeLog,v 1.3225 2004/02/11 07:48:52 dtucker Exp $ 1848$Id: ChangeLog,v 1.3226 2004/02/11 22:46:40 tim Exp $
diff --git a/configure.ac b/configure.ac
index a4111db8c..91a4c4eeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.196 2004/02/10 06:15:05 dtucker Exp $ 1# $Id: configure.ac,v 1.197 2004/02/11 22:46:40 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -1158,7 +1158,7 @@ Also see contrib/findssl.sh for help identifying header/library mismatches.])
1158) 1158)
1159 1159
1160# Some Linux systems (Slackware) need crypt() from libcrypt, *not* the 1160# Some Linux systems (Slackware) need crypt() from libcrypt, *not* the
1161# version in OpenSSL. Skip this for PAM 1161# version in OpenSSL.
1162if test "x$check_for_libcrypt_later" = "x1"; then 1162if test "x$check_for_libcrypt_later" = "x1"; then
1163 AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt") 1163 AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
1164fi 1164fi