diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2019-11-27 05:00:17 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-27 16:02:46 +1100 |
| commit | f79364bacaebde4f1c260318ab460fceacace02f (patch) | |
| tree | 6737d9b7f258794bdae553f899030cf026b660b1 /readpass.c | |
| parent | 70ec5e5e2681bcd409a9df94a2fec6f57a750945 (diff) | |
| download | openssh-git-f79364bacaebde4f1c260318ab460fceacace02f.tar.gz | |
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
Diffstat (limited to 'readpass.c')
| -rw-r--r-- | readpass.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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) { |