diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2016-01-14 16:17:39 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2016-01-27 16:54:10 +1100 |
| commit | a306863831c57ec5fad918687cc5d289ee8e2635 (patch) | |
| tree | 0321a74bc4a9be03ad303d35306555ca0908ee25 /sshconnect.c | |
| parent | 6ef49e83e30688504552ac10875feabd5521565f (diff) | |
| download | openssh-git-a306863831c57ec5fad918687cc5d289ee8e2635.tar.gz | |
upstream commit
remove roaming support; ok djm@
Upstream-ID: 2cab8f4b197bc95776fb1c8dc2859dad0c64dc56
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 9dcbdeb6..a22710d9 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sshconnect.c,v 1.269 2015/11/20 01:45:29 djm Exp $ */ +/* $OpenBSD: sshconnect.c,v 1.270 2016/01/14 16:17:40 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -59,7 +59,6 @@ #include "readconf.h" #include "atomicio.h" #include "dns.h" -#include "roaming.h" #include "monitor_fdpass.h" #include "ssh2.h" #include "version.h" @@ -532,7 +531,7 @@ send_client_banner(int connection_out, int minor1) xasprintf(&client_version_string, "SSH-%d.%d-%.100s\n", PROTOCOL_MAJOR_1, minor1, SSH_VERSION); } - if (roaming_atomicio(vwrite, connection_out, client_version_string, + if (atomicio(vwrite, connection_out, client_version_string, strlen(client_version_string)) != strlen(client_version_string)) fatal("write: %.100s", strerror(errno)); chop(client_version_string); @@ -592,7 +591,7 @@ ssh_exchange_identification(int timeout_ms) } } - len = roaming_atomicio(read, connection_in, &buf[i], 1); + len = atomicio(read, connection_in, &buf[i], 1); if (len != 1 && errno == EPIPE) fatal("ssh_exchange_identification: " |