diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | loginrec.c | 1 | ||||
| -rw-r--r-- | openbsd-compat/glob.c | 1 | ||||
| -rw-r--r-- | openbsd-compat/mktemp.c | 1 | ||||
| -rw-r--r-- | openbsd-compat/openbsd-compat.h | 8 | ||||
| -rw-r--r-- | openbsd-compat/port-tun.c | 3 | ||||
| -rw-r--r-- | openbsd-compat/readpassphrase.c | 1 | ||||
| -rw-r--r-- | openbsd-compat/xcrypt.c | 3 | ||||
| -rw-r--r-- | ssh-rand-helper.c | 1 | ||||
| -rw-r--r-- | sshd.c | 1 |
10 files changed, 21 insertions, 5 deletions
@@ -83,6 +83,10 @@ - djm@cvs.openbsd.org 2006/07/10 11:25:53 [sftp-server.c] don't log variables that aren't yet set + - (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c] + [openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h] + [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c] + [openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h 20060706 - (dtucker) [configure.ac] Try AIX blibpath test in different order when @@ -4816,4 +4820,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.4380 2006/07/10 11:31:27 djm Exp $ +$Id: ChangeLog,v 1.4381 2006/07/10 11:33:04 djm Exp $ @@ -153,6 +153,7 @@ #include <netinet/in.h> +#include <fcntl.h> #include <pwd.h> #include "ssh.h" diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index fd3d86c4..439d2f50 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -38,6 +38,7 @@ #include <sys/stat.h> #include <dirent.h> #include <ctype.h> +#include <pwd.h> static long get_arg_max(void) diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c index 53a50c51..75a33915 100644 --- a/openbsd-compat/mktemp.c +++ b/openbsd-compat/mktemp.c @@ -37,6 +37,7 @@ #include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> #include <ctype.h> #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 37c979fa..6231e03a 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h @@ -1,4 +1,4 @@ -/* $Id: openbsd-compat.h,v 1.37 2006/06/30 00:51:32 dtucker Exp $ */ +/* $Id: openbsd-compat.h,v 1.38 2006/07/10 11:33:05 djm Exp $ */ /* * Copyright (c) 1999-2003 Damien Miller. All rights reserved. @@ -31,6 +31,9 @@ #include "includes.h" +#include <sys/types.h> +#include <pwd.h> + /* OpenBSD function replacements */ #include "base64.h" #include "sigact.h" @@ -131,8 +134,6 @@ int BSDgetopt(int argc, char * const *argv, const char *opts); #include "bsd-misc.h" #include "bsd-waitpid.h" -/*#include <sys/types.h> XXX Still needed? * For uid_t, gid_t * */ - #ifndef HAVE_GETPEEREID int getpeereid(int , uid_t *, gid_t *); #endif @@ -177,7 +178,6 @@ void *xmmap(size_t size); char *xcrypt(const char *password, const char *salt); char *shadow_pw(struct passwd *pw); - /* rfc2553 socket API replacements */ #include "fake-rfc2553.h" diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 6e1fed96..a87b809d 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -16,9 +16,12 @@ #include "includes.h" +#include <sys/types.h> #include <sys/ioctl.h> #include <netinet/ip.h> +#include <fcntl.h> + #include "log.h" #include "misc.h" #include "bufaux.h" diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 95e26dcd..95c0af81 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c @@ -29,6 +29,7 @@ #include <termios.h> #include <signal.h> #include <ctype.h> +#include <fcntl.h> #include <readpassphrase.h> #ifdef TCSASOFT diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 9afa0b9f..5d260f2c 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c @@ -24,6 +24,9 @@ #include "includes.h" +#include <sys/types.h> +#include <pwd.h> + # ifdef HAVE_CRYPT_H # include <crypt.h> # endif diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index feb1bfb1..ebee9001 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c @@ -36,6 +36,7 @@ # include <sys/un.h> #endif +#include <fcntl.h> #include <pwd.h> #include <signal.h> @@ -56,6 +56,7 @@ #ifdef HAVE_PATHS_H #include <paths.h> #endif +#include <grp.h> #include <pwd.h> #include <signal.h> |