summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2003-09-23 18:49:28 +1000
committerDarren Tucker <dtucker@zip.com.au>2003-09-23 18:49:28 +1000
commitd640322dd83423ee78cea4d576ea29395454dabd (patch)
tree545c12a236b0b9a6b33093e16ae577128a7ed581
parentefa09bf250909dca709deb74402ff6a8e86cc3c1 (diff)
- markus@cvs.openbsd.org 2003/09/18 07:52:54
[sshconnect.c] missing {}; bug #656; jclonguet at free.fr
-rw-r--r--ChangeLog8
-rw-r--r--sshconnect.c5
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 46700ecf..06c1937c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
20030923
+ - (dtucker) OpenBSD CVS Sync
+ - markus@cvs.openbsd.org 2003/09/18 07:52:54
+ [sshconnect.c]
+ missing {}; bug #656; jclonguet at free.fr
+
+20030922
- (dtucker) [Makefile.in] Bug #644: Fix "make clean" for out-of-tree
builds. Portability corrections from tim@.
- (dtucker) [configure.ac] Bug #665: uid swapping issues on Mac OS X.
@@ -1162,4 +1168,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.2994.2.27 2003/09/23 02:51:36 tim Exp $
+$Id: ChangeLog,v 1.2994.2.28 2003/09/23 08:49:28 dtucker Exp $
diff --git a/sshconnect.c b/sshconnect.c
index 40d22800..f29ac808 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;