- markus@cvs.openbsd.org 2001/07/02 22:29:20

     [readpass.c]
     do not return NULL, use "" instead.

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 13b087d5a..37b5e3a7c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -118,6 +118,9 @@
      [serverloop.c session.c session.h]
      wait until !session_have_children(); bugreport from 
      Lutz.Jaenicke@aet.TU-Cottbus.DE
+   - markus@cvs.openbsd.org 2001/07/02 22:29:20
+     [readpass.c]
+     do not return NULL, use "" instead.
  
 20010629
  - (bal) Removed net_aton() since we don't use it any more
@@ -5945,4 +5948,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1373 2001/07/04 05:17:40 mouring Exp $
+$Id: ChangeLog,v 1.1374 2001/07/04 05:19:27 mouring Exp $
diff --git a/readpass.c b/readpass.c
index 10171cf67..4eeeed917 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,7 +32,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.19 2001/06/24 05:35:33 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.20 2001/07/02 22:29:20 markus Exp $");
 
 #include "xmalloc.h"
 #include "readpass.h"
@@ -117,7 +117,7 @@ read_passphrase(const char *prompt, int flags)
         }
 
         if (readpassphrase(prompt, buf, sizeof buf, rppflags) == NULL)
-                return NULL;
+                return xstrdup("");
 
         ret = xstrdup(buf);
         memset(buf, 'x', sizeof buf);