diff options
author | Tim Rice <tim@multitalents.net> | 2002-04-11 20:35:39 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2002-04-11 20:35:39 -0700 |
commit | 813f0452edb4e6ac8bd07b1e8ea5b60ec46874e8 (patch) | |
tree | 3d6e832d042cd8c1033a53181449a9e18ed69911 | |
parent | 0c283d8444cace9aad1793b9ebdbceb4726c6d9a (diff) |
[acconfig.h defines.h includes.h] put includes in includes.h and
defines in defines.h [rijndael.c openbsd-compat/fake-socket.h
openbsd-compat/inet_aton.c] include "includes.h" instead of "config.h"
ok stevesk@
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | acconfig.h | 4 | ||||
-rw-r--r-- | defines.h | 94 | ||||
-rw-r--r-- | includes.h | 114 | ||||
-rw-r--r-- | openbsd-compat/fake-socket.h | 4 | ||||
-rw-r--r-- | openbsd-compat/inet_aton.c | 2 | ||||
-rw-r--r-- | rijndael.c | 2 |
7 files changed, 107 insertions, 119 deletions
@@ -1,5 +1,9 @@ | |||
1 | 20020411 | 1 | 20020411 |
2 | - (stevesk) [auth-sia.c] cleanup | 2 | - (stevesk) [auth-sia.c] cleanup |
3 | - (tim) [acconfig.h defines.h includes.h] put includes in includes.h and | ||
4 | defines in defines.h [rijndael.c openbsd-compat/fake-socket.h | ||
5 | openbsd-compat/inet_aton.c] include "includes.h" instead of "config.h" | ||
6 | ok stevesk@ | ||
3 | 7 | ||
4 | 20020410 | 8 | 20020410 |
5 | - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR | 9 | - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR |
@@ -8218,4 +8222,4 @@ | |||
8218 | - Wrote replacements for strlcpy and mkdtemp | 8222 | - Wrote replacements for strlcpy and mkdtemp |
8219 | - Released 1.0pre1 | 8223 | - Released 1.0pre1 |
8220 | 8224 | ||
8221 | $Id: ChangeLog,v 1.2045 2002/04/11 20:39:40 stevesk Exp $ | 8225 | $Id: ChangeLog,v 1.2046 2002/04/12 03:35:39 tim Exp $ |
diff --git a/acconfig.h b/acconfig.h index a6bb1b795..3f9e56a97 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.129 2002/04/07 19:22:54 stevesk Exp $ */ | 1 | /* $Id: acconfig.h,v 1.130 2002/04/12 03:35:40 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _CONFIG_H | 3 | #ifndef _CONFIG_H |
4 | #define _CONFIG_H | 4 | #define _CONFIG_H |
@@ -344,6 +344,4 @@ | |||
344 | 344 | ||
345 | /* ******************* Shouldn't need to edit below this line ************** */ | 345 | /* ******************* Shouldn't need to edit below this line ************** */ |
346 | 346 | ||
347 | #include "defines.h" | ||
348 | |||
349 | #endif /* _CONFIG_H */ | 347 | #endif /* _CONFIG_H */ |
@@ -1,62 +1,7 @@ | |||
1 | #ifndef _DEFINES_H | 1 | #ifndef _DEFINES_H |
2 | #define _DEFINES_H | 2 | #define _DEFINES_H |
3 | 3 | ||
4 | /* $Id: defines.h,v 1.85 2002/04/06 23:52:05 mouring Exp $ */ | 4 | /* $Id: defines.h,v 1.86 2002/04/12 03:35:40 tim Exp $ */ |
5 | |||
6 | /* Necessary headers */ | ||
7 | |||
8 | #include <sys/types.h> /* For [u]intxx_t */ | ||
9 | #include <sys/socket.h> /* For SHUT_XXXX */ | ||
10 | #include <sys/param.h> /* For MAXPATHLEN and roundup() */ | ||
11 | #include <netinet/in_systm.h> /* For typedefs */ | ||
12 | #include <netinet/in.h> /* For IPv6 macros */ | ||
13 | #include <netinet/ip.h> /* For IPTOS macros */ | ||
14 | #ifdef HAVE_RPC_TYPES_H | ||
15 | # include <rpc/types.h> /* For INADDR_LOOPBACK */ | ||
16 | #endif | ||
17 | #ifdef HAVE_SYS_UN_H | ||
18 | # include <sys/un.h> /* For sockaddr_un */ | ||
19 | #endif | ||
20 | #ifdef HAVE_SYS_BITYPES_H | ||
21 | # include <sys/bitypes.h> /* For u_intXX_t */ | ||
22 | #endif | ||
23 | #ifdef HAVE_PATHS_H | ||
24 | # include <paths.h> /* For _PATH_XXX */ | ||
25 | #endif | ||
26 | #ifdef HAVE_LIMITS_H | ||
27 | # include <limits.h> /* For PATH_MAX */ | ||
28 | #endif | ||
29 | #ifdef HAVE_SYS_TIME_H | ||
30 | # include <sys/time.h> /* For timersub */ | ||
31 | #endif | ||
32 | #ifdef HAVE_MAILLOCK_H | ||
33 | # include <maillock.h> /* For _PATH_MAILDIR */ | ||
34 | #endif | ||
35 | #ifdef HAVE_SYS_CDEFS_H | ||
36 | # include <sys/cdefs.h> /* For __P() */ | ||
37 | #endif | ||
38 | #ifdef HAVE_SYS_SYSMACROS_H | ||
39 | # include <sys/sysmacros.h> /* For MIN, MAX, etc */ | ||
40 | #endif | ||
41 | #ifdef HAVE_SYS_STAT_H | ||
42 | # include <sys/stat.h> /* For S_* constants and macros */ | ||
43 | #endif | ||
44 | #ifdef HAVE_NEXT | ||
45 | # include <libc.h> | ||
46 | #endif | ||
47 | |||
48 | #include <unistd.h> /* For STDIN_FILENO, etc */ | ||
49 | #include <termios.h> /* Struct winsize */ | ||
50 | #include <fcntl.h> /* For O_NONBLOCK */ | ||
51 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ | ||
52 | |||
53 | /* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */ | ||
54 | #ifdef HAVE_STRINGS_H | ||
55 | # include <strings.h> | ||
56 | #endif | ||
57 | #ifdef HAVE_LOGIN_H | ||
58 | # include <login.h> | ||
59 | #endif | ||
60 | 5 | ||
61 | 6 | ||
62 | /* Constants */ | 7 | /* Constants */ |
@@ -139,6 +84,14 @@ enum | |||
139 | # define S_IRWXO 0000007 /* read, write, execute */ | 84 | # define S_IRWXO 0000007 /* read, write, execute */ |
140 | #endif /* S_IXUSR */ | 85 | #endif /* S_IXUSR */ |
141 | 86 | ||
87 | #if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) | ||
88 | #define MAP_ANON MAP_ANONYMOUS | ||
89 | #endif | ||
90 | |||
91 | #ifndef MAP_FAILED | ||
92 | # define MAP_FAILED ((void *)-1) | ||
93 | #endif | ||
94 | |||
142 | /* *-*-nto-qnx doesn't define this constant in the system headers */ | 95 | /* *-*-nto-qnx doesn't define this constant in the system headers */ |
143 | #ifdef MISSING_NFDBITS | 96 | #ifdef MISSING_NFDBITS |
144 | # define NFDBITS (8 * sizeof(unsigned long)) | 97 | # define NFDBITS (8 * sizeof(unsigned long)) |
@@ -440,10 +393,6 @@ struct winsize { | |||
440 | # define howmany(x,y) (((x)+((y)-1))/(y)) | 393 | # define howmany(x,y) (((x)+((y)-1))/(y)) |
441 | #endif | 394 | #endif |
442 | 395 | ||
443 | #ifdef __hpux | ||
444 | #define MAP_ANON MAP_ANONYMOUS | ||
445 | #endif | ||
446 | |||
447 | #ifndef ALIGNBYTES | 396 | #ifndef ALIGNBYTES |
448 | #define ALIGNBYTES (sizeof(int) - 1) | 397 | #define ALIGNBYTES (sizeof(int) - 1) |
449 | #endif | 398 | #endif |
@@ -466,6 +415,10 @@ struct winsize { | |||
466 | 415 | ||
467 | /* Function replacement / compatibility hacks */ | 416 | /* Function replacement / compatibility hacks */ |
468 | 417 | ||
418 | #ifndef HAVE_GETOPT_OPTRESET | ||
419 | #define getopt(ac, av, o) BSDgetopt(ac, av, o) | ||
420 | #endif | ||
421 | |||
469 | /* In older versions of libpam, pam_strerror takes a single argument */ | 422 | /* In older versions of libpam, pam_strerror takes a single argument */ |
470 | #ifdef HAVE_OLD_PAM | 423 | #ifdef HAVE_OLD_PAM |
471 | # define PAM_STRERROR(a,b) pam_strerror((b)) | 424 | # define PAM_STRERROR(a,b) pam_strerror((b)) |
@@ -525,27 +478,6 @@ struct winsize { | |||
525 | ** login recorder definitions | 478 | ** login recorder definitions |
526 | **/ | 479 | **/ |
527 | 480 | ||
528 | /* preprocess */ | ||
529 | |||
530 | #ifdef HAVE_UTMP_H | ||
531 | # ifdef HAVE_TIME_IN_UTMP | ||
532 | # include <time.h> | ||
533 | # endif | ||
534 | # include <utmp.h> | ||
535 | #endif | ||
536 | #ifdef HAVE_UTMPX_H | ||
537 | # ifdef HAVE_TV_IN_UTMPX | ||
538 | # include <sys/time.h> | ||
539 | # endif | ||
540 | # include <utmpx.h> | ||
541 | #endif | ||
542 | #ifdef HAVE_LASTLOG_H | ||
543 | # include <lastlog.h> | ||
544 | #endif | ||
545 | #ifdef HAVE_PATHS_H | ||
546 | # include <paths.h> | ||
547 | #endif | ||
548 | |||
549 | /* FIXME: put default paths back in */ | 481 | /* FIXME: put default paths back in */ |
550 | #ifndef UTMP_FILE | 482 | #ifndef UTMP_FILE |
551 | # ifdef _PATH_UTMP | 483 | # ifdef _PATH_UTMP |
diff --git a/includes.h b/includes.h index df91404e8..a63e87243 100644 --- a/includes.h +++ b/includes.h | |||
@@ -21,21 +21,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | 23 | ||
24 | #include "openbsd-compat/bsd-nextstep.h" | ||
25 | |||
26 | #include <sys/types.h> | ||
27 | #include <sys/socket.h> | ||
28 | #include <sys/ioctl.h> | ||
29 | #include <sys/wait.h> | ||
30 | #include <sys/resource.h> | ||
31 | |||
32 | #include <netinet/tcp.h> | ||
33 | #include <arpa/inet.h> | ||
34 | |||
35 | #include <stdio.h> | 24 | #include <stdio.h> |
36 | #include <ctype.h> | 25 | #include <ctype.h> |
37 | #include <errno.h> | 26 | #include <errno.h> |
38 | #include <fcntl.h> | 27 | #include <fcntl.h> /* For O_NONBLOCK */ |
39 | #include <signal.h> | 28 | #include <signal.h> |
40 | #include <stdlib.h> | 29 | #include <stdlib.h> |
41 | #include <string.h> | 30 | #include <string.h> |
@@ -46,14 +35,11 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
46 | #include <dirent.h> | 35 | #include <dirent.h> |
47 | 36 | ||
48 | #ifdef HAVE_LIMITS_H | 37 | #ifdef HAVE_LIMITS_H |
49 | # include <limits.h> | 38 | # include <limits.h> /* For PATH_MAX */ |
50 | #endif | 39 | #endif |
51 | #ifdef HAVE_GETOPT_H | 40 | #ifdef HAVE_GETOPT_H |
52 | # include <getopt.h> | 41 | # include <getopt.h> |
53 | #endif | 42 | #endif |
54 | #ifndef HAVE_GETOPT_OPTRESET | ||
55 | #define getopt(ac, av, o) BSDgetopt(ac, av, o) | ||
56 | #endif | ||
57 | #ifdef HAVE_BSTRING_H | 43 | #ifdef HAVE_BSTRING_H |
58 | # include <bstring.h> | 44 | # include <bstring.h> |
59 | #endif | 45 | #endif |
@@ -70,34 +56,102 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
70 | #ifdef HAVE_ENDIAN_H | 56 | #ifdef HAVE_ENDIAN_H |
71 | # include <endian.h> | 57 | # include <endian.h> |
72 | #endif | 58 | #endif |
73 | #ifdef HAVE_SYS_SELECT_H | 59 | #ifdef HAVE_TTYENT_H |
74 | # include <sys/select.h> | 60 | # include <ttyent.h> |
61 | #endif | ||
62 | #ifdef HAVE_UTIME_H | ||
63 | # include <utime.h> | ||
64 | #endif | ||
65 | #ifdef HAVE_MAILLOCK_H | ||
66 | # include <maillock.h> /* For _PATH_MAILDIR */ | ||
67 | #endif | ||
68 | #ifdef HAVE_NEXT | ||
69 | # include <libc.h> | ||
70 | #endif | ||
71 | #include <unistd.h> /* For STDIN_FILENO, etc */ | ||
72 | #include <termios.h> /* Struct winsize */ | ||
73 | |||
74 | /* | ||
75 | *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively | ||
76 | */ | ||
77 | #ifdef HAVE_STRINGS_H | ||
78 | # include <strings.h> | ||
79 | #endif | ||
80 | #ifdef HAVE_LOGIN_H | ||
81 | # include <login.h> | ||
82 | #endif | ||
83 | |||
84 | #ifdef HAVE_UTMP_H | ||
85 | # include <utmp.h> | ||
86 | #endif | ||
87 | #ifdef HAVE_UTMPX_H | ||
88 | # ifdef HAVE_TV_IN_UTMPX | ||
89 | # include <sys/time.h> | ||
90 | # endif | ||
91 | # include <utmpx.h> | ||
92 | #endif | ||
93 | #ifdef HAVE_LASTLOG_H | ||
94 | # include <lastlog.h> | ||
95 | #endif | ||
96 | #ifdef HAVE_PATHS_H | ||
97 | # include <paths.h> /* For _PATH_XXX */ | ||
75 | #endif | 98 | #endif |
99 | |||
100 | #include <sys/types.h> | ||
101 | #include <sys/socket.h> | ||
102 | #include <sys/ioctl.h> | ||
103 | #include <sys/wait.h> | ||
76 | #ifdef HAVE_SYS_TIME_H | 104 | #ifdef HAVE_SYS_TIME_H |
77 | # include <sys/time.h> | 105 | # include <sys/time.h> /* For timersub */ |
106 | #endif | ||
107 | #include <sys/resource.h> | ||
108 | #ifdef HAVE_SYS_SELECT_H | ||
109 | # include <sys/select.h> | ||
78 | #endif | 110 | #endif |
79 | #ifdef HAVE_SYS_BSDTTY_H | 111 | #ifdef HAVE_SYS_BSDTTY_H |
80 | # include <sys/bsdtty.h> | 112 | # include <sys/bsdtty.h> |
81 | #endif | 113 | #endif |
82 | #ifdef HAVE_TTYENT_H | 114 | #include <sys/param.h> /* For MAXPATHLEN and roundup() */ |
83 | # include <ttyent.h> | 115 | #ifdef HAVE_SYS_UN_H |
116 | # include <sys/un.h> /* For sockaddr_un */ | ||
84 | #endif | 117 | #endif |
85 | #ifdef USE_PAM | 118 | #ifdef HAVE_SYS_BITYPES_H |
86 | # include <security/pam_appl.h> | 119 | # include <sys/bitypes.h> /* For u_intXX_t */ |
120 | #endif | ||
121 | #ifdef HAVE_SYS_CDEFS_H | ||
122 | # include <sys/cdefs.h> /* For __P() */ | ||
123 | #endif | ||
124 | #ifdef HAVE_SYS_STAT_H | ||
125 | # include <sys/stat.h> /* For S_* constants and macros */ | ||
87 | #endif | 126 | #endif |
88 | #ifdef HAVE_SYS_SYSMACROS_H | 127 | #ifdef HAVE_SYS_SYSMACROS_H |
89 | # include <sys/sysmacros.h> | 128 | # include <sys/sysmacros.h> /* For MIN, MAX, etc */ |
90 | #endif | 129 | #endif |
91 | #ifdef HAVE_UTIME_H | 130 | #ifdef HAVE_SYS_MMAN_H |
92 | # include <utime.h> | 131 | #include <sys/mman.h> /* for MAP_ANONYMOUS */ |
132 | #endif | ||
133 | |||
134 | #include <netinet/in_systm.h> /* For typedefs */ | ||
135 | #include <netinet/in.h> /* For IPv6 macros */ | ||
136 | #include <netinet/ip.h> /* For IPTOS macros */ | ||
137 | #include <netinet/tcp.h> | ||
138 | #include <arpa/inet.h> | ||
139 | #ifdef HAVE_RPC_TYPES_H | ||
140 | # include <rpc/types.h> /* For INADDR_LOOPBACK */ | ||
141 | #endif | ||
142 | #ifdef USE_PAM | ||
143 | # include <security/pam_appl.h> | ||
93 | #endif | 144 | #endif |
145 | |||
146 | #include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ | ||
147 | |||
148 | #include "defines.h" | ||
149 | |||
94 | #include "version.h" | 150 | #include "version.h" |
95 | #include "openbsd-compat/openbsd-compat.h" | 151 | #include "openbsd-compat/openbsd-compat.h" |
96 | #include "openbsd-compat/bsd-cygwin_util.h" | 152 | #include "openbsd-compat/bsd-cygwin_util.h" |
97 | #include "entropy.h" | 153 | #include "openbsd-compat/bsd-nextstep.h" |
98 | 154 | ||
99 | #ifndef MAP_FAILED | 155 | #include "entropy.h" |
100 | # define MAP_FAILED ((void *)-1) | ||
101 | #endif | ||
102 | 156 | ||
103 | #endif /* INCLUDES_H */ | 157 | #endif /* INCLUDES_H */ |
diff --git a/openbsd-compat/fake-socket.h b/openbsd-compat/fake-socket.h index bfc9d1523..f364797fa 100644 --- a/openbsd-compat/fake-socket.h +++ b/openbsd-compat/fake-socket.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* $Id: fake-socket.h,v 1.2 2001/02/09 01:55:36 djm Exp $ */ | 1 | /* $Id: fake-socket.h,v 1.3 2002/04/12 03:35:40 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _FAKE_SOCKET_H | 3 | #ifndef _FAKE_SOCKET_H |
4 | #define _FAKE_SOCKET_H | 4 | #define _FAKE_SOCKET_H |
5 | 5 | ||
6 | #include "config.h" | 6 | #include "includes.h" |
7 | #include "sys/types.h" | 7 | #include "sys/types.h" |
8 | 8 | ||
9 | #ifndef HAVE_STRUCT_SOCKADDR_STORAGE | 9 | #ifndef HAVE_STRUCT_SOCKADDR_STORAGE |
diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c index 18e31e7f6..1fc001da6 100644 --- a/openbsd-compat/inet_aton.c +++ b/openbsd-compat/inet_aton.c | |||
@@ -55,7 +55,7 @@ | |||
55 | * --Copyright-- | 55 | * --Copyright-- |
56 | */ | 56 | */ |
57 | 57 | ||
58 | #include "config.h" | 58 | #include "includes.h" |
59 | 59 | ||
60 | #if !defined(HAVE_INET_ATON) | 60 | #if !defined(HAVE_INET_ATON) |
61 | 61 | ||
diff --git a/rijndael.c b/rijndael.c index c8ba55e78..448048ea6 100644 --- a/rijndael.c +++ b/rijndael.c | |||
@@ -25,7 +25,7 @@ | |||
25 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, | 25 | * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, |
26 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 | * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | */ | 27 | */ |
28 | #include "config.h" | 28 | #include "includes.h" |
29 | 29 | ||
30 | #include <stdlib.h> | 30 | #include <stdlib.h> |
31 | #include <string.h> | 31 | #include <string.h> |