From: dtucker@openbsd.org <dtucker@openbsd.org>
Date: Thu, 30 Mar 2023 07:19:50 +0000 (+0000)
Subject: upstream: Ignore return value from muxclient(). It normally loops
X-Git-Tag: V_9_4_P1~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7174ba6f8a431ca4257767a260fc50e204068242;p=thirdparty%2Fopenssh-portable.git

upstream: Ignore return value from muxclient(). It normally loops

without returning, but it if returns on failure we immediately exit.
Coverity CID 405050.

OpenBSD-Commit-ID: ab3fde6da384ea588226037c38635a6b2e015295
---

diff --git a/ssh.c b/ssh.c
index edf2f119f..25397e8ea 100644
--- 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");
 	}