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 @@ | |||
83 | - djm@cvs.openbsd.org 2006/07/10 11:25:53 | 83 | - djm@cvs.openbsd.org 2006/07/10 11:25:53 |
84 | [sftp-server.c] | 84 | [sftp-server.c] |
85 | don't log variables that aren't yet set | 85 | don't log variables that aren't yet set |
86 | - (djm) [loginrec.c ssh-rand-helper.c sshd.c openbsd-compat/glob.c] | ||
87 | [openbsd-compat/mktemp.c openbsd-compat/openbsd-compat.h] | ||
88 | [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c] | ||
89 | [openbsd-compat/xcrypt.c] Fix includes.h fallout, mainly fcntl.h | ||
86 | 90 | ||
87 | 20060706 | 91 | 20060706 |
88 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 92 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4816,4 +4820,4 @@ | |||
4816 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4820 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4817 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4821 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4818 | 4822 | ||
4819 | $Id: ChangeLog,v 1.4380 2006/07/10 11:31:27 djm Exp $ | 4823 | $Id: ChangeLog,v 1.4381 2006/07/10 11:33:04 djm Exp $ |
diff --git a/loginrec.c b/loginrec.c index 42f022fd9..a27a3ae61 100644 --- a/loginrec.c +++ b/loginrec.c | |||
@@ -153,6 +153,7 @@ | |||
153 | 153 | ||
154 | #include <netinet/in.h> | 154 | #include <netinet/in.h> |
155 | 155 | ||
156 | #include <fcntl.h> | ||
156 | #include <pwd.h> | 157 | #include <pwd.h> |
157 | 158 | ||
158 | #include "ssh.h" | 159 | #include "ssh.h" |
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index fd3d86c4c..439d2f50d 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <sys/stat.h> | 38 | #include <sys/stat.h> |
39 | #include <dirent.h> | 39 | #include <dirent.h> |
40 | #include <ctype.h> | 40 | #include <ctype.h> |
41 | #include <pwd.h> | ||
41 | 42 | ||
42 | static long | 43 | static long |
43 | get_arg_max(void) | 44 | get_arg_max(void) |
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c index 53a50c512..75a339156 100644 --- a/openbsd-compat/mktemp.c +++ b/openbsd-compat/mktemp.c | |||
@@ -37,6 +37,7 @@ | |||
37 | 37 | ||
38 | #include <sys/types.h> | 38 | #include <sys/types.h> |
39 | #include <sys/stat.h> | 39 | #include <sys/stat.h> |
40 | #include <fcntl.h> | ||
40 | #include <ctype.h> | 41 | #include <ctype.h> |
41 | 42 | ||
42 | #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) | 43 | #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) |
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index 37c979fa4..6231e03a2 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.37 2006/06/30 00:51:32 dtucker Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.38 2006/07/10 11:33:05 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -31,6 +31,9 @@ | |||
31 | 31 | ||
32 | #include "includes.h" | 32 | #include "includes.h" |
33 | 33 | ||
34 | #include <sys/types.h> | ||
35 | #include <pwd.h> | ||
36 | |||
34 | /* OpenBSD function replacements */ | 37 | /* OpenBSD function replacements */ |
35 | #include "base64.h" | 38 | #include "base64.h" |
36 | #include "sigact.h" | 39 | #include "sigact.h" |
@@ -131,8 +134,6 @@ int BSDgetopt(int argc, char * const *argv, const char *opts); | |||
131 | #include "bsd-misc.h" | 134 | #include "bsd-misc.h" |
132 | #include "bsd-waitpid.h" | 135 | #include "bsd-waitpid.h" |
133 | 136 | ||
134 | /*#include <sys/types.h> XXX Still needed? * For uid_t, gid_t * */ | ||
135 | |||
136 | #ifndef HAVE_GETPEEREID | 137 | #ifndef HAVE_GETPEEREID |
137 | int getpeereid(int , uid_t *, gid_t *); | 138 | int getpeereid(int , uid_t *, gid_t *); |
138 | #endif | 139 | #endif |
@@ -177,7 +178,6 @@ void *xmmap(size_t size); | |||
177 | char *xcrypt(const char *password, const char *salt); | 178 | char *xcrypt(const char *password, const char *salt); |
178 | char *shadow_pw(struct passwd *pw); | 179 | char *shadow_pw(struct passwd *pw); |
179 | 180 | ||
180 | |||
181 | /* rfc2553 socket API replacements */ | 181 | /* rfc2553 socket API replacements */ |
182 | #include "fake-rfc2553.h" | 182 | #include "fake-rfc2553.h" |
183 | 183 | ||
diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 6e1fed969..a87b809d5 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c | |||
@@ -16,9 +16,12 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | #include <sys/types.h> | ||
19 | #include <sys/ioctl.h> | 20 | #include <sys/ioctl.h> |
20 | #include <netinet/ip.h> | 21 | #include <netinet/ip.h> |
21 | 22 | ||
23 | #include <fcntl.h> | ||
24 | |||
22 | #include "log.h" | 25 | #include "log.h" |
23 | #include "misc.h" | 26 | #include "misc.h" |
24 | #include "bufaux.h" | 27 | #include "bufaux.h" |
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 95e26dcd4..95c0af815 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <termios.h> | 29 | #include <termios.h> |
30 | #include <signal.h> | 30 | #include <signal.h> |
31 | #include <ctype.h> | 31 | #include <ctype.h> |
32 | #include <fcntl.h> | ||
32 | #include <readpassphrase.h> | 33 | #include <readpassphrase.h> |
33 | 34 | ||
34 | #ifdef TCSASOFT | 35 | #ifdef TCSASOFT |
diff --git a/openbsd-compat/xcrypt.c b/openbsd-compat/xcrypt.c index 9afa0b9f2..5d260f2c2 100644 --- a/openbsd-compat/xcrypt.c +++ b/openbsd-compat/xcrypt.c | |||
@@ -24,6 +24,9 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | 26 | ||
27 | #include <sys/types.h> | ||
28 | #include <pwd.h> | ||
29 | |||
27 | # ifdef HAVE_CRYPT_H | 30 | # ifdef HAVE_CRYPT_H |
28 | # include <crypt.h> | 31 | # include <crypt.h> |
29 | # endif | 32 | # endif |
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index feb1bfb18..ebee90014 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c | |||
@@ -36,6 +36,7 @@ | |||
36 | # include <sys/un.h> | 36 | # include <sys/un.h> |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | #include <fcntl.h> | ||
39 | #include <pwd.h> | 40 | #include <pwd.h> |
40 | #include <signal.h> | 41 | #include <signal.h> |
41 | 42 | ||
@@ -56,6 +56,7 @@ | |||
56 | #ifdef HAVE_PATHS_H | 56 | #ifdef HAVE_PATHS_H |
57 | #include <paths.h> | 57 | #include <paths.h> |
58 | #endif | 58 | #endif |
59 | #include <grp.h> | ||
59 | #include <pwd.h> | 60 | #include <pwd.h> |
60 | #include <signal.h> | 61 | #include <signal.h> |
61 | 62 | ||