summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2001-04-25 22:50:18 +1000
committerDamien Miller <djm@mindrot.org>2001-04-25 22:50:18 +1000
commitda2ed56f61f3b28259c0aa32d89e5e6f08228a4b (patch)
tree3e03729e4d245001aaf8d220baac7558fde73631
parentf815442116071c69525915018edf5a32081bddc2 (diff)
- (djm) Include crypt.h if available in auth-passwd.c
-rw-r--r--ChangeLog3
-rw-r--r--auth-passwd.c3
-rw-r--r--configure.in4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ddf385f8..50b14c85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@
- (djm) Add new server configuration directive 'PAMAuthenticationViaKbdInt'
(default: off), implies KbdInteractiveAuthentication. Suggestion from
markus@
+ - (djm) Include crypt.h if available in auth-passwd.c
20010424
- OpenBSD CVS Sync
@@ -5249,4 +5250,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1169 2001/04/25 12:44:14 djm Exp $
+$Id: ChangeLog,v 1.1170 2001/04/25 12:50:18 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 27977155..d53a9ea2 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -46,6 +46,9 @@ RCSID("$OpenBSD: auth-passwd.c,v 1.22 2001/03/20 18:57:04 markus Exp $");
#include "servconf.h"
#include "auth.h"
+#ifdef HAVE_CRYPT_H
+# include <crypt.h>
+#endif
#ifdef WITH_AIXAUTHENTICATE
# include <login.h>
#endif
diff --git a/configure.in b/configure.in
index e447d342..c23bf0d8 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.280 2001/04/23 22:39:42 mouring Exp $
+# $Id: configure.in,v 1.281 2001/04/25 12:50:19 djm Exp $
AC_INIT(ssh.c)
@@ -341,7 +341,7 @@ AC_CHECK_FUNC(utimes,
AC_FUNC_STRFTIME
# Checks for header files.
-AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h glob.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
+AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h getopt.h glob.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
# Check for ALTDIRFUNC glob() extension
AC_MSG_CHECKING(for GLOB_ALTDIRFUNC support)