- (djm) Fix readpassphase compilation for systems which have it

diff --git a/ChangeLog b/ChangeLog
index 3d489d158bafa5461f6ee5de31a85c50ac37c44e..157509e333c09ee9a3cb83570f515f0f59fd1d52 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 20020501
  - (djm) Import OpenBSD regression tests. Requires BSD make to run
+ - (djm) Fix readpassphase compilation for systems which have it
 
 20020429
  - (tim) [contrib/caldera/openssh.spec] update fixUP to reflect changes in

diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 7687710373458434caad7c52036d1a39d92c077e..8c2f5f8416863647c944583def02f81fa0370721 100644 (file)
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -165,7 +165,6 @@ restart:
        errno = save_errno;
        return(nr == -1 ? NULL : buf);
 }
-#endif /* HAVE_READPASSPHRASE */
   
 #if 0
 char *
@@ -179,6 +178,6 @@ getpass(const char *prompt)
 
 static void handler(int s)
 {
-
        signo = s;
 }
+#endif /* HAVE_READPASSPHRASE */