diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | channels.c | 6 | ||||
-rw-r--r-- | includes.h | 3 | ||||
-rw-r--r-- | session.c | 1 |
4 files changed, 12 insertions, 4 deletions
@@ -26,6 +26,10 @@ - stevesk@cvs.openbsd.org 2006/07/03 08:54:20 [includes.h ssh.c sshconnect.c sshd.c] move #include "version.h" out of includes.h; ok markus@ + - stevesk@cvs.openbsd.org 2006/07/03 17:59:32 + [channels.c includes.h] + move #include <arpa/inet.h> out of includes.h; old ok djm@ + (portable needed session.c too) 20060706 - (dtucker) [configure.ac] Try AIX blibpath test in different order when @@ -4759,4 +4763,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.4366 2006/07/10 10:23:39 djm Exp $ +$Id: ChangeLog,v 1.4367 2006/07/10 10:26:27 djm Exp $ @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.250 2006/04/16 00:48:52 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.251 2006/07/03 17:59:32 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -44,6 +44,10 @@ #include <sys/ioctl.h> #include <sys/types.h> #include <sys/un.h> +#include <sys/socket.h> + +#include <netinet/in.h> +#include <arpa/inet.h> #include <termios.h> @@ -1,4 +1,4 @@ -/* $OpenBSD: includes.h,v 1.42 2006/07/03 08:54:20 stevesk Exp $ */ +/* $OpenBSD: includes.h,v 1.43 2006/07/03 17:59:32 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -131,7 +131,6 @@ #include <netinet/in.h> #include <netinet/in_systm.h> /* For typedefs */ -#include <arpa/inet.h> #if defined(HAVE_NETDB_H) # include <netdb.h> #endif @@ -47,6 +47,7 @@ #include <paths.h> #endif #include <signal.h> +#include <arpa/inet.h> #include "ssh.h" #include "ssh1.h" |