- (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to

   be created.

diff --git a/ChangeLog b/ChangeLog
index 60162c08870dec7c8484f378b9a7e43150c62631..8266723e8a8cb8c95fa6f17f516e9e2ffbe9c2de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -163,6 +163,8 @@
    RoutingDomain an unsupported option on platforms that don't have it.
  - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
    too.
+ - (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
+   be created.
 
 20091226
  - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

diff --git a/misc.c b/misc.c
index db57f92b21b5248fb7e72fc7a5b8c3dde3704856..08a80226d8e150bd72db210b45ce6fad5806b153 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,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
 
        if (rdomain == -1)
                return (sock);
-       
+
+#ifdef USE_ROUTINGDOMAIN
        switch (domain) {
        case AF_INET6:
                ipproto = IPPROTO_IPV6;
@@ -187,6 +187,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
        }
 
        return (sock);
+#else
+       return (-1);
 #endif
 }