diff options
author | Damien Miller <djm@mindrot.org> | 2006-08-05 14:07:20 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-08-05 14:07:20 +1000 |
commit | 75bb664458d5a825824607841819b9a40d9bfdb5 (patch) | |
tree | 66487433e1f482f9ff98977a60fb984900d07671 | |
parent | d04db59ad929d289c2dcaa466989659bbc449f6b (diff) |
- (djm) [auth-pam.c auth-shadow.c auth2-none.c cleanup.c sshd.c]
[openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Sprinkle more
includes for Linux in
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-pam.c | 11 | ||||
-rw-r--r-- | auth-shadow.c | 2 | ||||
-rw-r--r-- | auth2-none.c | 1 | ||||
-rw-r--r-- | cleanup.c | 2 | ||||
-rw-r--r-- | openbsd-compat/port-tun.c | 1 | ||||
-rw-r--r-- | openbsd-compat/port-tun.h | 2 | ||||
-rw-r--r-- | sshd.c | 1 |
8 files changed, 20 insertions, 5 deletions
@@ -93,6 +93,9 @@ - (djm) [openbsd-compat/regress/snprintftest.c] [openbsd-compat/regress/strduptest.c] Add missing includes so they pass compilation with "-Wall -Werror" + - (djm) [auth-pam.c auth-shadow.c auth2-none.c cleanup.c sshd.c] + [openbsd-compat/port-tun.c openbsd-compat/port-tun.h] Sprinkle more + includes for Linux in 20060804 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent @@ -5163,4 +5166,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.4457 2006/08/05 03:27:29 djm Exp $ +$Id: ChangeLog,v 1.4458 2006/08/05 04:07:20 djm Exp $ @@ -78,19 +78,24 @@ # define PAM_MSG_MEMBER(msg, n, member) ((msg)[(n)]->member) #endif +#include "xmalloc.h" +#include "buffer.h" +#include "key.h" +#include "hostfile.h" #include "auth.h" #include "auth-pam.h" -#include "buffer.h" #include "canohost.h" #include "log.h" -#include "monitor_wrap.h" #include "msg.h" #include "packet.h" #include "misc.h" #include "servconf.h" #include "ssh2.h" -#include "xmalloc.h" #include "auth-options.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif +#include "monitor_wrap.h" extern ServerOptions options; extern Buffer loginmsg; diff --git a/auth-shadow.c b/auth-shadow.c index 7cd69c21..52447fe4 100644 --- a/auth-shadow.c +++ b/auth-shadow.c @@ -28,6 +28,8 @@ #include <shadow.h> #include <string.h> +#include "key.h" +#include "hostfile.h" #include "auth.h" #include "buffer.h" #include "log.h" diff --git a/auth2-none.c b/auth2-none.c index 1e4afa0e..8cbef527 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -29,6 +29,7 @@ #include <sys/stat.h> #include <fcntl.h> +#include <unistd.h> #include "xmalloc.h" #include "key.h" @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" +#include "includes.h" #include <sys/types.h> diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index d2ea0387..3e73d8c0 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -29,6 +29,7 @@ #include "log.h" #include "misc.h" #include "buffer.h" +#include "channels.h" /* * This is the portable version of the SSH tunnel forwarding, it diff --git a/openbsd-compat/port-tun.h b/openbsd-compat/port-tun.h index 9f7a9861..c53df01f 100644 --- a/openbsd-compat/port-tun.h +++ b/openbsd-compat/port-tun.h @@ -17,6 +17,8 @@ #ifndef _PORT_TUN_H #define _PORT_TUN_H +struct Channel; + #if defined(SSH_TUN_LINUX) || defined(SSH_TUN_FREEBSD) # define CUSTOM_SYS_TUN_OPEN int sys_tun_open(int, int); @@ -68,6 +68,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> #include <openssl/dh.h> #include <openssl/bn.h> |