diff options
| author | des <des@FreeBSD.org> | 2009-10-01 15:19:37 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2009-10-01 15:19:37 +0000 |
| commit | 98b8242e22b0fc941b830dcec63d235b01bd46a2 (patch) | |
| tree | e5b7ad86bb53b8a7e0394f159b15abac2622bdb6 /sshconnect.c | |
| parent | f4c3a2131f559534b5693fd15df8d89049db7cbb (diff) | |
| download | FreeBSD-src-98b8242e22b0fc941b830dcec63d235b01bd46a2.zip FreeBSD-src-98b8242e22b0fc941b830dcec63d235b01bd46a2.tar.gz | |
Vendor import of OpenSSH 5.3p1
Diffstat (limited to 'sshconnect.c')
| -rw-r--r-- | sshconnect.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c index c04aa10..3e57e85 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.212 2008/10/14 18:11:33 stevesk Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.214 2009/05/28 16:50:16 andreas Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -56,6 +56,7 @@ #include "atomicio.h" #include "misc.h" #include "dns.h" +#include "roaming.h" #include "version.h" char *client_version_string = NULL; @@ -413,7 +414,7 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, * Waits for the server identification string, and sends our own * identification string. */ -static void +void ssh_exchange_identification(int timeout_ms) { char buf[256], remote_version[256]; /* must be same size! */ @@ -452,7 +453,7 @@ ssh_exchange_identification(int timeout_ms) } } - len = atomicio(read, connection_in, &buf[i], 1); + len = roaming_atomicio(read, connection_in, &buf[i], 1); if (len != 1 && errno == EPIPE) fatal("ssh_exchange_identification: " @@ -537,7 +538,8 @@ ssh_exchange_identification(int timeout_ms) compat20 ? PROTOCOL_MAJOR_2 : PROTOCOL_MAJOR_1, compat20 ? PROTOCOL_MINOR_2 : minor1, SSH_VERSION, compat20 ? "\r\n" : "\n"); - if (atomicio(vwrite, connection_out, buf, strlen(buf)) != strlen(buf)) + if (roaming_atomicio(vwrite, connection_out, buf, strlen(buf)) + != strlen(buf)) fatal("write: %.100s", strerror(errno)); client_version_string = xstrdup(buf); chop(client_version_string); |
