diff options
author | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-11-21 23:48:55 +1100 |
commit | a8e06cef35c205e1aa562513c6d034a10c8c9a6d (patch) | |
tree | cf8bdb4466f553088c020b9179cabd6eaf196075 /sshconnect.c | |
parent | 8c5e91c03fdd2693f0635f8b2a9904bffc94ce16 (diff) |
- 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 5972e2ba9..3d6cc375a 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -13,7 +13,7 @@ | |||
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include "includes.h" | 15 | #include "includes.h" |
16 | RCSID("$OpenBSD: sshconnect.c,v 1.153 2003/11/12 16:39:58 jakob Exp $"); | 16 | RCSID("$OpenBSD: sshconnect.c,v 1.154 2003/11/21 11:57:03 djm Exp $"); |
17 | 17 | ||
18 | #include <openssl/bn.h> | 18 | #include <openssl/bn.h> |
19 | 19 | ||
@@ -74,7 +74,7 @@ ssh_proxy_connect(const char *host, u_short port, const char *proxy_command) | |||
74 | * Build the final command string in the buffer by making the | 74 | * Build the final command string in the buffer by making the |
75 | * appropriate substitutions to the given proxy command. | 75 | * appropriate substitutions to the given proxy command. |
76 | * | 76 | * |
77 | * Use "exec" to avoid "sh -c" processes on some platforms | 77 | * Use "exec" to avoid "sh -c" processes on some platforms |
78 | * (e.g. Solaris) | 78 | * (e.g. Solaris) |
79 | */ | 79 | */ |
80 | buffer_init(&command); | 80 | buffer_init(&command); |
@@ -261,15 +261,15 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr, | |||
261 | break; | 261 | break; |
262 | case -1: | 262 | case -1: |
263 | /* Select error */ | 263 | /* Select error */ |
264 | debug("select: %s", strerror(errno)); | 264 | debug("select: %s", strerror(errno)); |
265 | break; | 265 | break; |
266 | case 1: | 266 | case 1: |
267 | /* Completed or failed */ | 267 | /* Completed or failed */ |
268 | optval = 0; | 268 | optval = 0; |
269 | optlen = sizeof(optval); | 269 | optlen = sizeof(optval); |
270 | if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, | 270 | if (getsockopt(sockfd, SOL_SOCKET, SO_ERROR, &optval, |
271 | &optlen) == -1) { | 271 | &optlen) == -1) { |
272 | debug("getsockopt: %s", strerror(errno)); | 272 | debug("getsockopt: %s", strerror(errno)); |
273 | break; | 273 | break; |
274 | } | 274 | } |
275 | if (optval != 0) { | 275 | if (optval != 0) { |