summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog7
-rw-r--r--canohost.c6
-rw-r--r--hostfile.c6
-rw-r--r--includes.h3
-rw-r--r--loginrec.c3
-rw-r--r--logintest.c4
-rw-r--r--misc.c6
-rw-r--r--packet.c6
-rw-r--r--readconf.c5
-rw-r--r--serverloop.c5
-rw-r--r--ssh-rand-helper.c3
-rw-r--r--sshconnect.c5
-rw-r--r--uuencode.c6
13 files changed, 54 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c923a67f..70f96ef77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,11 @@
30 [channels.c includes.h] 30 [channels.c includes.h]
31 move #include <arpa/inet.h> out of includes.h; old ok djm@ 31 move #include <arpa/inet.h> out of includes.h; old ok djm@
32 (portable needed session.c too) 32 (portable needed session.c too)
33 - stevesk@cvs.openbsd.org 2006/07/05 02:42:09
34 [canohost.c hostfile.c includes.h misc.c packet.c readconf.c]
35 [serverloop.c sshconnect.c uuencode.c]
36 move #include <netinet/in.h> out of includes.h; ok deraadt@
37 (also ssh-rand-helper.c logintest.c loginrec.c)
33 38
3420060706 3920060706
35 - (dtucker) [configure.ac] Try AIX blibpath test in different order when 40 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
@@ -4763,4 +4768,4 @@
4763 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4768 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4764 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4769 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4765 4770
4766$Id: ChangeLog,v 1.4367 2006/07/10 10:26:27 djm Exp $ 4771$Id: ChangeLog,v 1.4368 2006/07/10 10:35:38 djm Exp $
diff --git a/canohost.c b/canohost.c
index 34b751a72..787d338d4 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: canohost.c,v 1.53 2006/03/25 13:17:01 djm Exp $ */ 1/* $OpenBSD: canohost.c,v 1.54 2006/07/05 02:42:09 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
@@ -14,6 +14,10 @@
14 14
15#include "includes.h" 15#include "includes.h"
16 16
17#include <sys/socket.h>
18
19#include <netinet/in.h>
20
17#include <ctype.h> 21#include <ctype.h>
18 22
19#include "packet.h" 23#include "packet.h"
diff --git a/hostfile.c b/hostfile.c
index 39ff197a7..a6714b6e1 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: hostfile.c,v 1.40 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: hostfile.c,v 1.41 2006/07/05 02:42:09 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
@@ -38,6 +38,10 @@
38 38
39#include "includes.h" 39#include "includes.h"
40 40
41#include <sys/types.h>
42
43#include <netinet/in.h>
44
41#include <resolv.h> 45#include <resolv.h>
42 46
43#include <openssl/hmac.h> 47#include <openssl/hmac.h>
diff --git a/includes.h b/includes.h
index c3f0671ec..51b6a0b84 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.43 2006/07/03 17:59:32 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.44 2006/07/05 02:42:09 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -129,7 +129,6 @@
129#include <sys/ptms.h> /* for grantpt() and friends */ 129#include <sys/ptms.h> /* for grantpt() and friends */
130#endif 130#endif
131 131
132#include <netinet/in.h>
133#include <netinet/in_systm.h> /* For typedefs */ 132#include <netinet/in_systm.h> /* For typedefs */
134#if defined(HAVE_NETDB_H) 133#if defined(HAVE_NETDB_H)
135# include <netdb.h> 134# include <netdb.h>
diff --git a/loginrec.c b/loginrec.c
index c2498e1e3..76ddc2000 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -149,6 +149,9 @@
149 149
150#include <sys/types.h> 150#include <sys/types.h>
151#include <sys/stat.h> 151#include <sys/stat.h>
152#include <sys/socket.h>
153
154#include <netinet/in.h>
152 155
153#include "ssh.h" 156#include "ssh.h"
154#include "xmalloc.h" 157#include "xmalloc.h"
diff --git a/logintest.c b/logintest.c
index 1159274f8..7e9fbbfbb 100644
--- a/logintest.c
+++ b/logintest.c
@@ -31,6 +31,10 @@
31 31
32#include <sys/types.h> 32#include <sys/types.h>
33#include <sys/wait.h> 33#include <sys/wait.h>
34#include <sys/socket.h>
35
36#include <netinet/in.h>
37
34#include <unistd.h> 38#include <unistd.h>
35#include <stdlib.h> 39#include <stdlib.h>
36#include <stdio.h> 40#include <stdio.h>
diff --git a/misc.c b/misc.c
index 158d4878f..63c7ddf1e 100644
--- a/misc.c
+++ b/misc.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: misc.c,v 1.52 2006/03/30 09:58:15 djm Exp $ */ 1/* $OpenBSD: misc.c,v 1.53 2006/07/05 02:42:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved. 4 * Copyright (c) 2005,2006 Damien Miller. All rights reserved.
@@ -27,7 +27,11 @@
27#include "includes.h" 27#include "includes.h"
28 28
29#include <sys/ioctl.h> 29#include <sys/ioctl.h>
30#include <sys/socket.h>
31
32#include <netinet/in.h>
30#include <netinet/tcp.h> 33#include <netinet/tcp.h>
34
31#ifdef HAVE_PATHS_H 35#ifdef HAVE_PATHS_H
32# include <paths.h> 36# include <paths.h>
33#endif 37#endif
diff --git a/packet.c b/packet.c
index bc0baf3fc..ba2843786 100644
--- a/packet.c
+++ b/packet.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: packet.c,v 1.131 2006/03/30 09:58:16 djm Exp $ */ 1/* $OpenBSD: packet.c,v 1.132 2006/07/05 02:42:09 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
@@ -40,6 +40,10 @@
40#include "includes.h" 40#include "includes.h"
41 41
42#include "openbsd-compat/sys-queue.h" 42#include "openbsd-compat/sys-queue.h"
43#include <sys/socket.h>
44
45#include <netinet/in_systm.h>
46#include <netinet/in.h>
43#include <netinet/ip.h> 47#include <netinet/ip.h>
44 48
45#include "xmalloc.h" 49#include "xmalloc.h"
diff --git a/readconf.c b/readconf.c
index 87e41e0c4..df5e566a5 100644
--- a/readconf.c
+++ b/readconf.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: readconf.c,v 1.151 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: readconf.c,v 1.152 2006/07/05 02:42:09 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
@@ -16,6 +16,9 @@
16 16
17#include <sys/types.h> 17#include <sys/types.h>
18#include <sys/stat.h> 18#include <sys/stat.h>
19#include <sys/socket.h>
20
21#include <netinet/in.h>
19 22
20#include <ctype.h> 23#include <ctype.h>
21 24
diff --git a/serverloop.c b/serverloop.c
index 18f1a10bd..a0832679c 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: serverloop.c,v 1.135 2006/03/25 18:30:55 deraadt Exp $ */ 1/* $OpenBSD: serverloop.c,v 1.136 2006/07/05 02:42:09 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
@@ -39,6 +39,9 @@
39 39
40#include <sys/types.h> 40#include <sys/types.h>
41#include <sys/wait.h> 41#include <sys/wait.h>
42#include <sys/socket.h>
43
44#include <netinet/in.h>
42 45
43#include <signal.h> 46#include <signal.h>
44#include <termios.h> 47#include <termios.h>
diff --git a/ssh-rand-helper.c b/ssh-rand-helper.c
index 605de72f9..d8da7d3c0 100644
--- a/ssh-rand-helper.c
+++ b/ssh-rand-helper.c
@@ -28,6 +28,9 @@
28#include <sys/resource.h> 28#include <sys/resource.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30#include <sys/wait.h> 30#include <sys/wait.h>
31#include <sys/socket.h>
32
33#include <netinet/in.h>
31 34
32#ifdef HAVE_SYS_UN_H 35#ifdef HAVE_SYS_UN_H
33# include <sys/un.h> 36# include <sys/un.h>
diff --git a/sshconnect.c b/sshconnect.c
index 776460f43..7f9c09b91 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.186 2006/07/03 08:54:20 stevesk Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.187 2006/07/05 02:42:09 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
@@ -18,6 +18,9 @@
18#include <sys/types.h> 18#include <sys/types.h>
19#include <sys/wait.h> 19#include <sys/wait.h>
20#include <sys/stat.h> 20#include <sys/stat.h>
21#include <sys/socket.h>
22
23#include <netinet/in.h>
21 24
22#include <ctype.h> 25#include <ctype.h>
23#ifdef HAVE_PATHS_H 26#ifdef HAVE_PATHS_H
diff --git a/uuencode.c b/uuencode.c
index 398aeefe1..b8dcaeae6 100644
--- a/uuencode.c
+++ b/uuencode.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: uuencode.c,v 1.21 2006/03/26 01:31:48 deraadt Exp $ */ 1/* $OpenBSD: uuencode.c,v 1.22 2006/07/05 02:42:09 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -25,6 +25,10 @@
25 25
26#include "includes.h" 26#include "includes.h"
27 27
28#include <sys/types.h>
29
30#include <netinet/in.h>
31
28#include "xmalloc.h" 32#include "xmalloc.h"
29#include "uuencode.h" 33#include "uuencode.h"
30 34
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 05:57:33 +0000