diff options
author | Damien Miller <djm@mindrot.org> | 2006-07-10 20:26:27 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2006-07-10 20:26:27 +1000 |
commit | efc04e70b8261a7be7818772f03974eb38ae6622 (patch) | |
tree | 70825f051e20feb77b6903f608bcef9c8a7d5622 | |
parent | b757677d02e37da719b92331f23e02acb7079337 (diff) |
- 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)
-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 @@ | |||
26 | - stevesk@cvs.openbsd.org 2006/07/03 08:54:20 | 26 | - stevesk@cvs.openbsd.org 2006/07/03 08:54:20 |
27 | [includes.h ssh.c sshconnect.c sshd.c] | 27 | [includes.h ssh.c sshconnect.c sshd.c] |
28 | move #include "version.h" out of includes.h; ok markus@ | 28 | move #include "version.h" out of includes.h; ok markus@ |
29 | - stevesk@cvs.openbsd.org 2006/07/03 17:59:32 | ||
30 | [channels.c includes.h] | ||
31 | move #include <arpa/inet.h> out of includes.h; old ok djm@ | ||
32 | (portable needed session.c too) | ||
29 | 33 | ||
30 | 20060706 | 34 | 20060706 |
31 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when | 35 | - (dtucker) [configure.ac] Try AIX blibpath test in different order when |
@@ -4759,4 +4763,4 @@ | |||
4759 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4763 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4760 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4764 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4761 | 4765 | ||
4762 | $Id: ChangeLog,v 1.4366 2006/07/10 10:23:39 djm Exp $ | 4766 | $Id: ChangeLog,v 1.4367 2006/07/10 10:26:27 djm Exp $ |
diff --git a/channels.c b/channels.c index 9642a56ee..5796a8bb9 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.250 2006/04/16 00:48:52 djm Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.251 2006/07/03 17:59:32 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -44,6 +44,10 @@ | |||
44 | #include <sys/ioctl.h> | 44 | #include <sys/ioctl.h> |
45 | #include <sys/types.h> | 45 | #include <sys/types.h> |
46 | #include <sys/un.h> | 46 | #include <sys/un.h> |
47 | #include <sys/socket.h> | ||
48 | |||
49 | #include <netinet/in.h> | ||
50 | #include <arpa/inet.h> | ||
47 | 51 | ||
48 | #include <termios.h> | 52 | #include <termios.h> |
49 | 53 | ||
diff --git a/includes.h b/includes.h index bb6febfe3..c3f0671ec 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.42 2006/07/03 08:54:20 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.43 2006/07/03 17:59:32 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -131,7 +131,6 @@ | |||
131 | 131 | ||
132 | #include <netinet/in.h> | 132 | #include <netinet/in.h> |
133 | #include <netinet/in_systm.h> /* For typedefs */ | 133 | #include <netinet/in_systm.h> /* For typedefs */ |
134 | #include <arpa/inet.h> | ||
135 | #if defined(HAVE_NETDB_H) | 134 | #if defined(HAVE_NETDB_H) |
136 | # include <netdb.h> | 135 | # include <netdb.h> |
137 | #endif | 136 | #endif |
@@ -47,6 +47,7 @@ | |||
47 | #include <paths.h> | 47 | #include <paths.h> |
48 | #endif | 48 | #endif |
49 | #include <signal.h> | 49 | #include <signal.h> |
50 | #include <arpa/inet.h> | ||
50 | 51 | ||
51 | #include "ssh.h" | 52 | #include "ssh.h" |
52 | #include "ssh1.h" | 53 | #include "ssh1.h" |