diff options
author | djm <djm> | 2003-11-21 12:48:55 +0000 |
---|---|---|
committer | djm <djm> | 2003-11-21 12:48:55 +0000 |
commit | 184f11a0f4c6f7fc01a68e91b85ae8934d0a1f13 (patch) | |
tree | 97214a8b98655fccf709f332aff731b00dd7e65d /sshconnect.c | |
parent | 78a871571e55ae5a74227b0b5c31d728d5651a8e (diff) | |
download | openssh-184f11a0f4c6f7fc01a68e91b85ae8934d0a1f13.tar.gz |
- djm@cvs.openbsd.org 2003/11/21 11:57:03
[everything]
unexpand and delete whitespace at EOL; ok markus@
(done locally and RCS IDs synced)
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sshconnect.c b/sshconnect.c index 5972e2ba..3d6cc375 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.153 2003/11/12 16:39:58 jakob Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.154 2003/11/21 11:57:03 djm Exp $"); #include <openssl/bn.h> @@ -74,7 +74,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) * Build the final command string in the buffer by making the * appropriate substitutions to the given proxy command. * - * Use "exec" to avoid "sh -c" processes on some platforms + * Use "exec" to avoid "sh -c" processes on some platforms * (e.g. Solaris) */ buffer_init(&command); @@ -261,15 +261,15 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, break; case -1: /* Select error */ - debug("select: %s", strerror(errno)); + debug("select: %s", strerror(errno)); break; case 1: /* Completed or failed */ optval = 0; optlen = sizeof(optval); - if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, + if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, &optlen) == -1) { - debug("getsockopt: %s", strerror(errno)); + debug("getsockopt: %s", strerror(errno)); break; } if (optval != 0) { |