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 977129388..e47cf4567 100644
--- a/CREDITS
+++ b/CREDITS
@@ -51,6 +51,7 @@ Phil Karn <karn@ka9q.ampr.org> - Autoconf fix
51Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix 51Phill Camp <P.S.S.Camp@ukc.ac.uk> - login code fix
52SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes 52SAKAI Kiyotaka <ksakai@kso.netwk.ntt-at.co.jp> - Multiple bugfixes
53Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes 53Simon Wilkinson <sxw@dcs.ed.ac.uk> - PAM fixes
54Svante Signell <svante.signell@telia.com> - Bugfixes
54Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords 55Thomas Neumann <tom@smart.ruhr.de> - Shadow passwords
55Tom Bertelson's <tbert@abac.com> - AIX auth fixes 56Tom Bertelson's <tbert@abac.com> - AIX auth fixes
56Tor-Ake Fransson <torake@hotmail.com> - AIX support 57Tor-Ake Fransson <torake@hotmail.com> - AIX support
diff --git a/ChangeLog b/ChangeLog
index 23e969560..37d9db662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,13 @@
2 - (djm) Use sa_family_t in prototype for rresvport_af. Patch from 2 - (djm) Use sa_family_t in prototype for rresvport_af. Patch from
3 Svante Signell <svante.signell@telia.com> 3 Svante Signell <svante.signell@telia.com>
4 - (djm) Autoconf logic to define sa_family_t if it is missing 4 - (djm) Autoconf logic to define sa_family_t if it is missing
5 - OpenBSD CVS Updates:
6 - markus@cvs.openbsd.org 2000/06/22 10:32:27
7 [sshd.c]
8 missing atomicio; report from Steve.Marquess@DET.AMEDD.ARMY.MIL
9 - djm@cvs.openbsd.org 2000/06/22 17:55:00
10 [auth-krb4.c key.c radix.c uuencode.c]
11 Missing CVS idents; ok markus
5 12
620000622 1320000622
7 - (djm) Automatically generate host key during "make install". Suggested 14 - (djm) Automatically generate host key during "make install". Suggested
diff --git a/auth-krb4.c b/auth-krb4.c
index a26842713..e32089b74 100644
--- a/auth-krb4.c
+++ b/auth-krb4.c
@@ -9,6 +9,8 @@
9#include "ssh.h" 9#include "ssh.h"
10#include "servconf.h" 10#include "servconf.h"
11 11
12RCSID("$OpenBSD: auth-krb4.c,v 1.15 2000/06/22 23:54:59 djm Exp $");
13
12#ifdef KRB4 14#ifdef KRB4
13char *ticket = NULL; 15char *ticket = NULL;
14 16
diff --git a/key.c b/key.c
index be38a88f5..764f1f227 100644
--- a/key.c
+++ b/key.c
@@ -41,6 +41,8 @@
41#include "dsa.h" 41#include "dsa.h"
42#include "uuencode.h" 42#include "uuencode.h"
43 43
44RCSID("$OpenBSD: key.c,v 1.9 2000/06/22 23:55:00 djm Exp $");
45
44#define SSH_DSS "ssh-dss" 46#define SSH_DSS "ssh-dss"
45 47
46Key * 48Key *
diff --git a/radix.c b/radix.c
index 033773344..7e668ea65 100644
--- a/radix.c
+++ b/radix.c
@@ -7,6 +7,8 @@
7#include "includes.h" 7#include "includes.h"
8#include "uuencode.h" 8#include "uuencode.h"
9 9
10RCSID("$OpenBSD: radix.c,v 1.12 2000/06/22 23:55:00 djm Exp $");
11
10#ifdef AFS 12#ifdef AFS
11#include <krb.h> 13#include <krb.h>
12 14
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 }
diff --git a/uuencode.c b/uuencode.c
index 2540d7564..27ba6559e 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -4,6 +4,8 @@
4#include "includes.h" 4#include "includes.h"
5#include "xmalloc.h" 5#include "xmalloc.h"
6 6
7RCSID("$OpenBSD: uuencode.c,v 1.6 2000/06/22 23:55:00 djm Exp $");
8
7int 9int
8uuencode(unsigned char *src, unsigned int srclength, 10uuencode(unsigned char *src, unsigned int srclength,
9 char *target, size_t targsize) 11 char *target, size_t targsize)