diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 05:46:56 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 05:46:56 +0200 |
| commit | 9f63f22aa0ab13673f197642a66a98b09a18abd0 (patch) | |
| tree | d0d0ef1e3802a533d3a935f87de175e9ea010cea /sshd.c | |
| parent | - djm@cvs.openbsd.org 2003/06/28 07:48:10 (diff) | |
| download | openssh-9f63f22aa0ab13673f197642a66a98b09a18abd0.tar.xz openssh-9f63f22aa0ab13673f197642a66a98b09a18abd0.zip | |
- deraadt@cvs.openbsd.org 2003/06/28 16:23:06
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
sshd.c]
deal with typing of write vs read in atomicio
Diffstat (limited to '')
| -rw-r--r-- | sshd.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.270 2003/06/28 07:48:10 djm Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.271 2003/06/28 16:23:06 deraadt Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -369,7 +369,7 @@ sshd_exchange_identification(int sock_in, int sock_out) if (client_version_string == NULL) { /* Send our protocol version identification. */ - if (atomicio(write, sock_out, server_version_string, + if (atomicio(vwrite, sock_out, server_version_string, strlen(server_version_string)) != strlen(server_version_string)) { logit("Could not write ident string to %s", get_remote_ipaddr()); @@ -408,7 +408,7 @@ sshd_exchange_identification(int sock_in, int sock_out) if (sscanf(client_version_string, "SSH-%d.%d-%[^\n]\n", &remote_major, &remote_minor, remote_version) != 3) { s = "Protocol mismatch.\n"; - (void) atomicio(write, sock_out, s, strlen(s)); + (void) atomicio(vwrite, sock_out, s, strlen(s)); close(sock_in); close(sock_out); logit("Bad protocol version identification '%.100s' from %s", @@ -469,7 +469,7 @@ sshd_exchange_identification(int sock_in, int sock_out) if (mismatch) { s = "Protocol major versions differ.\n"; - (void) atomicio(write, sock_out, s, strlen(s)); + (void) atomicio(vwrite, sock_out, s, strlen(s)); close(sock_in); close(sock_out); logit("Protocol major versions differ for %s: %.200s vs. %.200s", |