summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2010-01-08 20:03:56 +1100
committerDarren Tucker <dtucker@zip.com.au>2010-01-08 20:03:56 +1100
commite83c3ea4b8086c04c9ba0d012808d9c65c0bbe65 (patch)
treecc0e903c5c7da48759f7612a7700b6f60e96a24f
parent843f0fa16d7e8aca36c1b14d933da2a1844d5a74 (diff)
- (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
be created.
-rw-r--r--ChangeLog2
-rw-r--r--misc.c6
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 60162c088..8266723e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -163,6 +163,8 @@
163 RoutingDomain an unsupported option on platforms that don't have it. 163 RoutingDomain an unsupported option on platforms that don't have it.
164 - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote 164 - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
165 too. 165 too.
166 - (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
167 be created.
166 168
16720091226 16920091226
168 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 170 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1
diff --git a/misc.c b/misc.c
index db57f92b2..08a80226d 100644
--- a/misc.c
+++ b/misc.c
@@ -155,7 +155,6 @@ set_nodelay(int fd)
155int 155int
156socket_rdomain(int domain, int type, int protocol, int rdomain) 156socket_rdomain(int domain, int type, int protocol, int rdomain)
157{ 157{
158#ifdef USE_ROUTINGDOMAIN
159 int sock, ipproto = IPPROTO_IP; 158 int sock, ipproto = IPPROTO_IP;
160 159
161 if ((sock = socket(domain, type, protocol)) == -1) 160 if ((sock = socket(domain, type, protocol)) == -1)
@@ -163,7 +162,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
163 162
164 if (rdomain == -1) 163 if (rdomain == -1)
165 return (sock); 164 return (sock);
166 165
166#ifdef USE_ROUTINGDOMAIN
167 switch (domain) { 167 switch (domain) {
168 case AF_INET6: 168 case AF_INET6:
169 ipproto = IPPROTO_IPV6; 169 ipproto = IPPROTO_IPV6;
@@ -187,6 +187,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
187 } 187 }
188 188
189 return (sock); 189 return (sock);
190#else
191 return (-1);
190#endif 192#endif
191} 193}
192 194