diff options
| -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 @@ 20020411 - (stevesk) [auth-sia.c] cleanup + - (tim) [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@ 20020410 - (stevesk) [configure.ac monitor.c] HAVE_SOCKETPAIR @@ -8218,4 +8222,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.2045 2002/04/11 20:39:40 stevesk Exp $ +$Id: ChangeLog,v 1.2046 2002/04/12 03:35:39 tim Exp $ @@ -1,4 +1,4 @@ -/* $Id: acconfig.h,v 1.129 2002/04/07 19:22:54 stevesk Exp $ */ +/* $Id: acconfig.h,v 1.130 2002/04/12 03:35:40 tim Exp $ */ #ifndef _CONFIG_H #define _CONFIG_H @@ -344,6 +344,4 @@ /* ******************* Shouldn't need to edit below this line ************** */ -#include "defines.h" - #endif /* _CONFIG_H */ @@ -1,62 +1,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.85 2002/04/06 23:52:05 mouring Exp $ */ - -/* Necessary headers */ - -#include <sys/types.h> /* For [u]intxx_t */ -#include <sys/socket.h> /* For SHUT_XXXX */ -#include <sys/param.h> /* For MAXPATHLEN and roundup() */ -#include <netinet/in_systm.h> /* For typedefs */ -#include <netinet/in.h> /* For IPv6 macros */ -#include <netinet/ip.h> /* For IPTOS macros */ -#ifdef HAVE_RPC_TYPES_H -# include <rpc/types.h> /* For INADDR_LOOPBACK */ -#endif -#ifdef HAVE_SYS_UN_H -# include <sys/un.h> /* For sockaddr_un */ -#endif -#ifdef HAVE_SYS_BITYPES_H -# include <sys/bitypes.h> /* For u_intXX_t */ -#endif -#ifdef HAVE_PATHS_H -# include <paths.h> /* For _PATH_XXX */ -#endif -#ifdef HAVE_LIMITS_H -# include <limits.h> /* For PATH_MAX */ -#endif -#ifdef HAVE_SYS_TIME_H -# include <sys/time.h> /* For timersub */ -#endif -#ifdef HAVE_MAILLOCK_H -# include <maillock.h> /* For _PATH_MAILDIR */ -#endif -#ifdef HAVE_SYS_CDEFS_H -# include <sys/cdefs.h> /* For __P() */ -#endif -#ifdef HAVE_SYS_SYSMACROS_H -# include <sys/sysmacros.h> /* For MIN, MAX, etc */ -#endif -#ifdef HAVE_SYS_STAT_H -# include <sys/stat.h> /* For S_* constants and macros */ -#endif -#ifdef HAVE_NEXT -# include <libc.h> -#endif - -#include <unistd.h> /* For STDIN_FILENO, etc */ -#include <termios.h> /* Struct winsize */ -#include <fcntl.h> /* For O_NONBLOCK */ -#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ - -/* *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively */ -#ifdef HAVE_STRINGS_H -# include <strings.h> -#endif -#ifdef HAVE_LOGIN_H -# include <login.h> -#endif +/* $Id: defines.h,v 1.86 2002/04/12 03:35:40 tim Exp $ */ /* Constants */ @@ -139,6 +84,14 @@ enum # define S_IRWXO 0000007 /* read, write, execute */ #endif /* S_IXUSR */ +#if !defined(MAP_ANON) && defined(MAP_ANONYMOUS) +#define MAP_ANON MAP_ANONYMOUS +#endif + +#ifndef MAP_FAILED +# define MAP_FAILED ((void *)-1) +#endif + /* *-*-nto-qnx doesn't define this constant in the system headers */ #ifdef MISSING_NFDBITS # define NFDBITS (8 * sizeof(unsigned long)) @@ -440,10 +393,6 @@ struct winsize { # define howmany(x,y) (((x)+((y)-1))/(y)) #endif -#ifdef __hpux -#define MAP_ANON MAP_ANONYMOUS -#endif - #ifndef ALIGNBYTES #define ALIGNBYTES (sizeof(int) - 1) #endif @@ -466,6 +415,10 @@ struct winsize { /* Function replacement / compatibility hacks */ +#ifndef HAVE_GETOPT_OPTRESET +#define getopt(ac, av, o) BSDgetopt(ac, av, o) +#endif + /* In older versions of libpam, pam_strerror takes a single argument */ #ifdef HAVE_OLD_PAM # define PAM_STRERROR(a,b) pam_strerror((b)) @@ -525,27 +478,6 @@ struct winsize { ** login recorder definitions **/ -/* preprocess */ - -#ifdef HAVE_UTMP_H -# ifdef HAVE_TIME_IN_UTMP -# include <time.h> -# endif -# include <utmp.h> -#endif -#ifdef HAVE_UTMPX_H -# ifdef HAVE_TV_IN_UTMPX -# include <sys/time.h> -# endif -# include <utmpx.h> -#endif -#ifdef HAVE_LASTLOG_H -# include <lastlog.h> -#endif -#ifdef HAVE_PATHS_H -# include <paths.h> -#endif - /* FIXME: put default paths back in */ #ifndef UTMP_FILE # ifdef _PATH_UTMP @@ -21,21 +21,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include "config.h" -#include "openbsd-compat/bsd-nextstep.h" - -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/ioctl.h> -#include <sys/wait.h> -#include <sys/resource.h> - -#include <netinet/tcp.h> -#include <arpa/inet.h> - #include <stdio.h> #include <ctype.h> #include <errno.h> -#include <fcntl.h> +#include <fcntl.h> /* For O_NONBLOCK */ #include <signal.h> #include <stdlib.h> #include <string.h> @@ -46,14 +35,11 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #include <dirent.h> #ifdef HAVE_LIMITS_H -# include <limits.h> +# include <limits.h> /* For PATH_MAX */ #endif #ifdef HAVE_GETOPT_H # include <getopt.h> #endif -#ifndef HAVE_GETOPT_OPTRESET -#define getopt(ac, av, o) BSDgetopt(ac, av, o) -#endif #ifdef HAVE_BSTRING_H # include <bstring.h> #endif @@ -70,34 +56,102 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } #ifdef HAVE_ENDIAN_H # include <endian.h> #endif -#ifdef HAVE_SYS_SELECT_H -# include <sys/select.h> +#ifdef HAVE_TTYENT_H +# include <ttyent.h> +#endif +#ifdef HAVE_UTIME_H +# include <utime.h> +#endif +#ifdef HAVE_MAILLOCK_H +# include <maillock.h> /* For _PATH_MAILDIR */ +#endif +#ifdef HAVE_NEXT +# include <libc.h> +#endif +#include <unistd.h> /* For STDIN_FILENO, etc */ +#include <termios.h> /* Struct winsize */ + +/* + *-*-nto-qnx needs these headers for strcasecmp and LASTLOG_FILE respectively + */ +#ifdef HAVE_STRINGS_H +# include <strings.h> +#endif +#ifdef HAVE_LOGIN_H +# include <login.h> +#endif + +#ifdef HAVE_UTMP_H +# include <utmp.h> +#endif +#ifdef HAVE_UTMPX_H +# ifdef HAVE_TV_IN_UTMPX +# include <sys/time.h> +# endif +# include <utmpx.h> +#endif +#ifdef HAVE_LASTLOG_H +# include <lastlog.h> +#endif +#ifdef HAVE_PATHS_H +# include <paths.h> /* For _PATH_XXX */ #endif + +#include <sys/types.h> +#include <sys/socket.h> +#include <sys/ioctl.h> +#include <sys/wait.h> #ifdef HAVE_SYS_TIME_H -# include <sys/time.h> +# include <sys/time.h> /* For timersub */ +#endif +#include <sys/resource.h> +#ifdef HAVE_SYS_SELECT_H +# include <sys/select.h> #endif #ifdef HAVE_SYS_BSDTTY_H # include <sys/bsdtty.h> #endif -#ifdef HAVE_TTYENT_H -# include <ttyent.h> +#include <sys/param.h> /* For MAXPATHLEN and roundup() */ +#ifdef HAVE_SYS_UN_H +# include <sys/un.h> /* For sockaddr_un */ #endif -#ifdef USE_PAM -# include <security/pam_appl.h> +#ifdef HAVE_SYS_BITYPES_H +# include <sys/bitypes.h> /* For u_intXX_t */ +#endif +#ifdef HAVE_SYS_CDEFS_H +# include <sys/cdefs.h> /* For __P() */ +#endif +#ifdef HAVE_SYS_STAT_H +# include <sys/stat.h> /* For S_* constants and macros */ #endif #ifdef HAVE_SYS_SYSMACROS_H -# include <sys/sysmacros.h> +# include <sys/sysmacros.h> /* For MIN, MAX, etc */ #endif -#ifdef HAVE_UTIME_H -# include <utime.h> +#ifdef HAVE_SYS_MMAN_H +#include <sys/mman.h> /* for MAP_ANONYMOUS */ +#endif + +#include <netinet/in_systm.h> /* For typedefs */ +#include <netinet/in.h> /* For IPv6 macros */ +#include <netinet/ip.h> /* For IPTOS macros */ +#include <netinet/tcp.h> +#include <arpa/inet.h> +#ifdef HAVE_RPC_TYPES_H +# include <rpc/types.h> /* For INADDR_LOOPBACK */ +#endif +#ifdef USE_PAM +# include <security/pam_appl.h> #endif + +#include <openssl/opensslv.h> /* For OPENSSL_VERSION_NUMBER */ + +#include "defines.h" + #include "version.h" #include "openbsd-compat/openbsd-compat.h" #include "openbsd-compat/bsd-cygwin_util.h" -#include "entropy.h" +#include "openbsd-compat/bsd-nextstep.h" -#ifndef MAP_FAILED -# define MAP_FAILED ((void *)-1) -#endif +#include "entropy.h" #endif /* INCLUDES_H */ diff --git a/openbsd-compat/fake-socket.h b/openbsd-compat/fake-socket.h index bfc9d152..f364797f 100644 --- a/openbsd-compat/fake-socket.h +++ b/openbsd-compat/fake-socket.h @@ -1,9 +1,9 @@ -/* $Id: fake-socket.h,v 1.2 2001/02/09 01:55:36 djm Exp $ */ +/* $Id: fake-socket.h,v 1.3 2002/04/12 03:35:40 tim Exp $ */ #ifndef _FAKE_SOCKET_H #define _FAKE_SOCKET_H -#include "config.h" +#include "includes.h" #include "sys/types.h" #ifndef HAVE_STRUCT_SOCKADDR_STORAGE diff --git a/openbsd-compat/inet_aton.c b/openbsd-compat/inet_aton.c index 18e31e7f..1fc001da 100644 --- a/openbsd-compat/inet_aton.c +++ b/openbsd-compat/inet_aton.c @@ -55,7 +55,7 @@ * --Copyright-- */ -#include "config.h" +#include "includes.h" #if !defined(HAVE_INET_ATON) @@ -25,7 +25,7 @@ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "config.h" +#include "includes.h" #include <stdlib.h> #include <string.h> |