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

- markus@cvs.openbsd.org 2003/09/18 07:52:54 

[sshconnect.c]
     missing {}; bug #656; jclonguet at free.fr
This commit is contained in:
Darren Tucker 2003-09-22 20:59:16 +10:00
parent 220bf133b6
commit bd5361b237
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -29,6 +29,10 @@
Report by distler AT golem ph utexas edu. Report by distler AT golem ph utexas edu.
- (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from - (dtucker) [contrib/aix/pam.conf] Include example pam.conf for AIX from
article by genty at austin.ibm.com, included with the author's permission. article by genty at austin.ibm.com, included with the author's permission.
- (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/09/18 07:52:54
[sshconnect.c]
missing {}; bug #656; jclonguet at free.fr
20030919 20030919
- (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL; - (djm) Bug #683: Remove reference to --with-ipv4-default from INSTALL;
@ -1165,4 +1169,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.3023 2003/09/22 10:41:40 dtucker Exp $ $Id: ChangeLog,v 1.3024 2003/09/22 10:59:16 dtucker Exp $

5
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.147 2003/06/29 12:44:38 markus Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.148 2003/09/18 07:52:54 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -271,9 +271,10 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
optval = 0; optval = 0;
optlen = sizeof(optval); optlen = sizeof(optval);
if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval,
&optlen) == -1) &optlen) == -1) {
debug("getsockopt: %s", strerror(errno)); debug("getsockopt: %s", strerror(errno));
break; break;
}
if (optval != 0) { if (optval != 0) {
errno = optval; errno = optval;
break; break;