summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/sshconnect.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-06-17 20:30:11 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-06-17 20:30:11 +0000
commit06b8c1482e533f04a5c9997410492000b1a9f860 (patch)
tree7f7c7a5524c276978c92f2375b8cd25cc28ccba3 /usr.bin/ssh/sshconnect.c
parent4101354f3e6be5b49e2d61825c2c7cb7901bec22 (diff)
missing atomicio, typo
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
-rw-r--r--usr.bin/ssh/sshconnect.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index e0e073c8ca1..ea4dfde2fa2 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -8,7 +8,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.75 2000/06/17 19:24:34 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.76 2000/06/17 20:30:10 markus Exp $");
#include <openssl/bn.h>
#include <openssl/dsa.h>
@@ -312,7 +312,7 @@ ssh_exchange_identification()
/* Read other side\'s version identification. */
for (;;) {
for (i = 0; i < sizeof(buf) - 1; i++) {
- int len = read(connection_in, &buf[i], 1);
+ int len = atomicio(read, connection_in, &buf[i], 1);
if (len < 0)
fatal("ssh_exchange_identification: read: %.100s", strerror(errno));
if (len != 1)
@@ -328,7 +328,7 @@ ssh_exchange_identification()
}
}
buf[sizeof(buf) - 1] = 0;
- if (strncmp(buf, "SSH-", 4))
+ if (strncmp(buf, "SSH-", 4) == 0)
break;
debug("ssh_exchange_identification: %s", buf);
}