Removed old with-askpass option

[openssh.git] / includes.h

diff --git a/includes.h b/includes.h
index b2e8c1e78ac83581d902bbb05a8c6452fb337db1..a198597bc2e7b1a77ff7def8d32597c45db8d3ff 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,14 +19,14 @@ 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 <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>
 
@@ -37,12 +37,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #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>
@@ -52,22 +50,32 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
 #include <grp.h>
 #include <unistd.h>
 #include <time.h>
-#include <paths.h>
 #include <dirent.h>
 
-#include "version.h"
+#ifdef HAVE_NETGROUP_H
+# include <netgroup.h>
+#endif 
+#ifdef HAVE_PATHS_H
+# include <paths.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_LIBPAM
+# include <security/pam_appl.h>
+#endif
 
+#include "version.h"
 #include "helper.h"
-#include "mktemp.h"
-#include "strlcpy.h"
-
-#ifdef HAVE_PAM
-#include <security/pam_appl.h>
-#endif /* HAVE_PAM */
-
-#ifdef HAVE_PWDB
-#include <pwdb/pwdb_map.h>
-#endif /* HAVE_PWDB */
+#include "bsd-strlcpy.h"
+#include "bsd-strlcat.h"
+#include "bsd-mktemp.h"
 
 /* Define this to be the path of the xauth program. */
 #ifndef XAUTH_PATH
@@ -79,14 +87,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
 
-#ifndef SHUT_RD
-#define SHUT_RD 0 
-#define SHUT_WR 1 
-#define SHUT_RDWR 2 
-#endif /* SHUT_RD */
-
-#endif /* INCLUDES_H */
+#endif                         /* INCLUDES_H */