From: djm@openbsd.org <djm@openbsd.org>
Date: Wed, 27 Nov 2019 05:00:17 +0000 (+0000)
Subject: upstream: use error()+_exit() instead of fatal() to avoid running
X-Git-Tag: V_8_2_P1~239
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f79364bacaebde4f1c260318ab460fceacace02f;p=thirdparty%2Fopenssh-portable.git

upstream: use error()+_exit() instead of fatal() to avoid running

cleanup handlers in child process; spotted via weird regress failures in
portable

OpenBSD-Commit-ID: 6902a9bb3987c7d347774444f7979b8a9ba7f412
---

diff --git a/readpass.c b/readpass.c
index 42cbe41f6..89788fe19 100644
--- a/readpass.c
+++ b/readpass.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readpass.c,v 1.57 2019/11/15 00:32:40 djm Exp $ */
+/* $OpenBSD: readpass.c,v 1.58 2019/11/27 05:00:17 djm Exp $ */
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
  *
@@ -251,7 +251,8 @@ notify_start(int force_askpass, const char *fmt, ...)
 		closefrom(STDERR_FILENO + 1);
 		setenv("SSH_ASKPASS_PROMPT", "none", 1); /* hint to UI */
 		execlp(askpass, askpass, prompt, (char *)NULL);
-		fatal("%s: exec(%s): %s", __func__, askpass, strerror(errno));
+		error("%s: exec(%s): %s", __func__, askpass, strerror(errno));
+		_exit(1);
 		/* NOTREACHED */
 	}
 	if ((ret = calloc(1, sizeof(*ret))) == NULL) {