From: djm <djm>
Date: Sat, 14 Jul 2001 02:19:56 +0000 (+0000)
Subject:    - markus@cvs.openbsd.org 2001/07/10 21:49:12
X-Git-Tag: V_2_9_9_P1~186
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/333b5ba7cc2c2996345c1f54fc437d9336c66a8c

   - markus@cvs.openbsd.org 2001/07/10 21:49:12
     [readpass.c]
     don't panic if fork or pipe fail (just return an empty passwd).
---

diff --git a/ChangeLog b/ChangeLog
index d3f0bd2d..5204013d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,9 @@
    - deraadt@cvs.openbsd.org 2001/07/09 07:04:53
      [session.c sftp-int.c]
      correct type on last arg to execl(); nordin@cse.ogi.edu
+   - markus@cvs.openbsd.org 2001/07/10 21:49:12
+     [readpass.c]
+     don't panic if fork or pipe fail (just return an empty passwd).
 
 20010711
  - (djm) dirname(3) may modify its argument on glibc and other systems. 
diff --git a/readpass.c b/readpass.c
index 4eeeed91..3724eeab 100644
--- a/readpass.c
+++ b/readpass.c
@@ -32,7 +32,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: readpass.c,v 1.20 2001/07/02 22:29:20 markus Exp $");
+RCSID("$OpenBSD: readpass.c,v 1.21 2001/07/10 21:49:12 markus Exp $");
 
 #include "xmalloc.h"
 #include "readpass.h"
@@ -54,10 +54,14 @@ ssh_askpass(char *askpass, const char *msg)
 		error("ssh_askpass: fflush: %s", strerror(errno));
 	if (askpass == NULL)
 		fatal("internal error: askpass undefined");
-	if (pipe(p) < 0)
-		fatal("ssh_askpass: pipe: %s", strerror(errno));
-	if ((pid = fork()) < 0)
-		fatal("ssh_askpass: fork: %s", strerror(errno));
+	if (pipe(p) < 0) {
+		error("ssh_askpass: pipe: %s", strerror(errno));
+		return xstrdup("");
+	}
+	if ((pid = fork()) < 0) {
+		error("ssh_askpass: fork: %s", strerror(errno));
+		return xstrdup("");
+	}
 	if (pid == 0) {
 		seteuid(getuid());
 		setuid(getuid());