- (djm) Bug #234: missing readpassphrase declaration and defines

ChangeLog

@@ -7,6 +7,7 @@
  - (djm) Add --with-privsep-path configure option
  - (djm) Update RPM spec file: different superuser path, use
    /var/empty/sshd for privsep
+ - (djm) Bug #234: missing readpassphrase declaration and defines
 
 20020511
  - (tim) [configure.ac] applied a rework of djm's OpenSSL search cleanup patch.
@@ -577,4 +578,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2112 2002/05/13 03:57:04 stevesk Exp $
+$Id: ChangeLog,v 1.2113 2002/05/13 05:14:08 djm Exp $

configure.ac

@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.60 2002/05/13 04:41:31 djm Exp $
+# $Id: configure.ac,v 1.61 2002/05/13 05:14:08 djm Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -349,7 +349,7 @@ AC_ARG_WITH(libs,
 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 pty.h \
+	netinet/in_systm.h paths.h pty.h readpassphrase.h \
 	rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \
 	strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \
 	sys/mman.h sys/select.h sys/stat.h \
@@ -1952,7 +1952,7 @@ fi
 # Whether to mess with the default path
 SERVER_PATH_MSG="(default)" 
 AC_ARG_WITH(default-path,
-	[  --with-default-path=PATH Specify default \$PATH environment for server],
+	[  --with-default-path=    Specify default \$PATH environment for server],
 	[
 		if test "$USES_LOGIN_CONF" = "yes" ; then
 			AC_MSG_WARN([

includes.h

@@ -142,6 +142,9 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef USE_PAM
 # include <security/pam_appl.h>
 #endif
+#ifdef HAVE_READPASSPHRASE_H
+# include <readpassphrase.h>
+#endif
 
 #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */