- djm@cvs.openbsd.org 2010/01/09 05:04:24

[openssh.git] / servconf.c

diff --git a/servconf.c b/servconf.c
index 729f23bade344f0b7a7f1937d8a9fd2b42b30f70..9ad08ce870dbe17f86dffb8e971f78bb997ba1a7 100644 (file)
--- a/servconf.c
+++ b/servconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: servconf.c,v 1.197 2009/10/28 16:38:18 reyk 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,11 @@ static struct {
        { "match", sMatch, SSHCFG_ALL },
        { "permitopen", sPermitOpen, SSHCFG_ALL },
        { "forcecommand", sForceCommand, SSHCFG_ALL },
-       { "rdomain", sRDomain, SSHCFG_GLOBAL },
+#ifdef USE_ROUTINGDOMAIN
+       { "routingdomain", sRDomain, SSHCFG_GLOBAL },
+#else
+       { "routingdomain", sUnsupported, SSHCFG_GLOBAL },
+#endif
        { "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
        { NULL, sBadOption, 0 }
 };
@@ -1296,9 +1300,20 @@ process_server_config_line(ServerOptions *options, char *line,
                        *charptr = xstrdup(arg);
                break;
 
+#ifdef USE_ROUTINGDOMAIN
        case sRDomain:
                intptr = &options->rdomain;
-               goto parse_int;
+               arg = strdelim(&cp);
+               if (!arg || *arg == '\0')
+                       fatal("%s line %d: missing rdomain value.",
+                           filename, linenum);
+               if ((value = a2rdomain(arg)) == -1)
+                       fatal("%s line %d: invalid rdomain value.",
+                           filename, linenum);
+               if (*intptr == -1)
+                       *intptr = value;
+               break;
+#endif
 
        case sDeprecated:
                logit("%s line %d: Deprecated option %s",