summaryrefslogtreecommitdiff
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
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
-rw-r--r--CREDITS1
-rw-r--r--ChangeLog7
-rw-r--r--auth-krb4.c2
-rw-r--r--key.c2
-rw-r--r--radix.c2
-rw-r--r--sshd.c4
-rw-r--r--uuencode.c2
7 files changed, 18 insertions, 2 deletions
diff --git a/CREDITS b/CREDITS
index 97712938..e47cf456 100644
--- a/CREDITS
+++ b/CREDITS
@@ -51,6 +51,7 @@ Phil Karn <karn@ka9q.ampr.org> - Autoconf fix
Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix
SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes
Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes
+Svante Signell <svante.signell@telia.com> - Bugfixes
Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords
Tom Bertelson's <tbert@abac.com> - AIX auth fixes
Tor-Ake Fransson <torake@hotmail.com> - AIX support
diff --git a/ChangeLog b/ChangeLog
index 23e96956..37d9db66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
- (djm) Use sa_family_t in prototype for rresvport_af. Patch from
Svante Signell <svante.signell@telia.com>
- (djm) Autoconf logic to define sa_family_t if it is missing
+ - 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
20000622
- (djm) Automatically generate host key during "make install". Suggested
diff --git a/auth-krb4.c b/auth-krb4.c
index a2684271..e32089b7 100644
--- a/auth-krb4.c
+++ b/auth-krb4.c
@@ -9,6 +9,8 @@
#include "ssh.h"
#include "servconf.h"
+RCSID("$OpenBSD: auth-krb4.c,v 1.15 2000/06/22 23:54:59 djm Exp $");
+
#ifdef KRB4
char *ticket = NULL;
diff --git a/key.c b/key.c
index be38a88f..764f1f22 100644
--- a/key.c
+++ b/key.c
@@ -41,6 +41,8 @@
#include "dsa.h"
#include "uuencode.h"
+RCSID("$OpenBSD: key.c,v 1.9 2000/06/22 23:55:00 djm Exp $");
+
#define SSH_DSS "ssh-dss"
Key *
diff --git a/radix.c b/radix.c
index 03377334..7e668ea6 100644
--- a/radix.c
+++ b/radix.c
@@ -7,6 +7,8 @@
#include "includes.h"
#include "uuencode.h"
+RCSID("$OpenBSD: radix.c,v 1.12 2000/06/22 23:55:00 djm Exp $");
+
#ifdef AFS
#include <krb.h>
diff --git a/sshd.c b/sshd.c
index ec860024..32a6fac7 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.118 2000/05/25 20:45:20 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.119 2000/06/22 16:32:27 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -296,7 +296,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
/* Read other side\'s version identification. */
for (i = 0; i < sizeof(buf) - 1; i++) {
- if (read(sock_in, &buf[i], 1) != 1) {
+ if (atomicio(read, sock_in, &buf[i], 1) != 1) {
log("Did not receive ident string from %s.", get_remote_ipaddr());
fatal_cleanup();
}
diff --git a/uuencode.c b/uuencode.c
index 2540d756..27ba6559 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -4,6 +4,8 @@
#include "includes.h"
#include "xmalloc.h"
+RCSID("$OpenBSD: uuencode.c,v 1.6 2000/06/22 23:55:00 djm Exp $");
+
int
uuencode(unsigned char *src, unsigned int srclength,
char *target, size_t targsize)