- (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 db57f92b21b5248fb7e72fc7a5b8c3dde3704856..550b03cadb7f66f616b6329287f82862208acee6 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -155,7 +155,6 @@ set_nodelay(int fd)
 int
 socket_rdomain(int domain, int type, int protocol, int rdomain)
 {
-#ifdef USE_ROUTINGDOMAIN
        int sock, ipproto = IPPROTO_IP;
 
        if ((sock = socket(domain, type, protocol)) == -1)
@@ -163,7 +162,7 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
 
        if (rdomain == -1)
                return (sock);
-       
+
        switch (domain) {
        case AF_INET6:
                ipproto = IPPROTO_IPV6;
@@ -187,7 +186,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
        }
 
        return (sock);
-#endif
 }
 
 /* Characters considered whitespace in strsep calls. */
@@ -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)