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

   Remove hacks add for RoutingDomain in preparation for its removal.

diff --git a/ChangeLog b/ChangeLog
index 6700f308e02a6efe7322c23cb7a5dfb8fb5dab12..e38cd5108d76da69529593a87d28c7175c23b2ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20091210
+ - (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
+   Remove hacks add for RoutingDomain in preparation for its removal.
+
 20091209
  - (dtucker) Wrap use of IPPROTO_IPV6 in an ifdef for platforms that don't
    have it.

diff --git a/configure.ac b/configure.ac
index af1f03215adab61992ca4f980fd721940310849a..71b313c5943872262234e623cb31f84dbfec538d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1623,11 +1623,6 @@ if test "x$ac_cv_func_getpeereid" != "xyes" -a "x$ac_cv_func_getpeerucred" != "x
         )
 fi
 
-AC_CHECK_DECL(SO_RDOMAIN,
-    AC_DEFINE(USE_ROUTINGDOMAIN, 1, [Enable rdomain/VRF support]), ,
-    [#include <sys/types.h>
-     #include <sys/socket.h>])
-
 dnl see whether mkstemp() requires XXXXXX
 if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
 AC_MSG_CHECKING([for (overly) strict mkstemp])

diff --git a/misc.c b/misc.c
index b260d89fe94fa4cd82a4f62cadbf6118f75ad3cf..550b03cadb7f66f616b6329287f82862208acee6 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -164,13 +164,10 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
                return (sock);
 
        switch (domain) {
-#ifdef IPPROTO_IPV6
        case AF_INET6:
                ipproto = IPPROTO_IPV6;
                /* FALLTHROUGH */
-#endif
        case AF_INET:
-#ifdef USE_ROUTINGDOMAIN
                debug2("socket %d af %d setting rdomain %d",
                    sock, domain, rdomain);
                if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
@@ -180,7 +177,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
                        close(sock);
                        return (-1);
                }
-#endif
                break;
        default:
                debug("socket %d af %d does not support rdomain %d",
@@ -277,7 +273,6 @@ a2port(const char *s)
        return (int)port;
 }
 
-#ifdef USE_ROUTINGDOMAIN
 int
 a2rdomain(const char *s)
 {
@@ -289,7 +284,6 @@ a2rdomain(const char *s)
                return -1;
        return (int)rdomain;
 }
-#endif
 
 int
 a2tun(const char *s, int *remote)

diff --git a/readconf.c b/readconf.c
index 47c77472a837458d322624697a4bc1aa1ff2080d..40fe8f694c4cbf293d1ad7087524215da1775615 100644 (file)
--- 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\"",

diff --git a/servconf.c b/servconf.c
index 9ad08ce870dbe17f86dffb8e971f78bb997ba1a7..2cdc480e607f41daa86cb8cd60203093c9d6c1c0 100644 (file)
--- 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",

diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 086c0d345e2a703067f2fa16778c5e52df44ef29..faeb9e13ed64ca711f5cca8bab47e9128e350949 100644 (file)
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -807,17 +807,11 @@ main(int argc, char **argv)
                        IPv4or6 = AF_INET6;
                        break;
                case 'V':
-#ifdef USE_ROUTINGDOMAIN
                        scan_rdomain = a2rdomain(optarg);
                        if (scan_rdomain == -1) {
                                fprintf(stderr, "Bad rdomain '%s'\n", optarg);
                                exit(1);
                        }
-#else
-                       fprintf(stderr, "RoutingDomain not supported on this "
-                          "platform.\n");
-                       exit(1);
-#endif
                        break;
                case '?':
                default: