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

diff --git a/ChangeLog b/ChangeLog
index a7930c8490e121974b378a18c9066ace608116a2..43f5bdbf54450f48e1e9b092e1f3ef9be239fac3 100644 (file)
--- a/ChangeLog
+++ b/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.

diff --git a/configure.ac b/configure.ac
index 37ef8b24f3c2267f0b83b5c935d65997ba379e69..2181ac9c0781741a241c1276e08d9fb275a6b099 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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([

diff --git a/includes.h b/includes.h
index a63e87243fcd66caae46ff31961b01b6246d8fbe..e20d7a5191354bab6752f355a24cb7a91e2d724f 100644 (file)
--- a/includes.h
+++ b/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 */