- djm@cvs.openbsd.org 2010/01/09 00:20:26

[openssh.git] / readconf.c

diff --git a/readconf.c b/readconf.c
index 6b2e3b21d75745e80031b6b5a604427eb5ae0b9f..47c77472a837458d322624697a4bc1aa1ff2080d 100644 (file)
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: readconf.c,v 1.179 2009/10/28 16:38:18 reyk 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,11 @@ static struct {
        { "permitlocalcommand", oPermitLocalCommand },
        { "visualhostkey", oVisualHostKey },
        { "useroaming", oUseRoaming },
-       { "rdomain", oRDomain },
+#ifdef USE_ROUTINGDOMAIN
+       { "routingdomain", oRDomain },
+#else
+       { "routingdomain", oUnsupported },
+#endif
 #ifdef JPAKE
        { "zeroknowledgepasswordauthentication",
            oZeroKnowledgePasswordAuthentication },
@@ -920,18 +924,20 @@ parse_int:
                intptr = &options->use_roaming;
                goto parse_flag;
 
+#ifdef USE_ROUTINGDOMAIN
        case oRDomain:
                arg = strdelim(&s);
                if (!arg || *arg == '\0')
                        fatal("%.200s line %d: Missing argument.",
                            filename, linenum);
-               value = a2port(arg);
+               value = a2rdomain(arg);
                if (value == -1)
                        fatal("%.200s line %d: Bad rdomain.",
                            filename, linenum);
                if (*activep)
                        options->rdomain = value;
                break;
+#endif
 
        case oDeprecated:
                debug("%s line %d: Deprecated option \"%s\"",