summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2018-09-07 01:42:55 +0000
committerDamien Miller <djm@cvs.openbsd.org>2018-09-07 01:42:55 +0000
commit30866d6485d3e781dc08c172b2dac7a28603db52 (patch)
treea9f7e181cc73ea2ee09fd81252d40fd317e0eefd
parentce63742534bc2b6e45f50ac773a7a685b8b8c43c (diff)
ssh -MM requires confirmation for all operations that change the
multiplexing state, not just new sessions. mention that confirmation is checked via ssh-askpass
-rw-r--r--usr.bin/ssh/ssh.19
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh.1 b/usr.bin/ssh/ssh.1
index b20908a5ea9..7c71ffcc2c2 100644
--- a/usr.bin/ssh/ssh.1
+++ b/usr.bin/ssh/ssh.1
@@ -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