- Better fix to aclocal tests from Garrick James <garrick@james.net>

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index 8fa174bd6b7b4f48fa6edf026714b7247059eaf9..716d02f3189b571ec3def4653ee5946084d10655 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,17 +1,17 @@
 /*
-
-includes.h
-
-Author: Tatu Ylonen <ylo@cs.hut.fi>
-
-Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-                   All rights reserved
-
-Created: Thu Mar 23 16:29:37 1995 ylo
-
-This file includes most of the needed system headers.
-
-*/
+ *
+ * includes.h
+ *
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ *
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ *
+ * Created: Thu Mar 23 16:29:37 1995 ylo
+ *
+ * This file includes most of the needed system headers.
+ *
+ */
 
 #ifndef INCLUDES_H
 #define INCLUDES_H
@@ -19,30 +19,25 @@ This file includes most of the needed system headers.
 #define RCSID(msg) \
 static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 
+#include "config.h"
+
+#include "next-posix.h"
+
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/select.h>
-#include <sys/param.h>
 #include <sys/ioctl.h>
-#include <sys/stat.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/un.h>
 #include <sys/resource.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
 #include <netinet/tcp.h>
-#include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <endian.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <assert.h>
 #include <signal.h>
 #include <termios.h>
 #include <stdlib.h>
@@ -50,16 +45,51 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <stdarg.h>
 #include <pwd.h>
 #include <grp.h>
-#include <unistd.h>
 #include <time.h>
-#include <paths.h>
 #include <dirent.h>
 
+#ifdef HAVE_BSTRING_H
+# include <bstring.h>
+#endif 
+#ifdef HAVE_NETGROUP_H
+# include <netgroup.h>
+#endif 
+#ifdef HAVE_NETDB_H
+# include <netdb.h>
+#endif 
+#ifdef HAVE_ENDIAN_H
+# include <endian.h>
+#endif
+#ifdef HAVE_SYS_SELECT_H
+# include <sys/select.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_BSDTTY_H
+# include <sys/bsdtty.h>
+#endif
+#ifdef USE_PAM
+# include <security/pam_appl.h>
+#endif
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif
+#endif
+#ifdef HAVE_SYS_SYSMACROS_H
+# include <sys/sysmacros.h>
+#endif
+
 #include "version.h"
 
-#include "helper.h"
-#include "mktemp.h"
-#include "strlcpy.h"
+/* OpenBSD function replacements */
+#include "openbsd-compat.h"
+
+/* Entropy collection */
+#include "entropy.h"
 
 /* Define this to be the path of the xauth program. */
 #ifndef XAUTH_PATH
@@ -71,14 +101,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #define _PATH_RSH "/usr/bin/rsh"
 #endif /* _PATH_RSH */
 
-/* Define this to use pipes instead of socketpairs for communicating with the
-   client program.  Socketpairs do not seem to work on all systems. */
-#define USE_PIPES 1
-
-#ifndef SHUT_RD
-#define SHUT_RD 0 
-#define SHUT_WR 1 
-#define SHUT_RDWR 2 
-#endif /* SHUT_RD */
+/*
+ * Define this to use pipes instead of socketpairs for communicating with the
+ * client program.  Socketpairs do not seem to work on all systems.
+ */
+/* #define USE_PIPES 1 */
 
-#endif /* INCLUDES_H */
+#endif                         /* INCLUDES_H */