Deleted Added
full compact
includes.h (157019) includes.h (162856)
1/* $OpenBSD: includes.h,v 1.22 2006/01/01 08:59:27 stevesk Exp $ */
2/* $FreeBSD: head/crypto/openssh/includes.h 157019 2006-03-22 20:41:37Z des $ */
1/* $OpenBSD: includes.h,v 1.54 2006/07/22 20:48:23 stevesk Exp $ */
2/* $FreeBSD: head/crypto/openssh/includes.h 162856 2006-09-30 13:38:06Z des $ */
3
4/*
5 * Author: Tatu Ylonen <ylo@cs.hut.fi>
6 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
7 * All rights reserved
8 * This file includes most of the needed system headers.
9 *
10 * As far as I am concerned, the code I have written for this software
11 * can be used freely for any purpose. Any derived versions of this
12 * software must be clearly marked as such, and if the derived work is
13 * incompatible with the protocol description in the RFC file, it must be
14 * called by a name other than "ssh" or "Secure Shell".
15 */
16
17#ifndef INCLUDES_H
18#define INCLUDES_H
19
3
4/*
5 * Author: Tatu Ylonen <ylo@cs.hut.fi>
6 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
7 * All rights reserved
8 * This file includes most of the needed system headers.
9 *
10 * As far as I am concerned, the code I have written for this software
11 * can be used freely for any purpose. Any derived versions of this
12 * software must be clearly marked as such, and if the derived work is
13 * incompatible with the protocol description in the RFC file, it must be
14 * called by a name other than "ssh" or "Secure Shell".
15 */
16
17#ifndef INCLUDES_H
18#define INCLUDES_H
19
20#define RCSID(msg) \
21__RCSID(msg)
22
23#include "config.h"
24
25#define _GNU_SOURCE /* activate extra prototypes for glibc */
26
20#include "config.h"
21
22#define _GNU_SOURCE /* activate extra prototypes for glibc */
23
27#include <stdarg.h>
28#include <stdio.h>
29#include <ctype.h>
30#include <errno.h>
31#include <fcntl.h> /* For O_NONBLOCK */
32#include <signal.h>
33#include <stdlib.h>
34#include <string.h>
35#include <stdarg.h>
36#include <pwd.h>
37#include <grp.h>
38#include <time.h>
39#include <dirent.h>
40#include <stddef.h>
24#include <sys/types.h>
25#include <sys/socket.h> /* For CMSG_* */
41
42#ifdef HAVE_LIMITS_H
43# include <limits.h> /* For PATH_MAX */
44#endif
26
27#ifdef HAVE_LIMITS_H
28# include <limits.h> /* For PATH_MAX */
29#endif
45#ifdef HAVE_GETOPT_H
46# include <getopt.h>
47#endif
48#ifdef HAVE_BSTRING_H
49# include <bstring.h>
50#endif
51#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
30#ifdef HAVE_BSTRING_H
31# include <bstring.h>
32#endif
33#if defined(HAVE_GLOB_H) && defined(GLOB_HAS_ALTDIRFUNC) && \
52 defined(GLOB_HAS_GL_MATCHC)
34 defined(GLOB_HAS_GL_MATCHC) && \
35 defined(HAVE_DECL_GLOB_NOMATCH) && HAVE_DECL_GLOB_NOMATCH != 0
53# include <glob.h>
54#endif
36# include <glob.h>
37#endif
55#ifdef HAVE_NETGROUP_H
56# include <netgroup.h>
57#endif
58#ifdef HAVE_ENDIAN_H
59# include <endian.h>
60#endif
61#ifdef HAVE_TTYENT_H
62# include <ttyent.h>
63#endif
64#ifdef HAVE_UTIME_H
65# include <utime.h>
66#endif
67#ifdef HAVE_MAILLOCK_H
68# include <maillock.h> /* For _PATH_MAILDIR */
69#endif
70#ifdef HAVE_NEXT
38#ifdef HAVE_ENDIAN_H
39# include <endian.h>
40#endif
41#ifdef HAVE_TTYENT_H
42# include <ttyent.h>
43#endif
44#ifdef HAVE_UTIME_H
45# include <utime.h>
46#endif
47#ifdef HAVE_MAILLOCK_H
48# include <maillock.h> /* For _PATH_MAILDIR */
49#endif
50#ifdef HAVE_NEXT
71# include <libc.h>
51# include
72#endif
52#endif
73#include <unistd.h> /* For STDIN_FILENO, etc */
74#include <termios.h> /* Struct winsize */
53#ifdef HAVE_PATHS
54# include <paths.h>
55#endif
75
76/*
77 *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively
78 */
79#ifdef HAVE_STRINGS_H
80# include <strings.h>
81#endif
82#ifdef HAVE_LOGIN_H
83# include <login.h>
84#endif
85
86#ifdef HAVE_UTMP_H
87# include <utmp.h>
88#endif
89#ifdef HAVE_UTMPX_H
56
57/*
58 *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively
59 */
60#ifdef HAVE_STRINGS_H
61# include <strings.h>
62#endif
63#ifdef HAVE_LOGIN_H
64# include <login.h>
65#endif
66
67#ifdef HAVE_UTMP_H
68# include <utmp.h>
69#endif
70#ifdef HAVE_UTMPX_H
90# ifdef HAVE_TV_IN_UTMPX
91# include <sys/time.h>
92# endif
93# include <utmpx.h>
94#endif
95#ifdef HAVE_LASTLOG_H
96# include <lastlog.h>
97#endif
71# include <utmpx.h>
72#endif
73#ifdef HAVE_LASTLOG_H
74# include <lastlog.h>
75#endif
98#ifdef HAVE_PATHS_H
99# include <paths.h> /* For _PATH_XXX */
100#endif
101
76
102#include <sys/types.h>
103#include <sys/socket.h>
104#include <sys/ioctl.h>
105#include <sys/wait.h>
106#ifdef HAVE_SYS_TIME_H
107# include <sys/time.h> /* For timersub */
108#endif
109#include <sys/resource.h>
110#ifdef HAVE_SYS_SELECT_H
111# include <sys/select.h>
112#endif
113#ifdef HAVE_SYS_BSDTTY_H
114# include <sys/bsdtty.h>
115#endif
77#ifdef HAVE_SYS_SELECT_H
78# include <sys/select.h>
79#endif
80#ifdef HAVE_SYS_BSDTTY_H
81# include <sys/bsdtty.h>
82#endif
116#include <sys/param.h> /* For MAXPATHLEN and roundup() */
117#ifdef HAVE_SYS_UN_H
118# include <sys/un.h> /* For sockaddr_un */
119#endif
120#ifdef HAVE_STDINT_H
121# include <stdint.h>
122#endif
83#ifdef HAVE_STDINT_H
84# include <stdint.h>
85#endif
86#include <termios.h>
123#ifdef HAVE_SYS_BITYPES_H
124# include <sys/bitypes.h> /* For u_intXX_t */
125#endif
126#ifdef HAVE_SYS_CDEFS_H
127# include <sys/cdefs.h> /* For __P() */
128#endif
129#ifdef HAVE_SYS_STAT_H
130# include <sys/stat.h> /* For S_* constants and macros */

--- 9 unchanged lines hidden (view full) ---

140#endif
141#if defined(HAVE_SYS_PTMS_H) && defined(HAVE_DEV_PTMX)
142# if defined(HAVE_SYS_STREAM_H)
143# include <sys/stream.h> /* reqd for queue_t on Solaris 2.5.1 */
144# endif
145#include <sys/ptms.h> /* for grantpt() and friends */
146#endif
147
87#ifdef HAVE_SYS_BITYPES_H
88# include <sys/bitypes.h> /* For u_intXX_t */
89#endif
90#ifdef HAVE_SYS_CDEFS_H
91# include <sys/cdefs.h> /* For __P() */
92#endif
93#ifdef HAVE_SYS_STAT_H
94# include <sys/stat.h> /* For S_* constants and macros */

--- 9 unchanged lines hidden (view full) ---

104#endif
105#if defined(HAVE_SYS_PTMS_H) && defined(HAVE_DEV_PTMX)
106# if defined(HAVE_SYS_STREAM_H)
107# include <sys/stream.h> /* reqd for queue_t on Solaris 2.5.1 */
108# endif
109#include <sys/ptms.h> /* for grantpt() and friends */
110#endif
111
112#include <netinet/in.h>
148#include <netinet/in_systm.h> /* For typedefs */
113#include <netinet/in_systm.h> /* For typedefs */
149#include <netinet/in.h> /* For IPv6 macros */
150#include <netinet/ip.h> /* For IPTOS macros */
151#include <netinet/tcp.h>
152#include <arpa/inet.h>
153#if defined(HAVE_NETDB_H)
154# include <netdb.h>
155#endif
156#ifdef HAVE_RPC_TYPES_H
157# include <rpc/types.h> /* For INADDR_LOOPBACK */
158#endif
159#ifdef USE_PAM
160#if defined(HAVE_SECURITY_PAM_APPL_H)
161# include <security/pam_appl.h>
162#elif defined (HAVE_PAM_PAM_APPL_H)
163# include <pam/pam_appl.h>

--- 37 unchanged lines hidden (view full) ---

201# undef _INCLUDE__STDC__
202# endif
203#endif
204
205#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */
206
207#include "defines.h"
208
114#ifdef HAVE_RPC_TYPES_H
115# include <rpc/types.h> /* For INADDR_LOOPBACK */
116#endif
117#ifdef USE_PAM
118#if defined(HAVE_SECURITY_PAM_APPL_H)
119# include <security/pam_appl.h>
120#elif defined (HAVE_PAM_PAM_APPL_H)
121# include <pam/pam_appl.h>

--- 37 unchanged lines hidden (view full) ---

159# undef _INCLUDE__STDC__
160# endif
161#endif
162
163#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */
164
165#include "defines.h"
166
209#include "version.h"
167#include "platform.h"
210#include "openbsd-compat/openbsd-compat.h"
211#include "openbsd-compat/bsd-nextstep.h"
212
213#include "entropy.h"
214
215#endif /* INCLUDES_H */
168#include "openbsd-compat/openbsd-compat.h"
169#include "openbsd-compat/bsd-nextstep.h"
170
171#include "entropy.h"
172
173#endif /* INCLUDES_H */