From 8c65f646a93ed2f61da65ba0ecf65a99bd585b79 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Sun, 10 Jan 2010 10:26:57 +1100
Subject:  - (dtucker) [configure.ac misc.c readconf.c servconf.c
 ssh-keyscan.c]    Remove hacks add for RoutingDomain in preparation for its
 removal.

---
 servconf.c | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'servconf.c')

diff --git a/servconf.c b/servconf.c
index 9ad08ce87..2cdc480e6 100644
--- a/servconf.c
+++ b/servconf.c
@@ -424,11 +424,7 @@ static struct {
 	{ "match", sMatch, SSHCFG_ALL },
 	{ "permitopen", sPermitOpen, SSHCFG_ALL },
 	{ "forcecommand", sForceCommand, SSHCFG_ALL },
-#ifdef USE_ROUTINGDOMAIN
 	{ "routingdomain", sRDomain, SSHCFG_GLOBAL },
-#else
-	{ "routingdomain", sUnsupported, SSHCFG_GLOBAL },
-#endif
 	{ "chrootdirectory", sChrootDirectory, SSHCFG_ALL },
 	{ NULL, sBadOption, 0 }
 };
@@ -1300,7 +1296,6 @@ process_server_config_line(ServerOptions *options, char *line,
 			*charptr = xstrdup(arg);
 		break;
 
-#ifdef USE_ROUTINGDOMAIN
 	case sRDomain:
 		intptr = &options->rdomain;
 		arg = strdelim(&cp);
@@ -1313,7 +1308,6 @@ process_server_config_line(ServerOptions *options, char *line,
 		if (*intptr == -1)
 			*intptr = value;
 		break;
-#endif
 
 	case sDeprecated:
 		logit("%s line %d: Deprecated option %s",
-- 
cgit v1.2.3