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

[openssh.git] / misc.c

diff --git a/misc.c b/misc.c
index f62f8efc6d55769d219eada8b30b44d991a5fb03..550b03cadb7f66f616b6329287f82862208acee6 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -168,7 +168,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
                ipproto = IPPROTO_IPV6;
                /* FALLTHROUGH */
        case AF_INET:
-#ifdef USE_ROUTINGDOMAIN
                debug2("socket %d af %d setting rdomain %d",
                    sock, domain, rdomain);
                if (setsockopt(sock, ipproto, SO_RDOMAIN, &rdomain,
@@ -178,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",
@@ -275,7 +273,6 @@ a2port(const char *s)
        return (int)port;
 }
 
-#ifdef USE_ROUTINGDOMAIN
 int
 a2rdomain(const char *s)
 {
@@ -287,7 +284,6 @@ a2rdomain(const char *s)
                return -1;
        return (int)rdomain;
 }
-#endif
 
 int
 a2tun(const char *s, int *remote)