diff options
| author | Damien Miller <djm@mindrot.org> | 2005-12-31 06:23:15 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2005-12-31 06:23:15 +0100 |
| commit | 88b25524b885885896e23e01e1aa873864ca7386 (patch) | |
| tree | 3072b1983630cd8391746d2b2581f8f1f75b34cc | |
| parent | - jmc@cvs.openbsd.org 2005/12/30 16:59:00 (diff) | |
| download | openssh-88b25524b885885896e23e01e1aa873864ca7386.tar.xz openssh-88b25524b885885896e23e01e1aa873864ca7386.zip | |
- stevesk@cvs.openbsd.org 2005/12/31 01:38:45
[ssh.1]
document -MM; ok djm@
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh.1 | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -13,6 +13,9 @@ with the -b flag; based on a diff from john l. scarfone; ok djm + - stevesk@cvs.openbsd.org 2005/12/31 01:38:45 + [ssh.1] + document -MM; ok djm@ 20051229 - (tim) [buildpkg.sh.in] grep for $SSHDUID instead of $SSHDGID on /etc/passwd @@ -3568,4 +3571,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4055 2005/12/31 05:22:55 djm Exp $ +$Id: ChangeLog,v 1.4056 2005/12/31 05:23:15 djm Exp $ @@ -34,7 +34,7 @@ .\" (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.230 2005/12/23 23:46:23 jmc Exp $ +.\" $OpenBSD: ssh.1,v 1.231 2005/12/31 01:38:45 stevesk Exp $ .Dd September 25, 1999 .Dt SSH 1 .Os @@ -369,6 +369,13 @@ Places the client into .Dq master mode for connection sharing. +Multiple +.Fl M +options places +.Nm +into +.Dq master +mode with confirmation required before slave connections are accepted. Refer to the description of .Cm ControlMaster in |