RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
bluhm@openbsd.org 2018-04-26 14:47:03 +00:00 committed by Damien Miller
parent 7c15301841
commit e7751aa409
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sftp.c
View File

@ -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> * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
* *
@ -81,7 +81,7 @@ FILE* infile;
int batchmode = 0; int batchmode = 0;
/* PID of ssh transport process */ /* PID of ssh transport process */
static pid_t sshpid = -1; static volatile pid_t sshpid = -1;
/* Suppress diagnositic messages */ /* Suppress diagnositic messages */
int quiet = 0; int quiet = 0;
@ -264,8 +264,10 @@ sigchld_handler(int sig)
/* Report if ssh transport process dies. */ /* Report if ssh transport process dies. */
while ((pid = waitpid(sshpid, NULL, WNOHANG)) == -1 && errno == EINTR) while ((pid = waitpid(sshpid, NULL, WNOHANG)) == -1 && errno == EINTR)
continue; continue;
if (pid == sshpid) if (pid == sshpid) {
(void)write(STDERR_FILENO, msg, sizeof(msg) - 1); (void)write(STDERR_FILENO, msg, sizeof(msg) - 1);
sshpid = -1;
}
errno = save_errno; errno = save_errno;
} }
@ -2554,7 +2556,7 @@ main(int argc, char **argv)
if (batchmode) if (batchmode)
fclose(infile); fclose(infile);
while (waitpid(sshpid, NULL, 0) == -1) while (waitpid(sshpid, NULL, 0) == -1 && sshpid > 1)
if (errno != EINTR) if (errno != EINTR)
fatal("Couldn't wait for ssh process: %s", fatal("Couldn't wait for ssh process: %s",
strerror(errno)); strerror(errno));