summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--configure.ac6
-rw-r--r--includes.h3
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a9e013bd..78781bdce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@
7 - (djm) Add --with-privsep-path configure option 7 - (djm) Add --with-privsep-path configure option
8 - (djm) Update RPM spec file: different superuser path, use 8 - (djm) Update RPM spec file: different superuser path, use
9 /var/empty/sshd for privsep 9 /var/empty/sshd for privsep
10 - (djm) Bug #234: missing readpassphrase declaration and defines
10 11
1120020511 1220020511
12 - (tim) [configure.ac] applied a rework of djm's OpenSSL search cleanup patch. 13 - (tim) [configure.ac] applied a rework of djm's OpenSSL search cleanup patch.
@@ -577,4 +578,4 @@
577 - (stevesk) entropy.c: typo in debug message 578 - (stevesk) entropy.c: typo in debug message
578 - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 579 - (djm) ssh-keygen -i needs seeded RNG; report from markus@
579 580
580$Id: ChangeLog,v 1.2112 2002/05/13 03:57:04 stevesk Exp $ 581$Id: ChangeLog,v 1.2113 2002/05/13 05:14:08 djm Exp $
diff --git a/configure.ac b/configure.ac
index 8adb3a179..511c06a81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.60 2002/05/13 04:41:31 djm Exp $ 1# $Id: configure.ac,v 1.61 2002/05/13 05:14:08 djm Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -349,7 +349,7 @@ AC_ARG_WITH(libs,
349AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \ 349AC_CHECK_HEADERS(bstring.h crypt.h endian.h floatingpoint.h \
350 getopt.h glob.h lastlog.h limits.h login.h \ 350 getopt.h glob.h lastlog.h limits.h login.h \
351 login_cap.h maillock.h netdb.h netgroup.h \ 351 login_cap.h maillock.h netdb.h netgroup.h \
352 netinet/in_systm.h paths.h pty.h \ 352 netinet/in_systm.h paths.h pty.h readpassphrase.h \
353 rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ 353 rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
354 strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ 354 strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
355 sys/mman.h sys/select.h sys/stat.h \ 355 sys/mman.h sys/select.h sys/stat.h \
@@ -1952,7 +1952,7 @@ fi
1952# Whether to mess with the default path 1952# Whether to mess with the default path
1953SERVER_PATH_MSG="(default)" 1953SERVER_PATH_MSG="(default)"
1954AC_ARG_WITH(default-path, 1954AC_ARG_WITH(default-path,
1955 [ --with-default-path=PATH Specify default \$PATH environment for server], 1955 [ --with-default-path= Specify default \$PATH environment for server],
1956 [ 1956 [
1957 if test "$USES_LOGIN_CONF" = "yes" ; then 1957 if test "$USES_LOGIN_CONF" = "yes" ; then
1958 AC_MSG_WARN([ 1958 AC_MSG_WARN([
diff --git a/includes.h b/includes.h
index a63e87243..e20d7a519 100644
--- a/includes.h
+++ b/includes.h
@@ -142,6 +142,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
142#ifdef USE_PAM 142#ifdef USE_PAM
143# include <security/pam_appl.h> 143# include <security/pam_appl.h>
144#endif 144#endif
145#ifdef HAVE_READPASSPHRASE_H
146# include <readpassphrase.h>
147#endif
145 148
146#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ 149#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */
147 150