- Prepare for 1.2.1pre20

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index 75349cf3efee80ce16d19a663575f892cd2d9d33..0538bfbc33ece69415b2f4e3b62eb1afeaf399e9 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
@@ -27,7 +27,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/un.h>
 #include <sys/resource.h>
 
@@ -65,14 +64,24 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #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 HAVE_LIBPAM
 # include <security/pam_appl.h>
-#endif /* HAVE_PAM */
+#endif
 
 #include "version.h"
 #include "helper.h"
-#include "mktemp.h"
-#include "strlcpy.h"
+#include "bsd-strlcpy.h"
+#include "bsd-strlcat.h"
+#include "bsd-mktemp.h"
+#include "bsd-snprintf.h"
+#include "bsd-daemon.h"
+#include "bsd-login.h"
 
 /* Define this to be the path of the xauth program. */
 #ifndef XAUTH_PATH
@@ -84,8 +93,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 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 */