X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/blobdiff_plain/fe7dba42f8a9310cf20bcb4e99419926ee2e5d5c..2d7536f69d3075ecf69c2ac24a4ca4bf8223f89f:/readconf.c

diff --git a/readconf.c b/readconf.c
index 6b2e3b21..47c77472 100644
--- 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\"",