tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
djm@openbsd.org 2021-05-14 03:09:48 +00:00 committed by Damien Miller
parent d1320c492f
commit 1e9fa55f4d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh.c
View File

@ -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;
}