summaryrefslogtreecommitdiff
path: root/ssh.1
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-09-07 01:42:54 +0000
committerDamien Miller <djm@mindrot.org>2018-09-09 14:50:32 +1000
commit247766cd3111d5d8c6ea39833a3257ca8fb820f2 (patch)
tree5fe6e85b544da6c13a581a677b8e1f14da77c0fc /ssh.1
parentdb8bb80e3ac1bcb3e1305d846cd98c6b869bf03f (diff)
downloadopenssh-git-247766cd3111d5d8c6ea39833a3257ca8fb820f2.tar.gz
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.19
1 files changed, 6 insertions, 3 deletions
diff --git a/ssh.1 b/ssh.1
index b20908a5..7c71ffcc 100644
--- a/ssh.1
+++ b/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