]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
upstream: Ignore return value from muxclient(). It normally loops
authordtucker@openbsd.org <dtucker@openbsd.org>
Thu, 30 Mar 2023 07:19:50 +0000 (07:19 +0000)
committerDamien Miller <djm@mindrot.org>
Fri, 31 Mar 2023 04:06:18 +0000 (15:06 +1100)
without returning, but it if returns on failure we immediately exit.
Coverity CID 405050.

OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295

ssh.c

diff --git a/ssh.c b/ssh.c
index edf2f119f287cbeb7c10e5b2180bd86f4fcfbc37..25397e8ea337162483b7060521c58d62ad932d29 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.586 2023/03/27 03:56:11 dtucker Exp $ */
+/* $OpenBSD: ssh.c,v 1.587 2023/03/30 07:19:50 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1760,7 +1760,7 @@ control_persist_detach(void)
                close(muxserver_sock);
                muxserver_sock = -1;
                options.control_master = SSHCTL_MASTER_NO;
-               muxclient(options.control_path);
+               (void)muxclient(options.control_path);
                /* muxclient() doesn't return on success. */
                fatal("Failed to connect to new control master");
        }