diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 17:05:26 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 17:05:26 +1100 |
| commit | cc117f0deb26a3491aa90614974517ac2f18dc45 (patch) | |
| tree | 781f1915d2cfc5d5d7cdb6365df9fc8e9282e1e8 | |
| parent | 34e314da1b832fee576e4ebd8b177154a45fec15 (diff) | |
| download | openssh-git-cc117f0deb26a3491aa90614974517ac2f18dc45.tar.gz | |
- jmc@cvs.openbsd.org 2009/10/28 21:45:08
[sshd_config.5 sftp.1]
tweak previous;
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | sftp.1 | 4 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
3 files changed, 9 insertions, 6 deletions
@@ -36,6 +36,9 @@ sftp.1 sshd_config.5 readconf.c ssh.c misc.c] Allow to set the rdomain in ssh/sftp/scp/sshd and ssh-keyscan. ok markus@ + - jmc@cvs.openbsd.org 2009/10/28 21:45:08 + [sshd_config.5 sftp.1] + tweak previous; 20091226 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sftp.1,v 1.77 2009/10/28 16:38:18 reyk Exp $ +.\" $OpenBSD: sftp.1,v 1.78 2009/10/28 21:45:08 jmc Exp $ .\" .\" Copyright (c) 2001 Damien Miller. All rights reserved. .\" @@ -207,9 +207,9 @@ For full details of the options listed below, and their possible values, see .It Protocol .It ProxyCommand .It PubkeyAuthentication +.It RDomain .It RekeyLimit .It RhostsRSAAuthentication -.It RDomain .It RSAAuthentication .It SendEnv .It ServerAliveInterval diff --git a/sshd_config.5 b/sshd_config.5 index 1a30f29c..7e7c6f85 100644 --- a/sshd_config.5 +++ b/sshd_config.5 @@ -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: sshd_config.5,v 1.110 2009/10/28 16:38:18 reyk Exp $ +.\" $OpenBSD: sshd_config.5,v 1.111 2009/10/28 21:45:08 jmc Exp $ .Dd $Mdocdate: October 28 2009 $ .Dt SSHD_CONFIG 5 .Os @@ -806,15 +806,15 @@ Specifies whether public key authentication is allowed. The default is .Dq yes . Note that this option applies to protocol version 2 only. +.It Cm RDomain +Set the routing domain number. +The default routing domain is set by the system. .It Cm RhostsRSAAuthentication Specifies whether rhosts or /etc/hosts.equiv authentication together with successful RSA host authentication is allowed. The default is .Dq no . This option applies to protocol version 1 only. -.It Cm RDomain -Set the routing domain number. -The default routing domain is set by the system. .It Cm RSAAuthentication Specifies whether pure RSA authentication is allowed. The default is |