[openssh-commits] [openssh] 02/02: upstream: use error()+_exit() instead of fatal() to avoid running

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit f79364bacaebde4f1c260318ab460fceacace02f
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Wed Nov 27 05:00:17 2019 +0000

    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
---
 readpass.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/readpass.c b/readpass.c
index 42cbe41f..89788fe1 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) {

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.