diff options
| author | bluhm@openbsd.org <bluhm@openbsd.org> | 2018-04-26 14:47:03 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2018-05-11 13:10:49 +1000 |
| commit | e7751aa4094d51a9bc00778aa8d07e22934c55ee (patch) | |
| tree | e16bc42496fed77e01e0ae6463e7f67ab70beedf | |
| parent | 7c15301841e2e9d37cae732400de63ae9c0961d6 (diff) | |
upstream: Since the previous commit, ssh regress test sftp-chroot was
failing. The sftp program terminated with the wrong exit code as sftp called
fatal() instad of exit(0). So when the sigchld handler waits for the child,
remember that it was found. Then don't expect that main() can wait again. OK
dtucker@
OpenBSD-Commit-ID: bfafd940c0de5297940c71ddf362053db0232266
| -rw-r--r-- | sftp.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.184 2018/04/13 05:04:12 djm Exp $ */ +/* $OpenBSD: sftp.c,v 1.185 2018/04/26 14:47:03 bluhm Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -81,7 +81,7 @@ FILE* infile; int batchmode = 0; /* PID of ssh transport process */ -static pid_t sshpid = -1; +static volatile pid_t sshpid = -1; /* Suppress diagnositic messages */ int quiet = 0; @@ -264,8 +264,10 @@ sigchld_handler(int sig) /* Report if ssh transport process dies. */ while ((pid = waitpid(sshpid, NULL, WNOHANG)) == -1 && errno == EINTR) continue; - if (pid == sshpid) + if (pid == sshpid) { (void)write(STDERR_FILENO, msg, sizeof(msg) - 1); + sshpid = -1; + } errno = save_errno; } @@ -2554,7 +2556,7 @@ main(int argc, char **argv) if (batchmode) fclose(infile); - while (waitpid(sshpid, NULL, 0) == -1) + while (waitpid(sshpid, NULL, 0) == -1 && sshpid > 1) if (errno != EINTR) fatal("Couldn't wait for ssh process: %s", strerror(errno)); |