summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshd.c b/sshd.c
index b4cdc724a..fafe0c66d 100644
--- a/sshd.c
+++ b/sshd.c
@@ -42,7 +42,7 @@
42 */ 42 */
43 43
44#include "includes.h" 44#include "includes.h"
45RCSID("$OpenBSD: sshd.c,v 1.270 2003/06/28 07:48:10 djm Exp $"); 45RCSID("$OpenBSD: sshd.c,v 1.271 2003/06/28 16:23:06 deraadt Exp $");
46 46
47#include <openssl/dh.h> 47#include <openssl/dh.h>
48#include <openssl/bn.h> 48#include <openssl/bn.h>
@@ -369,7 +369,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
369 369
370 if (client_version_string == NULL) { 370 if (client_version_string == NULL) {
371 /* Send our protocol version identification. */ 371 /* Send our protocol version identification. */
372 if (atomicio(write, sock_out, server_version_string, 372 if (atomicio(vwrite, sock_out, server_version_string,
373 strlen(server_version_string)) 373 strlen(server_version_string))
374 != strlen(server_version_string)) { 374 != strlen(server_version_string)) {
375 logit("Could not write ident string to %s", get_remote_ipaddr()); 375 logit("Could not write ident string to %s", get_remote_ipaddr());
@@ -408,7 +408,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
408 if (sscanf(client_version_string, "SSH-%d.%d-%[^\n]\n", 408 if (sscanf(client_version_string, "SSH-%d.%d-%[^\n]\n",
409 &remote_major, &remote_minor, remote_version) != 3) { 409 &remote_major, &remote_minor, remote_version) != 3) {
410 s = "Protocol mismatch.\n"; 410 s = "Protocol mismatch.\n";
411 (void) atomicio(write, sock_out, s, strlen(s)); 411 (void) atomicio(vwrite, sock_out, s, strlen(s));
412 close(sock_in); 412 close(sock_in);
413 close(sock_out); 413 close(sock_out);
414 logit("Bad protocol version identification '%.100s' from %s", 414 logit("Bad protocol version identification '%.100s' from %s",
@@ -469,7 +469,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
469 469
470 if (mismatch) { 470 if (mismatch) {
471 s = "Protocol major versions differ.\n"; 471 s = "Protocol major versions differ.\n";
472 (void) atomicio(write, sock_out, s, strlen(s)); 472 (void) atomicio(vwrite, sock_out, s, strlen(s));
473 close(sock_in); 473 close(sock_in);
474 close(sock_out); 474 close(sock_out);
475 logit("Protocol major versions differ for %s: %.200s vs. %.200s", 475 logit("Protocol major versions differ for %s: %.200s vs. %.200s",