summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-06-23 10:16:38 +1000
committerDamien Miller <djm@mindrot.org>2000-06-23 10:16:38 +1000
commitbf7f466206d4ca43c66d910099b2047df5659350 (patch)
tree4ada535baf0220a2007b046432e4614054e06a9f /sshd.c
parentb54b40ef06517dc3091253228f06d3bd54f19a82 (diff)
- OpenBSD CVS Updates:
- markus@cvs.openbsd.org 2000/06/22 10:32:27 [sshd.c] missing atomicio; report from Steve.Marquess@DET.AMEDD.ARMY.MIL - djm@cvs.openbsd.org 2000/06/22 17:55:00 [auth-krb4.c key.c radix.c uuencode.c] Missing CVS idents; ok markus
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sshd.c b/sshd.c
index ec860024b..32a6fac7f 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sshd.c,v 1.118 2000/05/25 20:45:20 markus Exp $"); 17RCSID("$OpenBSD: sshd.c,v 1.119 2000/06/22 16:32:27 markus Exp $");
18 18
19#include "xmalloc.h" 19#include "xmalloc.h"
20#include "rsa.h" 20#include "rsa.h"
@@ -296,7 +296,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
296 296
297 /* Read other side\'s version identification. */ 297 /* Read other side\'s version identification. */
298 for (i = 0; i < sizeof(buf) - 1; i++) { 298 for (i = 0; i < sizeof(buf) - 1; i++) {
299 if (read(sock_in, &buf[i], 1) != 1) { 299 if (atomicio(read, sock_in, &buf[i], 1) != 1) {
300 log("Did not receive ident string from %s.", get_remote_ipaddr()); 300 log("Did not receive ident string from %s.", get_remote_ipaddr());
301 fatal_cleanup(); 301 fatal_cleanup();
302 } 302 }