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

- (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721 

ok dtucker@
This commit is contained in:
Damien Miller 2010-03-26 11:09:44 +11:00
parent 8b90642fcf
commit 6480c63b75
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -11,6 +11,8 @@
- (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms - - (djm) [session.c] Allow ChrootDirectory to work on SELinux platforms -
set up SELinux execution context before chroot() call. From Russell set up SELinux execution context before chroot() call. From Russell
Coker via Colin watson; bz#1726 ok dtucker@ Coker via Colin watson; bz#1726 ok dtucker@
- (djm) [channels.c] Check for EPFNOSUPPORT as a socket() errno; bz#1721
ok dtucker@
20100324 20100324
- (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory - (dtucker) [contrib/cygwin/ssh-host-config] Mount the Windows directory

6
channels.c
View File

@ -3252,7 +3252,11 @@ x11_create_display_inet(int x11_display_offset, int x11_use_localhost,
sock = socket(ai->ai_family, ai->ai_socktype, sock = socket(ai->ai_family, ai->ai_socktype,
ai->ai_protocol); ai->ai_protocol);
if (sock < 0) { if (sock < 0) {
if ((errno != EINVAL) && (errno != EAFNOSUPPORT)) { if ((errno != EINVAL) && (errno != EAFNOSUPPORT)
#ifdef EPFNOSUPPORT
&& (errno != EPFNOSUPPORT)
#endif
) {
error("socket: %.100s", strerror(errno)); error("socket: %.100s", strerror(errno));
freeaddrinfo(aitop); freeaddrinfo(aitop);
return -1; return -1;