diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-09-07 03:42:54 +0200 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-09-09 06:50:32 +0200 |
commit | 247766cd3111d5d8c6ea39833a3257ca8fb820f2 (patch) | |
tree | 5fe6e85b544da6c13a581a677b8e1f14da77c0fc /ssh.1 | |
parent | upstream: fix misplaced parenthesis inside if-clause. it's harmless (diff) | |
download | openssh-247766cd3111d5d8c6ea39833a3257ca8fb820f2.tar.xz openssh-247766cd3111d5d8c6ea39833a3257ca8fb820f2.zip |
upstream: ssh -MM requires confirmation for all operations that
change the multiplexing state, not just new sessions.
mention that confirmation is checked via ssh-askpass
OpenBSD-Commit-ID: 0f1b45551ebb9cc5c9a4fe54ad3b23ce90f1f5c2
Diffstat (limited to 'ssh.1')
-rw-r--r-- | ssh.1 | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -33,8 +33,8 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: ssh.1,v 1.396 2018/07/19 10:28:47 dtucker Exp $ -.Dd $Mdocdate: July 19 2018 $ +.\" $OpenBSD: ssh.1,v 1.397 2018/09/07 01:42:54 djm Exp $ +.Dd $Mdocdate: September 7 2018 $ .Dt SSH 1 .Os .Sh NAME @@ -391,7 +391,10 @@ options places .Nm into .Dq master -mode with confirmation required before slave connections are accepted. +mode but with confirmation required using +.Xr ssh-askpass 1 +before each operation that changes the multiplexing state +(e.g. opening a new session). Refer to the description of .Cm ControlMaster in |