- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]

   Remove hacks add for RoutingDomain in preparation for its removal.

1 files changed, 0 insertions, 6 deletions

diff --git a/readconf.c b/readconf.c
index 47c77472a..40fe8f694 100644
--- a/readconf.c
+++ b/readconf.c
@@ -229,11 +229,7 @@ static struct {
         { "permitlocalcommand", oPermitLocalCommand },
         { "visualhostkey", oVisualHostKey },
         { "useroaming", oUseRoaming },
-#ifdef USE_ROUTINGDOMAIN
         { "routingdomain", oRDomain },
-#else
-        { "routingdomain", oUnsupported },
-#endif
 #ifdef JPAKE
         { "zeroknowledgepasswordauthentication",
             oZeroKnowledgePasswordAuthentication },
@@ -924,7 +920,6 @@ parse_int:
                 intptr = &options->use_roaming;
                 goto parse_flag;
 
-#ifdef USE_ROUTINGDOMAIN
         case oRDomain:
                 arg = strdelim(&s);
                 if (!arg || *arg == '\0')
@@ -937,7 +932,6 @@ parse_int:
                 if (*activep)
                         options->rdomain = value;
                 break;
-#endif
 
         case oDeprecated:
                 debug("%s line %d: Deprecated option \"%s\"",