- (dtucker) [defines.h] define PRIu64 for platforms that don't have it.

[openssh.git] / misc.c

diff --git a/misc.c b/misc.c
index db57f92b21b5248fb7e72fc7a5b8c3dde3704856..b260d89fe94fa4cd82a4f62cadbf6118f75ad3cf 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,12 +162,15 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
 
        if (rdomain == -1)
                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,
@@ -178,6 +180,7 @@ 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",
@@ -187,7 +190,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
        }
 
        return (sock);
-#endif
 }
 
 /* Characters considered whitespace in strsep calls. */