Explictly ignore return codes where we don't check them. From Dmitry

Belyavskiy via github PR#238, ok djm@

diff --git a/usr.bin/ssh/scp.c b/usr.bin/ssh/scp.c
index ea3deed..9b8995b 100644 (file)
--- a/usr.bin/ssh/scp.c
+++ b/usr.bin/ssh/scp.c
@@ -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).
@@ -166,11 +166,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)

diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index fb4a50b..1d17616 100644 (file)
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -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>
  *
@@ -204,7 +204,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/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c
index 9627e0c..72e9da8 100644 (file)
--- a/usr.bin/ssh/ssh-agent.c
+++ b/usr.bin/ssh/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
@@ -2005,8 +2005,8 @@ main(int ac, char **av)
        sanitise_stdfd();
 
        /* drop */
-       setegid(getgid());
-       setgid(getgid());
+       (void)setegid(getgid());
+       (void)setgid(getgid());
 
        if (getrlimit(RLIMIT_NOFILE, &rlim) == -1)
                fatal("%s: getrlimit: %s", __progname, strerror(errno));