summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--ssh_config.58
-rw-r--r--sshd_config.58
3 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9256d6488..929907961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -134,6 +134,9 @@
134 NOTE: if you currently use RDomain in the ssh client or server config, 134 NOTE: if you currently use RDomain in the ssh client or server config,
135 or ssh/sshd -o, you must update to use RoutingDomain. 135 or ssh/sshd -o, you must update to use RoutingDomain.
136 ok markus@ djm@ 136 ok markus@ djm@
137 - jmc@cvs.openbsd.org 2009/12/29 18:03:32
138 [sshd_config.5 ssh_config.5]
139 sort previous;
137 140
13820091226 14120091226
139 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 142 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/ssh_config.5 b/ssh_config.5
index 442222cc5..3ffc469c2 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.125 2009/12/29 18:03:32 jmc Exp $
38.Dd $Mdocdate: December 29 2009 $ 38.Dd $Mdocdate: December 29 2009 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -789,9 +789,6 @@ or
789The default is 789The default is
790.Dq yes . 790.Dq yes .
791This option applies to protocol version 2 only. 791This option applies to protocol version 2 only.
792.It Cm RoutingDomain
793Set the routing domain number.
794The default routing domain is set by the system.
795.It Cm RekeyLimit 792.It Cm RekeyLimit
796Specifies the maximum amount of data that may be transmitted before the 793Specifies the maximum amount of data that may be transmitted before the
797session key is renegotiated. 794session key is renegotiated.
@@ -860,6 +857,9 @@ The default is
860This option applies to protocol version 1 only and requires 857This option applies to protocol version 1 only and requires
861.Xr ssh 1 858.Xr ssh 1
862to be setuid root. 859to be setuid root.
860.It Cm RoutingDomain
861Set the routing domain number.
862The default routing domain is set by the system.
863.It Cm RSAAuthentication 863.It Cm RSAAuthentication
864Specifies whether to try RSA authentication. 864Specifies whether to try RSA authentication.
865The argument to this keyword must be 865The argument to this keyword must be
diff --git a/sshd_config.5 b/sshd_config.5
index ada265373..a3326447f 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: sshd_config.5,v 1.114 2009/12/29 16:38:41 stevesk Exp $ 37.\" $OpenBSD: sshd_config.5,v 1.115 2009/12/29 18:03:32 jmc Exp $
38.Dd $Mdocdate: December 29 2009 $ 38.Dd $Mdocdate: December 29 2009 $
39.Dt SSHD_CONFIG 5 39.Dt SSHD_CONFIG 5
40.Os 40.Os
@@ -806,15 +806,15 @@ Specifies whether public key authentication is allowed.
806The default is 806The default is
807.Dq yes . 807.Dq yes .
808Note that this option applies to protocol version 2 only. 808Note that this option applies to protocol version 2 only.
809.It Cm RoutingDomain
810Set the routing domain number.
811The default routing domain is set by the system.
812.It Cm RhostsRSAAuthentication 809.It Cm RhostsRSAAuthentication
813Specifies whether rhosts or /etc/hosts.equiv authentication together 810Specifies whether rhosts or /etc/hosts.equiv authentication together
814with successful RSA host authentication is allowed. 811with successful RSA host authentication is allowed.
815The default is 812The default is
816.Dq no . 813.Dq no .
817This option applies to protocol version 1 only. 814This option applies to protocol version 1 only.
815.It Cm RoutingDomain
816Set the routing domain number.
817The default routing domain is set by the system.
818.It Cm RSAAuthentication 818.It Cm RSAAuthentication
819Specifies whether pure RSA authentication is allowed. 819Specifies whether pure RSA authentication is allowed.
820The default is 820The default is