diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sshconnect.c b/sshconnect.c index 9dcbdeb66..a22710d9f 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.269 2015/11/20 01:45:29 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.270 2016/01/14 16:17:40 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -59,7 +59,6 @@ | |||
59 | #include "readconf.h" | 59 | #include "readconf.h" |
60 | #include "atomicio.h" | 60 | #include "atomicio.h" |
61 | #include "dns.h" | 61 | #include "dns.h" |
62 | #include "roaming.h" | ||
63 | #include "monitor_fdpass.h" | 62 | #include "monitor_fdpass.h" |
64 | #include "ssh2.h" | 63 | #include "ssh2.h" |
65 | #include "version.h" | 64 | #include "version.h" |
@@ -532,7 +531,7 @@ send_client_banner(int connection_out, int minor1) | |||
532 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", | 531 | xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", |
533 | PROTOCOL_MAJOR_1, minor1, SSH_VERSION); | 532 | PROTOCOL_MAJOR_1, minor1, SSH_VERSION); |
534 | } | 533 | } |
535 | if (roaming_atomicio(vwrite, connection_out, client_version_string, | 534 | if (atomicio(vwrite, connection_out, client_version_string, |
536 | strlen(client_version_string)) != strlen(client_version_string)) | 535 | strlen(client_version_string)) != strlen(client_version_string)) |
537 | fatal("write: %.100s", strerror(errno)); | 536 | fatal("write: %.100s", strerror(errno)); |
538 | chop(client_version_string); | 537 | chop(client_version_string); |
@@ -592,7 +591,7 @@ ssh_exchange_identification(int timeout_ms) | |||
592 | } | 591 | } |
593 | } | 592 | } |
594 | 593 | ||
595 | len = roaming_atomicio(read, connection_in, &buf[i], 1); | 594 | len = atomicio(read, connection_in, &buf[i], 1); |
596 | 595 | ||
597 | if (len != 1 && errno == EPIPE) | 596 | if (len != 1 && errno == EPIPE) |
598 | fatal("ssh_exchange_identification: " | 597 | fatal("ssh_exchange_identification: " |