diff options
| author | Damien Miller <djm@cvs.openbsd.org> | 2019-11-27 05:00:18 +0000 |
|---|---|---|
| committer | Damien Miller <djm@cvs.openbsd.org> | 2019-11-27 05:00:18 +0000 |
| commit | 39256f9aca713427f184cd2db9ca0a77aaa60122 (patch) | |
| tree | 6820f3b82b591ff37192d1ec986106dced5c64ac /usr.bin | |
| parent | 316d2f629c4f4c9b6c7b0468753536afd8a39338 (diff) | |
use error()+_exit() instead of fatal() to avoid running cleanup
handlers in child process; spotted via weird regress failures in
portable
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/readpass.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/readpass.c b/usr.bin/ssh/readpass.c index e6b4123fcf0..a4ca4dd89b1 100644 --- a/usr.bin/ssh/readpass.c +++ b/usr.bin/ssh/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. * @@ -248,7 +248,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) { |