summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 20:09:01 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 20:09:01 +1100
commitcb5a1b6f7028dc3e3bf9f5875aee4a071eefe359 (patch)
tree0cf02efe5dae48e4b69166c3fe1d6751b02a62e6 /misc.c
parente83c3ea4b8086c04c9ba0d012808d9c65c0bbe65 (diff)
downloadopenssh-git-cb5a1b6f7028dc3e3bf9f5875aee4a071eefe359.tar.gz
- (dtucker] [misc.c] Shrink the area covered by USE_ROUTINGDOMAIN more
to eliminate an unused variable warning.
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/misc.c b/misc.c
index 08a80226..f62f8efc 100644
--- a/misc.c
+++ b/misc.c
@@ -163,12 +163,12 @@ 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;
/* 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,6 +178,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,9 +188,6 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
}
return (sock);
-#else
- return (-1);
-#endif
}
/* Characters considered whitespace in strsep calls. */