summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth2-none.c3
-rw-r--r--monitor_wrap.c4
-rw-r--r--sshd.c2
4 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 959211fb..56afd72c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,10 @@
- (dtucker) [openbsd-compat/getrrsetbyname.c] Nees stdlib.h for malloc.
- (dtucker) [openbsd-compat/strtonum.c] Include stdlib.h for strtoll,
otherwise it is implicitly declared as returning an int.
+ - (dtucker) OpenBSD CVS Sync
+ - dtucker@cvs.openbsd.org 2006/08/05 07:52:52
+ [auth2-none.c sshd.c monitor_wrap.c]
+ Add headers required to build with KERBEROS5=no. ok djm@
20060804
- (dtucker) [configure.ac] The "crippled AES" test does not work on recent
@@ -5175,4 +5179,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.4465 2006/08/05 06:27:20 dtucker Exp $
+$Id: ChangeLog,v 1.4466 2006/08/05 08:46:47 dtucker Exp $
diff --git a/auth2-none.c b/auth2-none.c
index 8cbef527..f455bdde 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth2-none.c,v 1.12 2006/08/03 03:34:41 deraadt Exp $ */
+/* $OpenBSD: auth2-none.c,v 1.13 2006/08/05 07:52:52 dtucker Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
*
@@ -27,6 +27,7 @@
#include <sys/types.h>
#include <sys/stat.h>
+#include <sys/uio.h>
#include <fcntl.h>
#include <unistd.h>
diff --git a/monitor_wrap.c b/monitor_wrap.c
index 52ea1759..6678462d 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor_wrap.c,v 1.50 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: monitor_wrap.c,v 1.51 2006/08/05 07:52:52 dtucker Exp $ */
/*
* Copyright 2002 Niels Provos <provos@citi.umich.edu>
* Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -28,12 +28,14 @@
#include "includes.h"
#include <sys/types.h>
+#include <sys/uio.h>
#include <errno.h>
#include <pwd.h>
#include <signal.h>
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include <openssl/bn.h>
#include <openssl/dh.h>
diff --git a/sshd.c b/sshd.c
index 9f14c335..ca418e36 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.343 2006/08/03 03:34:42 deraadt Exp $ */
+/* $OpenBSD: sshd.c,v 1.344 2006/08/05 07:52:52 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland