From: djm@openbsd.org <djm@openbsd.org>
Date: Fri, 14 May 2021 03:09:48 +0000 (+0000)
Subject: upstream: Fix ssh started with ControlPersist incorrectly executing a
X-Git-Tag: V_8_7_P1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e9fa55f4dc4b334651d569d3448aaa3841f736f;p=thirdparty%2Fopenssh-portable.git

upstream: Fix ssh started with ControlPersist incorrectly executing a

shell when the -N (no shell) option was specified. bz3290 reported by Richard
Schwab; patch from markus@ ok me

OpenBSD-Commit-ID: ea1ea4af16a95687302f7690bdbe36a6aabf87e1
---

diff --git a/ssh.c b/ssh.c
index 35b6b5176..65a0ee2a8 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.553 2021/04/03 05:40:39 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.554 2021/05/14 03:09:48 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -2147,7 +2147,7 @@ ssh_session2(struct ssh *ssh, const struct ssh_conn_info *cinfo)
 		stdin_null_flag = 1;
 		no_shell_flag = 1;
 		tty_flag = 0;
-		if (!fork_after_authentication_flag)
+		if (!fork_after_authentication_flag && !no_shell_flag)
 			need_controlpersist_detach = 1;
 		fork_after_authentication_flag = 1;
 	}