diff options
author | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 13:46:56 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2003-07-03 13:46:56 +1000 |
commit | 9f63f22aa0ab13673f197642a66a98b09a18abd0 (patch) | |
tree | d0d0ef1e3802a533d3a935f87de175e9ea010cea /ssh-keyscan.c | |
parent | e53270481c279cb50cf31bc83dc6c91835f9a524 (diff) |
- 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 'ssh-keyscan.c')
-rw-r--r-- | ssh-keyscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index e2cd789b5..358a1e353 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "includes.h" | 9 | #include "includes.h" |
10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.43 2003/04/26 04:29:49 deraadt Exp $"); | 10 | RCSID("$OpenBSD: ssh-keyscan.c,v 1.44 2003/06/28 16:23:06 deraadt Exp $"); |
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | 13 | ||
@@ -541,7 +541,7 @@ congreet(int s) | |||
541 | n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n", | 541 | n = snprintf(buf, sizeof buf, "SSH-%d.%d-OpenSSH-keyscan\r\n", |
542 | c->c_keytype == KT_RSA1? PROTOCOL_MAJOR_1 : PROTOCOL_MAJOR_2, | 542 | c->c_keytype == KT_RSA1? PROTOCOL_MAJOR_1 : PROTOCOL_MAJOR_2, |
543 | c->c_keytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2); | 543 | c->c_keytype == KT_RSA1? PROTOCOL_MINOR_1 : PROTOCOL_MINOR_2); |
544 | if (atomicio(write, s, buf, n) != n) { | 544 | if (atomicio(vwrite, s, buf, n) != n) { |
545 | error("write (%s): %s", c->c_name, strerror(errno)); | 545 | error("write (%s): %s", c->c_name, strerror(errno)); |
546 | confree(s); | 546 | confree(s); |
547 | return; | 547 | return; |