8 files changed, 26 insertions, 19 deletions

diff --git a/ChangeLog b/ChangeLog
index feaa27aee..9256d6488 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -127,6 +127,13 @@
      [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
diff --git a/readconf.c b/readconf.c
index 2f1b0cd3b..40fe8f694 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $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
@@ -229,7 +229,7 @@ static struct {
         { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },
         { "useroaming", oUseRoaming },
-        { "rdomain", oRDomain },
+        { "routingdomain", oRDomain },
 #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },
diff --git a/scp.1 b/scp.1
index b9245ea53..1d1cad0b0 100644
--- a/scp.1
+++ b/scp.1
@@ -9,9 +9,9 @@
 .\"
 .\" 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: October 28 2009 $
+.Dd $Mdocdate: December 29 2009 $
 .Dt SCP 1
 .Os
 .Sh NAME
@@ -158,9 +158,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 RoutingDomain
 .It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
diff --git a/servconf.c b/servconf.c
index 8b8518aa8..2cdc480e6 100644
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $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
@@ -424,7 +424,7 @@ static struct {
         { "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 }
 };
diff --git a/sftp.1 b/sftp.1
index ab53c1690..81d87680d 100644
--- a/sftp.1
+++ b/sftp.1
@@ -1,4 +1,4 @@
-.\" $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.
 .\"
@@ -22,7 +22,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.
 .\"
-.Dd $Mdocdate: October 28 2009 $
+.Dd $Mdocdate: December 29 2009 $
 .Dt SFTP 1
 .Os
 .Sh NAME
@@ -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 RoutingDomain
 .It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
diff --git a/ssh.1 b/ssh.1
index 8277d0fdf..2f6ef5fff 100644
--- a/ssh.1
+++ b/ssh.1
@@ -34,8 +34,8 @@
 .\" (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 $
-.Dd $Mdocdate: October 28 2009 $
+.\" $OpenBSD: ssh.1,v 1.288 2009/12/29 16:38:41 stevesk Exp $
+.Dd $Mdocdate: December 29 2009 $
 .Dt SSH 1
 .Os
 .Sh NAME
@@ -475,10 +475,10 @@ For full details of the options listed below, and their possible values, see
 .It Protocol
 .It ProxyCommand
 .It PubkeyAuthentication
-.It RDomain
 .It RekeyLimit
 .It RemoteForward
 .It RhostsRSAAuthentication
+.It RoutingDomain
 .It RSAAuthentication
 .It SendEnv
 .It ServerAliveInterval
diff --git a/ssh_config.5 b/ssh_config.5
index 001130936..442222cc5 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,8 +34,8 @@
 .\" (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 $
-.Dd $Mdocdate: November 10 2009 $
+.\" $OpenBSD: ssh_config.5,v 1.124 2009/12/29 16:38:41 stevesk Exp $
+.Dd $Mdocdate: December 29 2009 $
 .Dt SSH_CONFIG 5
 .Os
 .Sh NAME
@@ -789,7 +789,7 @@ or
 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
diff --git a/sshd_config.5 b/sshd_config.5
index 6d2ad9df0..ada265373 100644
--- a/sshd_config.5
+++ b/sshd_config.5
@@ -34,8 +34,8 @@
 .\" (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 $
-.Dd $Mdocdate: December 19 2009 $
+.\" $OpenBSD: sshd_config.5,v 1.114 2009/12/29 16:38:41 stevesk Exp $
+.Dd $Mdocdate: December 29 2009 $
 .Dt SSHD_CONFIG 5
 .Os
 .Sh NAME
@@ -806,7 +806,7 @@ 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
+.It Cm RoutingDomain
 Set the routing domain number.
 The default routing domain is set by the system.
 .It Cm RhostsRSAAuthentication