diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2021-05-14 03:09:48 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2021-05-14 13:10:50 +1000 |
| commit | 1e9fa55f4dc4b334651d569d3448aaa3841f736f (patch) | |
| tree | c34e72a3826eb68029605033674aeb7397152d6a | |
| parent | d1320c492f655d8f5baef8c93899d79dded217a5 (diff) | |
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
| -rw-r--r-- | ssh.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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; } |