diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-options.c | 5 | ||||
-rw-r--r-- | canohost.c | 5 | ||||
-rw-r--r-- | channels.c | 5 | ||||
-rw-r--r-- | dns.c | 4 | ||||
-rw-r--r-- | includes.h | 5 | ||||
-rw-r--r-- | logintest.c | 4 | ||||
-rw-r--r-- | openbsd-compat/fake-rfc2553.h | 7 | ||||
-rw-r--r-- | openbsd-compat/port-aix.c | 3 | ||||
-rw-r--r-- | readconf.c | 5 | ||||
-rw-r--r-- | servconf.c | 6 | ||||
-rw-r--r-- | ssh-keygen.c | 3 | ||||
-rw-r--r-- | ssh-keyscan.c | 7 | ||||
-rw-r--r-- | ssh.c | 5 | ||||
-rw-r--r-- | sshconnect.c | 5 | ||||
-rw-r--r-- | sshd.c | 5 |
16 files changed, 60 insertions, 19 deletions
@@ -5,6 +5,9 @@ | |||
5 | - new sentence, new line | 5 | - new sentence, new line |
6 | - s/The the/The/ | 6 | - s/The the/The/ |
7 | - kill a bad comma | 7 | - kill a bad comma |
8 | - stevesk@cvs.openbsd.org 2006/07/12 22:28:52 | ||
9 | [auth-options.c canohost.c channels.c includes.h readconf.c servconf.c ssh-keyscan.c ssh.c sshconnect.c sshd.c] | ||
10 | move #include <netdb.h> out of includes.h; ok djm@ | ||
8 | 11 | ||
9 | 20060713 | 12 | 20060713 |
10 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h | 13 | - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h |
@@ -4923,4 +4926,4 @@ | |||
4923 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 4926 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
4924 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 4927 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
4925 | 4928 | ||
4926 | $Id: ChangeLog,v 1.4408 2006/07/24 03:46:50 djm Exp $ | 4929 | $Id: ChangeLog,v 1.4409 2006/07/24 03:51:51 djm Exp $ |
diff --git a/auth-options.c b/auth-options.c index 473fb8bf7..0b11151cf 100644 --- a/auth-options.c +++ b/auth-options.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: auth-options.c,v 1.36 2006/07/06 16:03:53 stevesk Exp $ */ | 1 | /* $OpenBSD: auth-options.c,v 1.37 2006/07/12 22:28:51 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,9 @@ | |||
14 | 14 | ||
15 | #include <sys/types.h> | 15 | #include <sys/types.h> |
16 | 16 | ||
17 | #if defined(HAVE_NETDB_H) | ||
18 | # include <netdb.h> | ||
19 | #endif | ||
17 | #include <pwd.h> | 20 | #include <pwd.h> |
18 | 21 | ||
19 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
diff --git a/canohost.c b/canohost.c index 4566e2ab1..da5131de3 100644 --- a/canohost.c +++ b/canohost.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: canohost.c,v 1.56 2006/07/11 20:07:25 stevesk Exp $ */ | 1 | /* $OpenBSD: canohost.c,v 1.57 2006/07/12 22:28:51 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 |
@@ -21,6 +21,9 @@ | |||
21 | 21 | ||
22 | #include <ctype.h> | 22 | #include <ctype.h> |
23 | #include <errno.h> | 23 | #include <errno.h> |
24 | #if defined(HAVE_NETDB_H) | ||
25 | # include <netdb.h> | ||
26 | #endif | ||
24 | 27 | ||
25 | #include "packet.h" | 28 | #include "packet.h" |
26 | #include "xmalloc.h" | 29 | #include "xmalloc.h" |
diff --git a/channels.c b/channels.c index 555067255..2021bad53 100644 --- a/channels.c +++ b/channels.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: channels.c,v 1.254 2006/07/11 20:07:25 stevesk Exp $ */ | 1 | /* $OpenBSD: channels.c,v 1.255 2006/07/12 22:28:51 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 |
@@ -50,6 +50,9 @@ | |||
50 | #include <arpa/inet.h> | 50 | #include <arpa/inet.h> |
51 | 51 | ||
52 | #include <errno.h> | 52 | #include <errno.h> |
53 | #if defined(HAVE_NETDB_H) | ||
54 | # include <netdb.h> | ||
55 | #endif | ||
53 | #include <termios.h> | 56 | #include <termios.h> |
54 | 57 | ||
55 | #include "ssh.h" | 58 | #include "ssh.h" |
@@ -30,7 +30,9 @@ | |||
30 | #include <sys/types.h> | 30 | #include <sys/types.h> |
31 | #include <sys/socket.h> | 31 | #include <sys/socket.h> |
32 | 32 | ||
33 | #include <netdb.h> | 33 | #if defined(HAVE_NETDB_H) |
34 | # include <netdb.h> | ||
35 | #endif | ||
34 | 36 | ||
35 | #include "xmalloc.h" | 37 | #include "xmalloc.h" |
36 | #include "key.h" | 38 | #include "key.h" |
diff --git a/includes.h b/includes.h index 08d34486b..7a3396c16 100644 --- a/includes.h +++ b/includes.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: includes.h,v 1.49 2006/07/11 20:07:25 stevesk Exp $ */ | 1 | /* $OpenBSD: includes.h,v 1.50 2006/07/12 22:28:51 stevesk Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -123,9 +123,6 @@ | |||
123 | #endif | 123 | #endif |
124 | 124 | ||
125 | #include <netinet/in_systm.h> /* For typedefs */ | 125 | #include <netinet/in_systm.h> /* For typedefs */ |
126 | #if defined(HAVE_NETDB_H) | ||
127 | # include <netdb.h> | ||
128 | #endif | ||
129 | #ifdef HAVE_RPC_TYPES_H | 126 | #ifdef HAVE_RPC_TYPES_H |
130 | # include <rpc/types.h> /* For INADDR_LOOPBACK */ | 127 | # include <rpc/types.h> /* For INADDR_LOOPBACK */ |
131 | #endif | 128 | #endif |
diff --git a/logintest.c b/logintest.c index 7e9fbbfbb..0de928bec 100644 --- a/logintest.c +++ b/logintest.c | |||
@@ -40,7 +40,9 @@ | |||
40 | #include <stdio.h> | 40 | #include <stdio.h> |
41 | #include <string.h> | 41 | #include <string.h> |
42 | #include <pwd.h> | 42 | #include <pwd.h> |
43 | #include <netdb.h> | 43 | #if defined(HAVE_NETDB_H) |
44 | # include <netdb.h> | ||
45 | #endif | ||
44 | #ifdef HAVE_TIME_H | 46 | #ifdef HAVE_TIME_H |
45 | #include <time.h> | 47 | #include <time.h> |
46 | #endif | 48 | #endif |
diff --git a/openbsd-compat/fake-rfc2553.h b/openbsd-compat/fake-rfc2553.h index cbcf7f727..5c2ce5b1b 100644 --- a/openbsd-compat/fake-rfc2553.h +++ b/openbsd-compat/fake-rfc2553.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: fake-rfc2553.h,v 1.12 2005/08/03 05:36:21 dtucker Exp $ */ | 1 | /* $Id: fake-rfc2553.h,v 1.13 2006/07/24 03:51:52 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. | 4 | * Copyright (C) 2000-2003 Damien Miller. All rights reserved. |
@@ -41,7 +41,10 @@ | |||
41 | #define _FAKE_RFC2553_H | 41 | #define _FAKE_RFC2553_H |
42 | 42 | ||
43 | #include "includes.h" | 43 | #include "includes.h" |
44 | #include "sys/types.h" | 44 | #include <sys/types.h> |
45 | #if defined(HAVE_NETDB_H) | ||
46 | # include <netdb.h> | ||
47 | #endif | ||
45 | 48 | ||
46 | /* | 49 | /* |
47 | * First, socket and INET6 related definitions | 50 | * First, socket and INET6 related definitions |
diff --git a/openbsd-compat/port-aix.c b/openbsd-compat/port-aix.c index 33be00c2b..6fd593aad 100644 --- a/openbsd-compat/port-aix.c +++ b/openbsd-compat/port-aix.c | |||
@@ -34,6 +34,9 @@ | |||
34 | #ifdef _AIX | 34 | #ifdef _AIX |
35 | 35 | ||
36 | #include <errno.h> | 36 | #include <errno.h> |
37 | #if defined(HAVE_NETDB_H) | ||
38 | # include <netdb.h> | ||
39 | #endif | ||
37 | #include <uinfo.h> | 40 | #include <uinfo.h> |
38 | #include <sys/socket.h> | 41 | #include <sys/socket.h> |
39 | #include "port-aix.h" | 42 | #include "port-aix.h" |
diff --git a/readconf.c b/readconf.c index d2e172303..4f790e246 100644 --- a/readconf.c +++ b/readconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: readconf.c,v 1.154 2006/07/11 20:07:25 stevesk Exp $ */ | 1 | /* $OpenBSD: readconf.c,v 1.155 2006/07/12 22:28:52 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 |
@@ -22,6 +22,9 @@ | |||
22 | 22 | ||
23 | #include <ctype.h> | 23 | #include <ctype.h> |
24 | #include <errno.h> | 24 | #include <errno.h> |
25 | #if defined(HAVE_NETDB_H) | ||
26 | # include <netdb.h> | ||
27 | #endif | ||
25 | 28 | ||
26 | #include "ssh.h" | 29 | #include "ssh.h" |
27 | #include "xmalloc.h" | 30 | #include "xmalloc.h" |
diff --git a/servconf.c b/servconf.c index 42ec340f3..20e3f1a86 100644 --- a/servconf.c +++ b/servconf.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: servconf.c,v 1.153 2006/07/12 11:34:58 dtucker Exp $ */ | 1 | /* $OpenBSD: servconf.c,v 1.154 2006/07/12 22:28:52 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 3 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
4 | * All rights reserved | 4 | * All rights reserved |
@@ -15,6 +15,10 @@ | |||
15 | #include <sys/types.h> | 15 | #include <sys/types.h> |
16 | #include <sys/socket.h> | 16 | #include <sys/socket.h> |
17 | 17 | ||
18 | #if defined(HAVE_NETDB_H) | ||
19 | # include <netdb.h> | ||
20 | #endif | ||
21 | |||
18 | #include "ssh.h" | 22 | #include "ssh.h" |
19 | #include "log.h" | 23 | #include "log.h" |
20 | #include "servconf.h" | 24 | #include "servconf.h" |
diff --git a/ssh-keygen.c b/ssh-keygen.c index 1c506059c..b217c55e8 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c | |||
@@ -23,6 +23,9 @@ | |||
23 | 23 | ||
24 | #include <errno.h> | 24 | #include <errno.h> |
25 | #include <fcntl.h> | 25 | #include <fcntl.h> |
26 | #if defined(HAVE_NETDB_H) | ||
27 | # include <netdb.h> | ||
28 | #endif | ||
26 | #ifdef HAVE_PATHS_H | 29 | #ifdef HAVE_PATHS_H |
27 | # include <paths.h> | 30 | # include <paths.h> |
28 | #endif | 31 | #endif |
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index a612dd1b9..38c37e579 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-keyscan.c,v 1.66 2006/07/10 16:37:36 stevesk Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.67 2006/07/12 22:28:52 stevesk Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
4 | * | 4 | * |
@@ -11,12 +11,15 @@ | |||
11 | 11 | ||
12 | #include "openbsd-compat/sys-queue.h" | 12 | #include "openbsd-compat/sys-queue.h" |
13 | #include <sys/resource.h> | 13 | #include <sys/resource.h> |
14 | #if defined(HAVE_NETDB_H) | ||
15 | # include <netdb.h> | ||
16 | #endif | ||
14 | #include <errno.h> | 17 | #include <errno.h> |
15 | #include <stdarg.h> | 18 | #include <stdarg.h> |
19 | #include <setjmp.h> | ||
16 | 20 | ||
17 | #include <openssl/bn.h> | 21 | #include <openssl/bn.h> |
18 | 22 | ||
19 | #include <setjmp.h> | ||
20 | #include "xmalloc.h" | 23 | #include "xmalloc.h" |
21 | #include "ssh.h" | 24 | #include "ssh.h" |
22 | #include "ssh1.h" | 25 | #include "ssh1.h" |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.285 2006/07/11 20:27:56 stevesk Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.286 2006/07/12 22:28:52 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 |
@@ -54,6 +54,9 @@ | |||
54 | #include <ctype.h> | 54 | #include <ctype.h> |
55 | #include <errno.h> | 55 | #include <errno.h> |
56 | #include <fcntl.h> | 56 | #include <fcntl.h> |
57 | #if defined(HAVE_NETDB_H) | ||
58 | # include <netdb.h> | ||
59 | #endif | ||
57 | #ifdef HAVE_PATHS_H | 60 | #ifdef HAVE_PATHS_H |
58 | #include <paths.h> | 61 | #include <paths.h> |
59 | #endif | 62 | #endif |
diff --git a/sshconnect.c b/sshconnect.c index c9d6221d8..fe9b4842c 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.190 2006/07/11 20:07:25 stevesk Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.191 2006/07/12 22:28:52 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 |
@@ -24,6 +24,9 @@ | |||
24 | 24 | ||
25 | #include <ctype.h> | 25 | #include <ctype.h> |
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #if defined(HAVE_NETDB_H) | ||
28 | # include <netdb.h> | ||
29 | #endif | ||
27 | #ifdef HAVE_PATHS_H | 30 | #ifdef HAVE_PATHS_H |
28 | #include <paths.h> | 31 | #include <paths.h> |
29 | #endif | 32 | #endif |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.337 2006/07/12 11:34:58 dtucker Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.338 2006/07/12 22:28:52 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 |
@@ -54,6 +54,9 @@ | |||
54 | 54 | ||
55 | #include <errno.h> | 55 | #include <errno.h> |
56 | #include <fcntl.h> | 56 | #include <fcntl.h> |
57 | #if defined(HAVE_NETDB_H) | ||
58 | # include <netdb.h> | ||
59 | #endif | ||
57 | #ifdef HAVE_PATHS_H | 60 | #ifdef HAVE_PATHS_H |
58 | #include <paths.h> | 61 | #include <paths.h> |
59 | #endif | 62 | #endif |