diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-03-31 04:45:08 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-03-31 16:17:46 +1100 |
| commit | 6b73aa29035991d1448a1a76f63ac152a6bf931c (patch) | |
| tree | 6c3f97e53c7357ffd4a80113877c12514056e237 | |
| parent | 6f0308a3e717ebe68eeb3f95253612fab5dbf20e (diff) | |
| download | openssh-git-6b73aa29035991d1448a1a76f63ac152a6bf931c.tar.gz | |
upstream: Explictly ignore return codes
where we don't check them.
OpenBSD-Commit-ID: 1ffb03038ba1b6b72667be50cf5e5e396b5f2740
| -rw-r--r-- | scp.c | 6 | ||||
| -rw-r--r-- | sftp.c | 4 | ||||
| -rw-r--r-- | ssh-agent.c | 6 |
3 files changed, 8 insertions, 8 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: scp.c,v 1.254 2023/03/27 03:25:08 djm Exp $ */ +/* $OpenBSD: scp.c,v 1.255 2023/03/31 04:45:08 dtucker Exp $ */ /* * scp - secure remote copy. This is basically patched BSD rcp which * uses ssh to do the data transfer (instead of using rcmd). @@ -194,11 +194,11 @@ killchild(int signo) { if (do_cmd_pid > 1) { kill(do_cmd_pid, signo ? signo : SIGTERM); - waitpid(do_cmd_pid, NULL, 0); + (void)waitpid(do_cmd_pid, NULL, 0); } if (do_cmd_pid2 > 1) { kill(do_cmd_pid2, signo ? signo : SIGTERM); - waitpid(do_cmd_pid2, NULL, 0); + (void)waitpid(do_cmd_pid2, NULL, 0); } if (signo) @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.231 2023/03/29 00:59:08 dtucker Exp $ */ +/* $OpenBSD: sftp.c,v 1.232 2023/03/31 04:45:08 dtucker Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -225,7 +225,7 @@ killchild(int signo) pid = sshpid; if (pid > 1) { kill(pid, SIGTERM); - waitpid(pid, NULL, 0); + (void)waitpid(pid, NULL, 0); } _exit(1); diff --git a/ssh-agent.c b/ssh-agent.c index 618bb198..c72518ba 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.297 2023/03/09 21:06:24 jcs Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.298 2023/03/31 04:45:08 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -2020,8 +2020,8 @@ main(int ac, char **av) sanitise_stdfd(); /* drop */ - setegid(getgid()); - setgid(getgid()); + (void)setegid(getgid()); + (void)setgid(getgid()); platform_disable_tracing(0); /* strict=no */ |