- (djm) Big OpenBSD sync:

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index 06245fdce8beed7fded8837d04466888ff2d8f29..797c5e851e163b3d4505bbf1262907489d434c5b 100644 (file)
--- a/includes.h
+++ b/includes.h
@@ -1,17 +1,15 @@
 /*
-
-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.
-
-*/
+ * Author: Tatu Ylonen <ylo@cs.hut.fi>
+ * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
+ *                    All rights reserved
+ * This file includes most of the needed system headers.
+ *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
+ */
 
 #ifndef INCLUDES_H
 #define INCLUDES_H
@@ -21,20 +19,17 @@ 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/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>
+#ifndef HAVE_CYGWIN
 #include <netinet/tcp.h>
-#include <netinet/ip.h>
+#endif
 #include <arpa/inet.h>
 #include <netdb.h>
 
@@ -43,21 +38,26 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <errno.h>
 #include <fcntl.h>
 #include <signal.h>
-#include <termios.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
 #include <pwd.h>
 #include <grp.h>
-#include <unistd.h>
 #include <time.h>
 #include <dirent.h>
 
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#endif
+#ifdef HAVE_BSTRING_H
+# include <bstring.h>
+#endif 
 #ifdef HAVE_NETGROUP_H
 # include <netgroup.h>
 #endif 
-#ifdef HAVE_PATHS_H
-# include <paths.h>
+#if defined(HAVE_NETDB_H) && !defined(HAVE_NEXT)
+/* Next includes this as part of another header */
+# include <netdb.h>
 #endif 
 #ifdef HAVE_ENDIAN_H
 # include <endian.h>
@@ -65,27 +65,34 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_SYS_SELECT_H
 # include <sys/select.h>
 #endif
-#ifdef HAVE_LIBPAM
+#ifdef HAVE_SYS_TIME_H
+# include <sys/time.h>
+#endif
+#ifdef HAVE_SYS_BSDTTY_H
+# include <sys/bsdtty.h>
+#endif
+#ifdef HAVE_TTYENT_H
+# include <ttyent.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
+#ifdef HAVE_VIS_H
+# include <vis.h>
+#endif
 #include "version.h"
-#include "helper.h"
-#include "bsd-strlcpy.h"
-#include "bsd-mktemp.h"
-
-/* Define this to be the path of the xauth program. */
-#ifndef XAUTH_PATH
-#define XAUTH_PATH "/usr/X11R6/bin/xauth"
-#endif /* XAUTH_PATH */
-
-/* Define this to be the path of the rsh program. */
-#ifndef _PATH_RSH
-#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
+#include "openbsd-compat.h"
+#include "cygwin_util.h"
+#include "entropy.h"
 
 #endif /* INCLUDES_H */