diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 18:57:39 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2010-01-08 18:57:39 +1100 |
| commit | 98e5d9a0d3beabc706982260fec70f823ff764b7 (patch) | |
| tree | 50fba9a5f0aa709e7e82e24ae7bb8bc405fe02b2 | |
| parent | 535b5e172166c2515500bc20f3ea89216bd1f42b (diff) | |
| download | openssh-git-98e5d9a0d3beabc706982260fec70f823ff764b7.tar.gz | |
- jmc@cvs.openbsd.org 2009/12/29 18:03:32
[sshd_config.5 ssh_config.5]
sort previous;
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ssh_config.5 | 8 | ||||
| -rw-r--r-- | sshd_config.5 | 8 |
3 files changed, 11 insertions, 8 deletions
@@ -134,6 +134,9 @@ NOTE: if you currently use RDomain in the ssh client or server config, or ssh/sshd -o, you must update to use RoutingDomain. ok markus@ djm@ + - jmc@cvs.openbsd.org 2009/12/29 18:03:32 + [sshd_config.5 ssh_config.5] + sort previous; 20091226 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 diff --git a/ssh_config.5 b/ssh_config.5 index 442222cc..3ffc469c 100644 --- a/ssh_config.5 +++ b/ssh_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: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $ +.\" $OpenBSD: ssh_config.5,v 1.125 2009/12/29 18:03:32 jmc Exp $ .Dd $Mdocdate: December 29 2009 $ .Dt SSH_CONFIG 5 .Os @@ -789,9 +789,6 @@ or The default is .Dq yes . This option applies to protocol version 2 only. -.It Cm RoutingDomain -Set the routing domain number. -The default routing domain is set by the system. .It Cm RekeyLimit Specifies the maximum amount of data that may be transmitted before the session key is renegotiated. @@ -860,6 +857,9 @@ The default is This option applies to protocol version 1 only and requires .Xr ssh 1 to be setuid root. +.It Cm RoutingDomain +Set the routing domain number. +The default routing domain is set by the system. .It Cm RSAAuthentication Specifies whether to try RSA authentication. The argument to this keyword must be diff --git a/sshd_config.5 b/sshd_config.5 index ada26537..a3326447 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.114 2009/12/29 16:38:41 stevesk Exp $ +.\" $OpenBSD: sshd_config.5,v 1.115 2009/12/29 18:03:32 jmc Exp $ .Dd $Mdocdate: December 29 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 RoutingDomain -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 RoutingDomain +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 |