[readconf.c servconf.c misc.h ssh-keyscan.c misc.c]
validate routing domain is in range 0-RT_TABLEID_MAX.
'Looks right' deraadt@
+ - stevesk@cvs.openbsd.org 2009/12/29 16:38:41
+ [sshd_config.5 readconf.c ssh_config.5 scp.1 servconf.c sftp.1 ssh.1]
+ Rename RDomain config option to RoutingDomain to be more clear and
+ consistent with other options.
+ 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@
20091226
- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
-/* $OpenBSD: readconf.c,v 1.180 2009/12/25 19:40:21 stevesk Exp $ */
+/* $OpenBSD: readconf.c,v 1.181 2009/12/29 16:38:41 stevesk Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
{ "permitlocalcommand", oPermitLocalCommand },
{ "visualhostkey", oVisualHostKey },
{ "useroaming", oUseRoaming },
- { "rdomain", oRDomain },
+ { "routingdomain", oRDomain },
#ifdef JPAKE
{ "zeroknowledgepasswordauthentication",
oZeroKnowledgePasswordAuthentication },
.\"
.\" Created: Sun May 7 00:14:37 1995 ylo
.\"
-.\" $OpenBSD: scp.1,v 1.47 2009/10/28 16:38:18 reyk Exp $
+.\" $OpenBSD: scp.1,v 1.48 2009/12/29 16:38:41 stevesk Exp $
.\"
.Dd $Mdocdate$
.Dt SCP 1
.It Protocol
.It ProxyCommand
.It PubkeyAuthentication
-.It RDomain
.It RekeyLimit
.It RhostsRSAAuthentication
+.It RoutingDomain
.It RSAAuthentication
.It SendEnv
.It ServerAliveInterval
-/* $OpenBSD: servconf.c,v 1.198 2009/12/25 19:40:21 stevesk Exp $ */
+/* $OpenBSD: servconf.c,v 1.199 2009/12/29 16:38:41 stevesk Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
* All rights reserved
{ "match", sMatch, SSHCFG_ALL },
{ "permitopen", sPermitOpen, SSHCFG_ALL },
{ "forcecommand", sForceCommand, SSHCFG_ALL },
- { "rdomain", sRDomain, SSHCFG_GLOBAL },
+ { "routingdomain", sRDomain, SSHCFG_GLOBAL },
{ "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
{ NULL, sBadOption, 0 }
};
-.\" $OpenBSD: sftp.1,v 1.78 2009/10/28 21:45:08 jmc Exp $
+.\" $OpenBSD: sftp.1,v 1.79 2009/12/29 16:38:41 stevesk Exp $
.\"
.\" Copyright (c) 2001 Damien Miller. All rights reserved.
.\"
.It Protocol
.It ProxyCommand
.It PubkeyAuthentication
-.It RDomain
.It RekeyLimit
.It RhostsRSAAuthentication
+.It RoutingDomain
.It RSAAuthentication
.It SendEnv
.It ServerAliveInterval
.\" (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.287 2009/10/28 16:38:18 reyk Exp $
+.\" $OpenBSD: ssh.1,v 1.288 2009/12/29 16:38:41 stevesk Exp $
.Dd $Mdocdate$
.Dt SSH 1
.Os
.It Protocol
.It ProxyCommand
.It PubkeyAuthentication
-.It RDomain
.It RekeyLimit
.It RemoteForward
.It RhostsRSAAuthentication
+.It RoutingDomain
.It RSAAuthentication
.It SendEnv
.It ServerAliveInterval
.\" (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.123 2009/11/10 02:56:22 djm Exp $
+.\" $OpenBSD: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $
.Dd $Mdocdate$
.Dt SSH_CONFIG 5
.Os
The default is
.Dq yes .
This option applies to protocol version 2 only.
-.It Cm RDomain
+.It Cm RoutingDomain
Set the routing domain number.
The default routing domain is set by the system.
.It Cm RekeyLimit
.\" (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.113 2009/12/19 16:53:13 stevesk Exp $
+.\" $OpenBSD: sshd_config.5,v 1.114 2009/12/29 16:38:41 stevesk Exp $
.Dd $Mdocdate$
.Dt SSHD_CONFIG 5
.Os
The default is
.Dq yes .
Note that this option applies to protocol version 2 only.
-.It Cm RDomain
+.It Cm RoutingDomain
Set the routing domain number.
The default routing domain is set by the system.
.It Cm RhostsRSAAuthentication