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

     [sshconnect.c]
     missing {}; bug #656; jclonguet at free.fr

2 files changed, 8 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 6ce8fbaee..d2d2ebbb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,10 @@
    Report by distler AT golem ph utexas edu.
  - (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.
+ - (dtucker) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2003/09/18 07:52:54
+     [sshconnect.c]
+     missing {}; bug #656; jclonguet at free.fr
 
 20030919
  - (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.
    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 $
diff --git a/sshconnect.c b/sshconnect.c
index 40d22800f..f29ac8088 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #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>
 
@@ -271,9 +271,10 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
                 optval = 0;
                 optlen = sizeof(optval);
                 if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, 
-                    &optlen) == -1)
+                    &optlen) == -1) {
                         debug("getsockopt: %s", strerror(errno));
                         break;
+                }
                 if (optval != 0) {
                         errno = optval;
                         break;