tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/07/12 00:43:50 

[misc.c]
     in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when
     errno == 0. Avoids confusing error message in some broken resolver
     cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker
This commit is contained in:
Damien Miller 2013-07-18 16:13:19 +10:00
parent 746d1a6c52
commit 7313fc9222
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -44,6 +44,11 @@
- djm@cvs.openbsd.org 2013/07/12 00:20:00 - djm@cvs.openbsd.org 2013/07/12 00:20:00
[sftp.c ssh-keygen.c ssh-pkcs11.c] [sftp.c ssh-keygen.c ssh-pkcs11.c]
fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@ fix pointer-signedness warnings from clang/llvm-3.3; "seems nice" deraadt@
- djm@cvs.openbsd.org 2013/07/12 00:43:50
[misc.c]
in ssh_gai_strerror() don't fallback to strerror for EAI_SYSTEM when
errno == 0. Avoids confusing error message in some broken resolver
cases. bz#2122 patch from plautrba AT redhat.com; ok dtucker
20130702 20130702
- (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config - (dtucker) [contrib/cygwin/README contrib/cygwin/ssh-host-config

4
misc.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: misc.c,v 1.90 2013/06/01 13:15:52 dtucker Exp $ */ /* $OpenBSD: misc.c,v 1.91 2013/07/12 00:43:50 djm Exp $ */
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000 Markus Friedl. All rights reserved.
* Copyright (c) 2005,2006 Damien Miller. All rights reserved. * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@ -127,7 +127,7 @@ unset_nonblock(int fd)
const char * const char *
ssh_gai_strerror(int gaierr) ssh_gai_strerror(int gaierr)
{ {
if (gaierr == EAI_SYSTEM) if (gaierr == EAI_SYSTEM && errno != 0)
return strerror(errno); return strerror(errno);
return gai_strerror(gaierr); return gai_strerror(gaierr);
} }