mirror of git://anongit.mindrot.org/openssh.git
- (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
be created.
This commit is contained in:
parent
843f0fa16d
commit
e83c3ea4b8
|
@ -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
|
||||
|
|
6
misc.c
6
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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue