RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to 

be created.
This commit is contained in:
Darren Tucker 2010-01-08 20:03:56 +11:00
parent 843f0fa16d
commit e83c3ea4b8
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -163,6 +163,8 @@
RoutingDomain an unsupported option on platforms that don't have it. RoutingDomain an unsupported option on platforms that don't have it.
- (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote - (dtucker) [sftp.c] Expand ifdef for libedit to cover complete_is_remote
too. too.
- (dtucker) [misc.c] Move the routingdomain ifdef to allow the socket to
be created.
20091226 20091226
- (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1 - (tim) [contrib/cygwin/Makefile] Install ssh-copy-id and ssh-copy-id.1

6
misc.c
View File

@ -155,7 +155,6 @@ set_nodelay(int fd)
int int
socket_rdomain(int domain, int type, int protocol, int rdomain) socket_rdomain(int domain, int type, int protocol, int rdomain)
{ {
#ifdef USE_ROUTINGDOMAIN
int sock, ipproto = IPPROTO_IP; int sock, ipproto = IPPROTO_IP;
if ((sock = socket(domain, type, protocol)) == -1) if ((sock = socket(domain, type, protocol)) == -1)
@ -163,7 +162,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
if (rdomain == -1) if (rdomain == -1)
return (sock); return (sock);
#ifdef USE_ROUTINGDOMAIN
switch (domain) { switch (domain) {
case AF_INET6: case AF_INET6:
ipproto = IPPROTO_IPV6; ipproto = IPPROTO_IPV6;
@ -187,6 +187,8 @@ socket_rdomain(int domain, int type, int protocol, int rdomain)
} }
return (sock); return (sock);
#else
return (-1);
#endif #endif
} }