summaryrefslogtreecommitdiff
path: root/misc.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-10 10:26:57 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-10 10:26:57 +1100
commit8c65f646a93ed2f61da65ba0ecf65a99bd585b79 (patch)
tree40d5451fe48c9ef98525bdefd6a672a7484ac6de /misc.c
parent269275c90cd2ffda85f32114bfaeff978298e346 (diff)
- (dtucker) [configure.ac misc.c readconf.c servconf.c ssh-keyscan.c]
Remove hacks add for RoutingDomain in preparation for its removal.
Diffstat (limited to 'misc.c')
-rw-r--r--misc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/misc.c b/misc.c
index b260d89f..550b03ca 100644
--- a/misc.c
+++ b/misc.c
@@ -164,13 +164,10 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
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,
@@ -180,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",
@@ -277,7 +273,6 @@ a2port(const char *s)
return (int)port;
}
-#ifdef USE_ROUTINGDOMAIN
int
a2rdomain(const char *s)
{
@@ -289,7 +284,6 @@ a2rdomain(const char *s)
return -1;
return (int)rdomain;
}
-#endif
int
a2tun(const char *s, int *remote)