From 4b23f7c660efee1b4158b6a9fa0197ff9f8f6692 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Tue, 14 Mar 2006 22:09:50 -0800 Subject: - (tim) [openssh/sshpty.c openssh/openbsd-compat/port-tun.c] put in some includes removed from includes.h --- openbsd-compat/port-tun.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'openbsd-compat/port-tun.c') diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 31921615f..d09fe3d06 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -16,6 +16,9 @@ #include "includes.h" +#include +#include + #include "log.h" #include "misc.h" #include "bufaux.h" -- cgit v1.2.3 From 3eb4834489426bd796da90299b2f8174b744dddd Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Fri, 23 Jun 2006 21:05:12 +1000 Subject: - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add tunnel support for Mac OS X/Darwin via a third-party tun driver. Patch from reyk@, tested by anil@ --- ChangeLog | 7 ++++++- INSTALL | 12 +++++++----- README.platform | 14 +++++++++++++- configure.ac | 10 ++++++++-- openbsd-compat/port-tun.c | 4 ++++ 5 files changed, 38 insertions(+), 9 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index 30cd23659..327fec1d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +20060623 + - (dtucker) [README.platform configure.ac openbsd-compat/port-tun.c] Add + tunnel support for Mac OS X/Darwin via a third-party tun driver. Patch + from reyk@, tested by anil@ + 20060613 - (djm) [getput.h] This file has been replaced by functions in misc.c - OpenBSD CVS Sync @@ -4685,4 +4690,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.4344 2006/06/13 03:15:54 djm Exp $ +$Id: ChangeLog,v 1.4345 2006/06/23 11:05:12 dtucker Exp $ diff --git a/INSTALL b/INSTALL index 38f39473f..efc7b47d0 100644 --- a/INSTALL +++ b/INSTALL @@ -57,9 +57,10 @@ installed. No other S/Key library is currently known to be supported. http://www.sparc.spb.su/solaris/skey/ LibEdit: -sftp now supports command-line editing via NetBSD's libedit. If your -platform has it available natively you can use that, alternatively -you might try these multi-platform ports: + +sftp supports command-line editing via NetBSD's libedit. If your platform +has it available natively you can use that, alternatively you might try +these multi-platform ports: http://www.thrysoee.dk/editline/ http://sourceforge.net/projects/libedit/ @@ -210,7 +211,8 @@ for sshd, ssh and ssh-agent. ------------------------- $ make survey -[check the contents and make sure there's no sensitive information] +[check the contents of the file "survey" to ensure there's no information +that you consider sensitive] $ make send-survey This will send configuration information for the currently configured @@ -227,4 +229,4 @@ Please refer to the "reporting bugs" section of the webpage at http://www.openssh.com/ -$Id: INSTALL,v 1.71 2006/02/20 09:17:36 dtucker Exp $ +$Id: INSTALL,v 1.72 2006/06/23 11:05:13 dtucker Exp $ diff --git a/README.platform b/README.platform index 4c18a3278..b7dc3f91c 100644 --- a/README.platform +++ b/README.platform @@ -30,6 +30,18 @@ gcc, gcc-mingw-core, mingw-runtime, binutils, make, openssl, openssl-devel, zlib, minres, minires-devel. +Darwin and MacOS X +------------------ +Darwin does not provide a tun(4) driver required for OpenSSH-based +virtual private networks. The BSD manpage still exists, but the driver +has been removed in recent releases of Darwin and MacOS X. + +Nevertheless, tunnel support is known to work with Darwin 8 and +MacOS X 10.4 in Point-to-Point (Layer 3) and Ethernet (Layer 2) mode +using a third party driver. More information is available at: + http://www-user.rhrk.uni-kl.de/~nissler/tuntap/ + + Solaris ------- If you enable BSM auditing on Solaris, you need to update audit_event(4) @@ -55,4 +67,4 @@ account stacks which will prevent authentication entirely, but will still return the output from pam_nologin to the client. -$Id: README.platform,v 1.6 2005/11/05 05:28:35 dtucker Exp $ +$Id: README.platform,v 1.7 2006/06/23 11:05:13 dtucker Exp $ diff --git a/configure.ac b/configure.ac index 093c17643..c3cb68f28 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.339 2006/04/22 11:26:08 djm Exp $ +# $Id: configure.ac,v 1.340 2006/06/23 11:05:13 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.339 $) +AC_REVISION($Revision: 1.340 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -231,6 +231,11 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16)) AC_DEFINE(BROKEN_SETREGID) AC_DEFINE_UNQUOTED(BIND_8_COMPAT, 1, [Define if your resolver libs need this for getrrsetbyname]) + AC_DEFINE(SSH_TUN_FREEBSD, 1, [Open tunnel devices the FreeBSD way]) + AC_DEFINE(SSH_TUN_COMPAT_AF, 1, + [Use tunnel device compatibility to OpenBSD]) + AC_DEFINE(SSH_TUN_PREPEND_AF, 1, + [Prepend the address family to IP tunnel traffic]) ;; *-*-hpux*) # first we define all of the options common to all HP-UX releases @@ -682,6 +687,7 @@ AC_CHECK_HEADERS( \ login.h \ maillock.h \ ndir.h \ + net/if_tun.h \ netdb.h \ netgroup.h \ pam/pam_appl.h \ diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index d09fe3d06..6e1fed969 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -29,6 +29,7 @@ * settings. * * SSH_TUN_LINUX Use the (newer) Linux tun/tap device + * SSH_TUN_FREEBSD Use the FreeBSD tun/tap device * SSH_TUN_COMPAT_AF Translate the OpenBSD address family * SSH_TUN_PREPEND_AF Prepend/remove the address family */ @@ -96,7 +97,10 @@ sys_tun_open(int tun, int mode) #ifdef SSH_TUN_FREEBSD #include #include + +#ifdef HAVE_NET_IF_TUN_H #include +#endif int sys_tun_open(int tun, int mode) -- cgit v1.2.3 From a1738e4c65108b9c549c66c3a668a04b86c1530c Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 10 Jul 2006 21:33:04 +1000 Subject: - (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 --- ChangeLog | 6 +++++- loginrec.c | 1 + openbsd-compat/glob.c | 1 + openbsd-compat/mktemp.c | 1 + openbsd-compat/openbsd-compat.h | 8 ++++---- openbsd-compat/port-tun.c | 3 +++ openbsd-compat/readpassphrase.c | 1 + openbsd-compat/xcrypt.c | 3 +++ ssh-rand-helper.c | 1 + sshd.c | 1 + 10 files changed, 21 insertions(+), 5 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index 9646e8c42..30356693d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 $ diff --git a/loginrec.c b/loginrec.c index 42f022fd9..a27a3ae61 100644 --- a/loginrec.c +++ b/loginrec.c @@ -153,6 +153,7 @@ #include +#include #include #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 @@ #include #include #include +#include static long 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 @@ #include #include +#include #include #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 @@ -/* $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 +#include + /* 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 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 6e1fed969..a87b809d5 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -16,9 +16,12 @@ #include "includes.h" +#include #include #include +#include + #include "log.h" #include "misc.h" #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 @@ #include #include #include +#include #include #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 @@ #include "includes.h" +#include +#include + # ifdef HAVE_CRYPT_H # include # 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 @@ # include #endif +#include #include #include diff --git a/sshd.c b/sshd.c index 591622fd0..602116edf 100644 --- a/sshd.c +++ b/sshd.c @@ -56,6 +56,7 @@ #ifdef HAVE_PATHS_H #include #endif +#include #include #include -- cgit v1.2.3 From 686852f665376c2287c716f8d388b42c1727210b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 12 Jul 2006 19:05:56 +1000 Subject: - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs before . --- ChangeLog | 4 +++- openbsd-compat/port-tun.c | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index 1f11e32bc..ba0b72033 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,8 @@ Linuxes and probably more. - (dtucker) [configure.ac] OpenBSD needs before for SHUT_RD. + - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs before + . 20060711 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c @@ -4853,4 +4855,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.4390 2006/07/12 09:02:56 dtucker Exp $ +$Id: ChangeLog,v 1.4391 2006/07/12 09:05:56 dtucker Exp $ diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index a87b809d5..bee6b160c 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -18,6 +18,7 @@ #include #include +#include #include #include -- cgit v1.2.3 From 2c1a02a8d03069163d8cae21484f4e5656e904fe Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Wed, 12 Jul 2006 22:40:50 +1000 Subject: - (dtucker) [loginrec.c openbsd-compat/xmmap.c openbsd-compat/bindresvport.c openbsd-compat/glob.c openbsd-compat/mktemp.c openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c openbsd-compat/strtonum.c] Include . --- ChangeLog | 6 ++++-- loginrec.c | 1 + openbsd-compat/bindresvport.c | 2 ++ openbsd-compat/glob.c | 2 ++ openbsd-compat/mktemp.c | 2 ++ openbsd-compat/port-tun.c | 1 + openbsd-compat/readpassphrase.c | 1 + openbsd-compat/strtonum.c | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index eff2102d5..4f585990b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,7 +55,9 @@ will allow port forwarding by all users except "anoncvs". Currently only a very small subset of directives are supported. ok djm@ - - (dtucker) [openbsd-compat/xmmap.c] Include . + - (dtucker) [loginrec.c openbsd-compat/xmmap.c openbsd-compat/bindresvport.c + openbsd-compat/glob.c openbsd-compat/mktemp.c openbsd-compat/port-tun.c + openbsd-compat/readpassphrase.c openbsd-compat/strtonum.c] Include . 20060711 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c @@ -4905,4 +4907,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.4401 2006/07/12 12:35:51 dtucker Exp $ +$Id: ChangeLog,v 1.4402 2006/07/12 12:40:50 dtucker Exp $ diff --git a/loginrec.c b/loginrec.c index a27a3ae61..8299b79e4 100644 --- a/loginrec.c +++ b/loginrec.c @@ -153,6 +153,7 @@ #include +#include #include #include diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index 7f48fd03a..2c16233c9 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c @@ -36,6 +36,8 @@ #include "includes.h" +#include + #define STARTPORT 600 #define ENDPORT (IPPORT_RESERVED - 1) #define NPORTS (ENDPORT - STARTPORT + 1) diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index 439d2f50d..bba4c0976 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -34,10 +34,12 @@ /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */ #include "includes.h" + #include #include #include #include +#include #include static long diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c index 75a339156..b8b0793a6 100644 --- a/openbsd-compat/mktemp.c +++ b/openbsd-compat/mktemp.c @@ -37,8 +37,10 @@ #include #include + #include #include +#include #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index bee6b160c..9806eec7d 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -21,6 +21,7 @@ #include #include +#include #include #include "log.h" diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index 95c0af815..fd9731ac6 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c @@ -31,6 +31,7 @@ #include #include #include +#include #ifdef TCSASOFT # define _T_FLUSH (TCSAFLUSH|TCSASOFT) diff --git a/openbsd-compat/strtonum.c b/openbsd-compat/strtonum.c index 8ad0d0058..35c5c18b9 100644 --- a/openbsd-compat/strtonum.c +++ b/openbsd-compat/strtonum.c @@ -22,6 +22,7 @@ #include "includes.h" #ifndef HAVE_STRTONUM #include +#include #define INVALID 1 #define TOOSMALL 2 -- cgit v1.2.3 From b8fe89c4d97ea9a5d7efb2c60108b8a7644f6a49 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Mon, 24 Jul 2006 14:51:00 +1000 Subject: - (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c] [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c] [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c] [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c] [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c] [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c] [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c] [openbsd-compat/mktemp.c openbsd-compat/port-linux.c] [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c] [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c] make the portable tree compile again - sprinkle unistd.h and string.h back in. Don't redefine __unused, as it turned out to be used in headers on Linux, and replace its use in auth-pam.c with ARGSUSED --- ChangeLog | 15 ++++++++++++++- acss.c | 5 ++++- auth-krb5.c | 2 ++ auth-options.c | 4 +--- auth-pam.c | 11 ++++++++--- auth-shadow.c | 1 + canohost.c | 4 +--- channels.c | 4 +--- cipher-acss.c | 3 +++ defines.h | 7 +------ dns.c | 4 +--- gss-genr.c | 1 + gss-serv-krb5.c | 2 ++ gss-serv.c | 1 + log.h | 2 ++ loginrec.c | 2 ++ logintest.c | 4 +--- openbsd-compat/bindresvport.c | 1 + openbsd-compat/bsd-arc4random.c | 4 ++++ openbsd-compat/bsd-misc.c | 1 + openbsd-compat/getrrsetbyname.c | 2 ++ openbsd-compat/glob.c | 2 ++ openbsd-compat/mktemp.c | 1 + openbsd-compat/port-linux.c | 5 ++++- openbsd-compat/port-tun.c | 2 ++ openbsd-compat/readpassphrase.c | 2 ++ openbsd-compat/setproctitle.c | 1 + openbsd-compat/xmmap.c | 4 +++- readconf.c | 4 +--- servconf.c | 4 +--- ssh-keygen.c | 4 +--- ssh-keyscan.c | 4 +--- ssh-keysign.c | 2 +- ssh-rand-helper.c | 2 ++ ssh.c | 4 +--- sshconnect.c | 4 +--- sshd.c | 4 +--- 37 files changed, 79 insertions(+), 50 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index 7f7679402..d2cd9b597 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,19 @@ [auth.h dispatch.c kex.h sftp-client.c] #include for sig_atomic_t; need this prior to move + - (djm) [acss.c auth-krb5.c auth-options.c auth-pam.c auth-shadow.c] + [canohost.c channels.c cipher-acss.c defines.h dns.c gss-genr.c] + [gss-serv-krb5.c gss-serv.c log.h loginrec.c logintest.c readconf.c] + [servconf.c ssh-keygen.c ssh-keyscan.c ssh-keysign.c ssh-rand-helper.c] + [ssh.c sshconnect.c sshd.c openbsd-compat/bindresvport.c] + [openbsd-compat/bsd-arc4random.c openbsd-compat/bsd-misc.c] + [openbsd-compat/getrrsetbyname.c openbsd-compat/glob.c] + [openbsd-compat/mktemp.c openbsd-compat/port-linux.c] + [openbsd-compat/port-tun.c openbsd-compat/readpassphrase.c] + [openbsd-compat/setproctitle.c openbsd-compat/xmmap.c] + make the portable tree compile again - sprinkle unistd.h and string.h + back in. Don't redefine __unused, as it turned out to be used in + headers on Linux, and replace its use in auth-pam.c with ARGSUSED 20060713 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h @@ -5017,4 +5030,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.4429 2006/07/24 04:14:19 djm Exp $ +$Id: ChangeLog,v 1.4430 2006/07/24 04:51:00 djm Exp $ diff --git a/acss.c b/acss.c index 99efde071..86e2c01a8 100644 --- a/acss.c +++ b/acss.c @@ -1,4 +1,4 @@ -/* $Id: acss.c,v 1.3 2005/07/17 07:04:47 djm Exp $ */ +/* $Id: acss.c,v 1.4 2006/07/24 04:51:01 djm Exp $ */ /* * Copyright (c) 2004 The OpenBSD project * @@ -16,6 +16,9 @@ */ #include "includes.h" + +#include + #include #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00906000L) diff --git a/auth-krb5.c b/auth-krb5.c index 8beacc0d4..676b8ab1f 100644 --- a/auth-krb5.c +++ b/auth-krb5.c @@ -41,6 +41,8 @@ #ifdef KRB5 #include +#include +#include #include extern ServerOptions options; diff --git a/auth-options.c b/auth-options.c index 33c62641b..cd904967a 100644 --- a/auth-options.c +++ b/auth-options.c @@ -14,9 +14,7 @@ #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include diff --git a/auth-pam.c b/auth-pam.c index cb8754ec7..6ce9db12b 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -54,6 +54,8 @@ #include #include +#include +#include #ifdef USE_PAM #if defined(HAVE_SECURITY_PAM_APPL_H) @@ -152,14 +154,16 @@ sshpam_sigchld_handler(int sig) fatal("PAM: authentication thread exited uncleanly"); } +/* ARGSUSED */ static void -pthread_exit(void *value __unused) +pthread_exit(void *value) { _exit(0); } +/* ARGSUSED */ static int -pthread_create(sp_pthread_t *thread, const void *attr __unused, +pthread_create(sp_pthread_t *thread, const void *attr, void *(*thread_start)(void *), void *arg) { pid_t pid; @@ -191,8 +195,9 @@ pthread_cancel(sp_pthread_t thread) return (kill(thread, SIGTERM)); } +/* ARGSUSED */ static int -pthread_join(sp_pthread_t thread, void **value __unused) +pthread_join(sp_pthread_t thread, void **value) { int status; diff --git a/auth-shadow.c b/auth-shadow.c index c8d5dd3c1..7cd69c21f 100644 --- a/auth-shadow.c +++ b/auth-shadow.c @@ -26,6 +26,7 @@ #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) #include +#include #include "auth.h" #include "buffer.h" diff --git a/canohost.c b/canohost.c index 97b5a78f9..b40cbf603 100644 --- a/canohost.c +++ b/canohost.c @@ -21,9 +21,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include "packet.h" diff --git a/channels.c b/channels.c index 8cf4242fe..895c43f6a 100644 --- a/channels.c +++ b/channels.c @@ -50,9 +50,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include #include diff --git a/cipher-acss.c b/cipher-acss.c index 90b51a4d1..cb0bf736c 100644 --- a/cipher-acss.c +++ b/cipher-acss.c @@ -15,8 +15,11 @@ */ #include "includes.h" + #include +#include + #if !defined(EVP_CTRL_SET_ACSS_MODE) && (OPENSSL_VERSION_NUMBER >= 0x00907000L) #include "acss.h" diff --git a/defines.h b/defines.h index 4dccc9172..7b0a302a5 100644 --- a/defines.h +++ b/defines.h @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.133 2006/07/12 04:14:31 dtucker Exp $ */ +/* $Id: defines.h,v 1.134 2006/07/24 04:51:01 djm Exp $ */ /* Constants */ @@ -143,16 +143,11 @@ including rpc/rpc.h breaks Solaris 6 #define INADDR_LOOPBACK ((u_long)0x7f000001) #endif -#ifndef __unused -#define __unused -#endif - /* Types */ /* If sys/types.h does not supply intXX_t, supply them ourselves */ /* (or die trying) */ - #ifndef HAVE_U_INT typedef unsigned int u_int; #endif diff --git a/dns.c b/dns.c index 5f123a2ee..c9368b96b 100644 --- a/dns.c +++ b/dns.c @@ -30,9 +30,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include "xmalloc.h" diff --git a/gss-genr.c b/gss-genr.c index 0497657c0..522fedab3 100644 --- a/gss-genr.c +++ b/gss-genr.c @@ -29,6 +29,7 @@ #ifdef GSSAPI #include +#include #include "xmalloc.h" #include "bufaux.h" diff --git a/gss-serv-krb5.c b/gss-serv-krb5.c index eae29b2ae..7b78cfe0a 100644 --- a/gss-serv-krb5.c +++ b/gss-serv-krb5.c @@ -29,6 +29,8 @@ #ifdef GSSAPI #ifdef KRB5 +#include + #include "auth.h" #include "xmalloc.h" #include "log.h" diff --git a/gss-serv.c b/gss-serv.c index c033aad4f..b5c5538fe 100644 --- a/gss-serv.c +++ b/gss-serv.c @@ -29,6 +29,7 @@ #ifdef GSSAPI #include +#include #include "bufaux.h" #include "auth.h" diff --git a/log.h b/log.h index 9e1a2fcdb..15ebc93b5 100644 --- a/log.h +++ b/log.h @@ -15,6 +15,8 @@ #ifndef SSH_LOG_H #define SSH_LOG_H +#include "includes.h" + #include #include /* Needed for LOG_AUTHPRIV (if present) */ diff --git a/loginrec.c b/loginrec.c index 8299b79e4..955d42e8f 100644 --- a/loginrec.c +++ b/loginrec.c @@ -156,6 +156,8 @@ #include #include #include +#include +#include #include "ssh.h" #include "xmalloc.h" diff --git a/logintest.c b/logintest.c index 0de928bec..7e9fbbfbb 100644 --- a/logintest.c +++ b/logintest.c @@ -40,9 +40,7 @@ #include #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #ifdef HAVE_TIME_H #include #endif diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index 2c16233c9..ef0eff3b6 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c @@ -37,6 +37,7 @@ #include "includes.h" #include +#include #define STARTPORT 600 #define ENDPORT (IPPORT_RESERVED - 1) diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c index 46e0a020f..c1aecfe99 100644 --- a/openbsd-compat/bsd-arc4random.c +++ b/openbsd-compat/bsd-arc4random.c @@ -15,6 +15,10 @@ */ #include "includes.h" + +#include +#include + #include "log.h" #ifndef HAVE_ARC4RANDOM diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c index d2d9ad771..e6128f9a7 100644 --- a/openbsd-compat/bsd-misc.c +++ b/openbsd-compat/bsd-misc.c @@ -17,6 +17,7 @@ #include "includes.h" +#include #include #include "xmalloc.h" diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index a855ad6d5..70ef1850d 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c @@ -49,6 +49,8 @@ #ifndef HAVE_GETRRSETBYNAME +#include + #include "getrrsetbyname.h" #if defined(HAVE_DECL_H_ERRNO) && !HAVE_DECL_H_ERRNO diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c index bba4c0976..b4873932a 100644 --- a/openbsd-compat/glob.c +++ b/openbsd-compat/glob.c @@ -41,6 +41,8 @@ #include #include #include +#include +#include static long get_arg_max(void) diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c index b8b0793a6..2285c84df 100644 --- a/openbsd-compat/mktemp.c +++ b/openbsd-compat/mktemp.c @@ -41,6 +41,7 @@ #include #include #include +#include #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c index 54ec2910e..5e2e878dc 100644 --- a/openbsd-compat/port-linux.c +++ b/openbsd-compat/port-linux.c @@ -1,4 +1,4 @@ -/* $Id: port-linux.c,v 1.1 2006/04/22 11:26:08 djm Exp $ */ +/* $Id: port-linux.c,v 1.2 2006/07/24 04:51:01 djm Exp $ */ /* * Copyright (c) 2005 Daniel Walsh @@ -23,6 +23,9 @@ #include "includes.h" +#include +#include + #ifdef WITH_SELINUX #include "log.h" #include "port-linux.h" diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 9806eec7d..f6a6aa9e1 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -23,6 +23,8 @@ #include #include +#include +#include #include "log.h" #include "misc.h" diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c index fd9731ac6..11bd8f646 100644 --- a/openbsd-compat/readpassphrase.c +++ b/openbsd-compat/readpassphrase.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #ifdef TCSASOFT # define _T_FLUSH (TCSAFLUSH|TCSASOFT) diff --git a/openbsd-compat/setproctitle.c b/openbsd-compat/setproctitle.c index 32e987deb..7fec73f89 100644 --- a/openbsd-compat/setproctitle.c +++ b/openbsd-compat/setproctitle.c @@ -40,6 +40,7 @@ #ifdef HAVE_SYS_PSTAT_H #include #endif +#include #define SPT_NONE 0 /* don't use it at all */ #define SPT_PSTAT 1 /* use pstat(PSTAT_SETCMD, ...) */ diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 7d5cc812c..1293dcab0 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: xmmap.c,v 1.8 2006/07/12 12:35:52 dtucker Exp $ */ +/* $Id: xmmap.c,v 1.9 2006/07/24 04:51:01 djm Exp $ */ #include "includes.h" @@ -34,6 +34,8 @@ #include #include +#include +#include #include "log.h" diff --git a/readconf.c b/readconf.c index 432b80ed0..6fe372796 100644 --- a/readconf.c +++ b/readconf.c @@ -22,9 +22,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include diff --git a/servconf.c b/servconf.c index ce44b5f60..dca9508ab 100644 --- a/servconf.c +++ b/servconf.c @@ -15,9 +15,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include diff --git a/ssh-keygen.c b/ssh-keygen.c index f2d37129b..17236a55a 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -23,9 +23,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #ifdef HAVE_PATHS_H # include #endif diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 30df75166..6b706f0af 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -14,9 +14,7 @@ #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #include #include #include diff --git a/ssh-keysign.c b/ssh-keysign.c index 435b839fa..89b8e4342 100644 --- a/ssh-keysign.c +++ b/ssh-keysign.c @@ -148,7 +148,7 @@ main(int argc, char **argv) { Buffer b; Options options; - Key *keys[2], *key; + Key *keys[2], *key = NULL; struct passwd *pw; int key_fd[2], i, found, version = 2, fd; u_char *signature, *data; diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index fb6fc2814..121fa52fa 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c @@ -41,6 +41,8 @@ #include #include #include +#include +#include #include #include diff --git a/ssh.c b/ssh.c index d0d9457c2..df787e45f 100644 --- a/ssh.c +++ b/ssh.c @@ -54,9 +54,7 @@ #include #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #ifdef HAVE_PATHS_H #include #endif diff --git a/sshconnect.c b/sshconnect.c index f33cf52b1..21c5203c6 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -24,9 +24,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #ifdef HAVE_PATHS_H #include #endif diff --git a/sshd.c b/sshd.c index 6428f42a0..cc1ebd8d9 100644 --- a/sshd.c +++ b/sshd.c @@ -54,9 +54,7 @@ #include #include -#if defined(HAVE_NETDB_H) -# include -#endif +#include #ifdef HAVE_PATHS_H #include #endif -- cgit v1.2.3 From 4cbfe8ebebb1fb345bddab629768ad95885846d6 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 5 Aug 2006 12:49:30 +1000 Subject: - (djm) [auth-pam.c auth.c bufaux.h entropy.c openbsd-compat/port-tun.c] remove last traces of bufaux.h - it was merged into buffer.h in the big includes.h commit --- ChangeLog | 5 ++++- auth-pam.c | 1 - auth.c | 1 - entropy.c | 1 - openbsd-compat/port-tun.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index f859f08ab..57c9d0225 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,9 @@ [monitor.c session.c ssh-agent.c] spaces - (djm) [auth-pam.c defines.h] Move PAM related bits to auth-pam.c + - (djm) [auth-pam.c auth.c bufaux.h entropy.c openbsd-compat/port-tun.c] + remove last traces of bufaux.h - it was merged into buffer.h in the big + includes.h commit 20060804 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent @@ -5156,4 +5159,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.4454 2006/08/05 02:43:32 djm Exp $ +$Id: ChangeLog,v 1.4455 2006/08/05 02:49:30 djm Exp $ diff --git a/auth-pam.c b/auth-pam.c index a67eaa309..695198493 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -81,7 +81,6 @@ #include "auth.h" #include "auth-pam.h" #include "buffer.h" -#include "bufaux.h" #include "canohost.h" #include "log.h" #include "monitor_wrap.h" diff --git a/auth.c b/auth.c index fba32eb96..f2aee8fdb 100644 --- a/auth.c +++ b/auth.c @@ -60,7 +60,6 @@ #include "canohost.h" #include "uidswap.h" #include "misc.h" -#include "bufaux.h" #include "packet.h" #include "loginrec.h" #ifdef GSSAPI diff --git a/entropy.c b/entropy.c index b98e3c859..f0331a84e 100644 --- a/entropy.c +++ b/entropy.c @@ -46,7 +46,6 @@ #include "pathnames.h" #include "log.h" #include "buffer.h" -#include "bufaux.h" /* * Portable OpenSSH PRNG seeding: diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index f6a6aa9e1..d2ea03874 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -28,7 +28,7 @@ #include "log.h" #include "misc.h" -#include "bufaux.h" +#include "buffer.h" /* * This is the portable version of the SSH tunnel forwarding, it -- cgit v1.2.3 From 75bb664458d5a825824607841819b9a40d9bfdb5 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sat, 5 Aug 2006 14:07:20 +1000 Subject: - (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 --- ChangeLog | 5 ++++- auth-pam.c | 11 ++++++++--- auth-shadow.c | 2 ++ auth2-none.c | 1 + cleanup.c | 2 +- openbsd-compat/port-tun.c | 1 + openbsd-compat/port-tun.h | 2 ++ sshd.c | 1 + 8 files changed, 20 insertions(+), 5 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index 180f4403b..f1b99d9e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 $ diff --git a/auth-pam.c b/auth-pam.c index 695198493..8e9361caa 100644 --- a/auth-pam.c +++ b/auth-pam.c @@ -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 7cd69c21f..52447fe4a 100644 --- a/auth-shadow.c +++ b/auth-shadow.c @@ -28,6 +28,8 @@ #include #include +#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 1e4afa0e7..8cbef5278 100644 --- a/auth2-none.c +++ b/auth2-none.c @@ -29,6 +29,7 @@ #include #include +#include #include "xmalloc.h" #include "key.h" diff --git a/cleanup.c b/cleanup.c index c41ef1c6a..238f965e6 100644 --- a/cleanup.c +++ b/cleanup.c @@ -15,7 +15,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "config.h" +#include "includes.h" #include diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index d2ea03874..3e73d8c0e 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 9f7a98614..c53df01fc 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); diff --git a/sshd.c b/sshd.c index 52c21e500..9f14c3354 100644 --- a/sshd.c +++ b/sshd.c @@ -68,6 +68,7 @@ #include #include #include +#include #include #include -- cgit v1.2.3 From e7eec90f387c1d8cde3f6f1e543866a62caaa8a4 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 5 Aug 2006 15:47:26 +1000 Subject: - (dtucker) [openbsd-compat/{bsd-arc4random.c,port-tun.c,xmmap.c}] Lots of #include stdarg.h, needed for log.h. --- ChangeLog | 4 +++- openbsd-compat/bsd-arc4random.c | 2 ++ openbsd-compat/port-tun.c | 1 + openbsd-compat/xmmap.c | 5 +++-- 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index c3641cff8..8835fec20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -98,6 +98,8 @@ includes for Linux in - (dtucker) [cleanup.c] Need defines.h for __dead. - (dtucker) [auth2-gss.c] We still need the #ifdef GSSAPI in -portable. + - (dtucker) [openbsd-compat/{bsd-arc4random.c,port-tun.c,xmmap.c}] Lots of + #include stdarg.h, needed for log.h. 20060804 - (dtucker) [configure.ac] The "crippled AES" test does not work on recent @@ -5168,4 +5170,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.4460 2006/08/05 05:24:59 dtucker Exp $ +$Id: ChangeLog,v 1.4461 2006/08/05 05:47:26 dtucker Exp $ diff --git a/openbsd-compat/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c index c1aecfe99..d45fb182a 100644 --- a/openbsd-compat/bsd-arc4random.c +++ b/openbsd-compat/bsd-arc4random.c @@ -17,7 +17,9 @@ #include "includes.h" #include + #include +#include #include "log.h" diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index 3e73d8c0e..cadc331e1 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -23,6 +23,7 @@ #include #include +#include #include #include diff --git a/openbsd-compat/xmmap.c b/openbsd-compat/xmmap.c index 6a1708e5d..95d5055b5 100644 --- a/openbsd-compat/xmmap.c +++ b/openbsd-compat/xmmap.c @@ -23,7 +23,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $Id: xmmap.c,v 1.10 2006/07/25 09:52:08 dtucker Exp $ */ +/* $Id: xmmap.c,v 1.11 2006/08/05 05:47:27 dtucker Exp $ */ #include "includes.h" @@ -32,11 +32,12 @@ #include #endif #include + #ifdef HAVE_FCNTL_H # include #endif - #include +#include #include #include -- cgit v1.2.3 From 46aa3e0ce1d2f341bb3e4d46035faae3bb5ee69c Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Sat, 2 Sep 2006 15:32:40 +1000 Subject: - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include for hton* and ntoh* macros. Required on (at least) HP-UX since we define _XOPEN_SOURCE_EXTENDED. Found by santhi.amirta at gmail com. --- ChangeLog | 7 ++++++- openbsd-compat/bindresvport.c | 1 + openbsd-compat/getrrsetbyname.c | 3 +++ openbsd-compat/port-tun.c | 2 ++ openbsd-compat/rresvport.c | 1 + ssh-keyscan.c | 3 +++ ssh-rand-helper.c | 1 + ssh.c | 3 +++ sshconnect.c | 1 + 9 files changed, 21 insertions(+), 1 deletion(-) (limited to 'openbsd-compat/port-tun.c') diff --git a/ChangeLog b/ChangeLog index f1732345c..56b4af7c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 20060902 - (dtucker) [openbsd-compat/port-irix.c] Add errno.h, found by Iain Morgan. + - (dtucker) [ssh-keyscan.c ssh-rand-helper.c ssh.c sshconnect.c + openbsd-compat/bindresvport.c openbsd-compat/getrrsetbyname.c + openbsd-compat/port-tun.c openbsd-compat/rresvport.c] Include + for hton* and ntoh* macros. Required on (at least) HP-UX since we define + _XOPEN_SOURCE_EXTENDED. Found by santhi.amirta at gmail com. 20060901 - (djm) [audit-bsm.c audit.c auth-bsdauth.c auth-chall.c auth-pam.c] @@ -5380,4 +5385,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.4526 2006/09/02 02:38:56 dtucker Exp $ +$Id: ChangeLog,v 1.4527 2006/09/02 05:32:40 dtucker Exp $ diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c index e8fb83f23..65afed1e3 100644 --- a/openbsd-compat/bindresvport.c +++ b/openbsd-compat/bindresvport.c @@ -37,6 +37,7 @@ #include #include +#include #include #include diff --git a/openbsd-compat/getrrsetbyname.c b/openbsd-compat/getrrsetbyname.c index 40155d5ab..6c86e02c2 100644 --- a/openbsd-compat/getrrsetbyname.c +++ b/openbsd-compat/getrrsetbyname.c @@ -52,6 +52,9 @@ #include #include +#include +#include + #include "getrrsetbyname.h" #if defined(HAVE_DECL_H_ERRNO) && !HAVE_DECL_H_ERRNO diff --git a/openbsd-compat/port-tun.c b/openbsd-compat/port-tun.c index cadc331e1..276474db8 100644 --- a/openbsd-compat/port-tun.c +++ b/openbsd-compat/port-tun.c @@ -18,7 +18,9 @@ #include #include + #include +#include #include #include diff --git a/openbsd-compat/rresvport.c b/openbsd-compat/rresvport.c index 17e66ca59..5b0275ce0 100644 --- a/openbsd-compat/rresvport.c +++ b/openbsd-compat/rresvport.c @@ -39,6 +39,7 @@ #include #include +#include #include #include diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 64d4d0870..416d3f5c1 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -15,6 +15,9 @@ # include #endif +#include +#include + #include #include diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c index 10c9905b1..8520c3a62 100644 --- a/ssh-rand-helper.c +++ b/ssh-rand-helper.c @@ -34,6 +34,7 @@ #include #include +#include #ifdef HAVE_SYS_UN_H # include diff --git a/ssh.c b/ssh.c index a34990b54..efc4af6d4 100644 --- a/ssh.c +++ b/ssh.c @@ -67,6 +67,9 @@ #include #include +#include +#include + #include #include diff --git a/sshconnect.c b/sshconnect.c index 823def6a9..a7a4e8a96 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -24,6 +24,7 @@ #endif #include +#include #include #include -- cgit v1.2.3