Import of OpenSSH 3.2.2p1

[gssapi-openssh.git] / openssh / readpass.c

diff --git a/openssh/readpass.c b/openssh/readpass.c
index b4421ade04dccb4b9eba43b06d54b823c3ed44cd..96b7e84b44fcee486b4f6e1e54defdd339ab5128 100644 (file)
--- a/openssh/readpass.c
+++ b/openssh/readpass.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.26 2002/02/13 00:39:15 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.27 2002/03/26 15:58:46 markus Exp $");
 
 #include "xmalloc.h"
 #include "readpass.h"
@@ -118,8 +118,11 @@ read_passphrase(const char *prompt, int flags)
                return ssh_askpass(askpass, prompt);
        }
 
-       if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL)
+       if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL) {
+               if (flags & RP_ALLOW_EOF)
+                       return NULL;
                return xstrdup("");
+       }
 
        ret = xstrdup(buf);
        memset(buf, 'x', sizeof buf);