From b5b88c1979b2a8925fe8cc91f1b4054fe322293a Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Wed, 15 Mar 2006 03:42:54 +0000
Subject: [PATCH]  - (djm) [auth-pam.c clientloop.c includes.h monitor.c
 session.c]    [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c] 
   [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]   
 [openbsd-compat/glob.c openbsd-compat/mktemp.c]   
 [openbsd-compat/readpassphrase.c] Lots of include fixes for    OpenSolaris

---
 ChangeLog                       | 6 ++++++
 auth-pam.c                      | 5 +++++
 clientloop.c                    | 2 ++
 includes.h                      | 1 +
 monitor.c                       | 2 ++
 openbsd-compat/bsd-misc.c       | 3 +++
 openbsd-compat/bsd-openpty.c    | 2 ++
 openbsd-compat/glob.c           | 3 +++
 openbsd-compat/mktemp.c         | 4 ++++
 openbsd-compat/readpassphrase.c | 2 ++
 session.c                       | 2 ++
 sftp-client.c                   | 1 +
 ssh-keysign.c                   | 2 ++
 ssh.c                           | 2 ++
 sshconnect.c                    | 2 ++
 sshconnect2.c                   | 1 -
 sshd.c                          | 2 ++
 17 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fd5e220d..cb68fd4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -258,6 +258,12 @@
  - (djm) [ssh-agent.c] Restore dropped stat.h
  - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out 
    SHA384, which we don't need and doesn't compile without tweaks
+ - (djm) [auth-pam.c clientloop.c includes.h monitor.c session.c]
+   [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c]
+   [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]
+   [openbsd-compat/glob.c openbsd-compat/mktemp.c]
+   [openbsd-compat/readpassphrase.c] Lots of include fixes for
+   OpenSolaris
 
 20060313
  - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
diff --git a/auth-pam.c b/auth-pam.c
index 8ff3320d..5cbec772 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -49,6 +49,11 @@
 #include "includes.h"
 RCSID("$Id$");
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <signal.h>
+
 #ifdef USE_PAM
 #if defined(HAVE_SECURITY_PAM_APPL_H)
 #include <security/pam_appl.h>
diff --git a/clientloop.c b/clientloop.c
index dba3e96c..83706c29 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -68,7 +68,9 @@ RCSID("$OpenBSD: clientloop.c,v 1.155 2006/02/22 00:04:44 stevesk Exp $");
 #include <sys/ioctl.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 #include <termios.h>
 
diff --git a/includes.h b/includes.h
index 800d23e9..431fa2d1 100644
--- a/includes.h
+++ b/includes.h
@@ -103,6 +103,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#include <termios.h>
 #ifdef HAVE_SYS_BITYPES_H
 # include <sys/bitypes.h> /* For u_intXX_t */
 #endif
diff --git a/monitor.c b/monitor.c
index 30849a37..502d54ef 100644
--- a/monitor.c
+++ b/monitor.c
@@ -30,7 +30,9 @@ RCSID("$OpenBSD: monitor.c,v 1.69 2006/03/07 09:07:40 djm Exp $");
 #include <sys/types.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #ifdef SKEY
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index b9215245..c266431b 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -16,6 +16,9 @@
  */
 
 #include "includes.h"
+
+#include <signal.h>
+
 #include "xmalloc.h"
 
 RCSID("$Id$");
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 8eb62b7a..28929de6 100644
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -46,6 +46,8 @@
 # include <sys/stropts.h>
 #endif
 
+#include <signal.h>
+
 #ifndef O_NOCTTY
 #define O_NOCTTY 0
 #endif
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index f6a04ea3..fd3d86c4 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -34,6 +34,9 @@
 /* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
 
 #include "includes.h"
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
 #include <ctype.h>
 
 static long
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 88e04c52..53a50c51 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -35,6 +35,10 @@
 
 #include "includes.h"
 
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <ctype.h>
+
 #if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
 
 static int _gettemp(char *, int *, int, int);
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 919c0174..95e26dcd 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -27,6 +27,8 @@
 #ifndef HAVE_READPASSPHRASE
 
 #include <termios.h>
+#include <signal.h>
+#include <ctype.h>
 #include <readpassphrase.h>
 
 #ifdef TCSASOFT
diff --git a/session.c b/session.c
index 6fb63d3a..8eb1a03e 100644
--- a/session.c
+++ b/session.c
@@ -42,7 +42,9 @@ RCSID("$OpenBSD: session.c,v 1.197 2006/02/28 01:10:21 djm Exp $");
 #include <sys/wait.h>
 #include <sys/un.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include "ssh.h"
diff --git a/sftp-client.c b/sftp-client.c
index 042ab887..6637feca 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -26,6 +26,7 @@ RCSID("$OpenBSD: sftp-client.c,v 1.60 2006/02/20 17:19:54 stevesk Exp $");
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
+# include <signal.h>
 
 #include "openbsd-compat/sys-queue.h"
 
diff --git a/ssh-keysign.c b/ssh-keysign.c
index f2ee214e..aa0260bf 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -24,7 +24,9 @@
 #include "includes.h"
 RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $");
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 
 #include <openssl/evp.h>
 #include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 6f185b4a..911231a6 100644
--- a/ssh.c
+++ b/ssh.c
@@ -51,7 +51,9 @@ RCSID("$OpenBSD: ssh.c,v 1.266 2006/03/12 04:23:07 djm Exp $");
 #include <sys/un.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include <openssl/evp.h>
diff --git a/sshconnect.c b/sshconnect.c
index 9d1c8593..34027073 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -20,7 +20,9 @@ RCSID("$OpenBSD: sshconnect.c,v 1.176 2006/02/22 00:04:45 stevesk Exp $");
 #include <sys/stat.h>
 
 #include <ctype.h>
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 
 #include "ssh.h"
 #include "xmalloc.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index b01a3ca5..2467d235 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -27,7 +27,6 @@ RCSID("$OpenBSD: sshconnect2.c,v 1.147 2006/03/07 09:07:40 djm Exp $");
 
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/queue.h>
 #include <sys/stat.h>
 
 #include "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 6f458eb3..aef4db10 100644
--- a/sshd.c
+++ b/sshd.c
@@ -51,7 +51,9 @@ RCSID("$OpenBSD: sshd.c,v 1.325 2006/03/13 08:16:00 djm Exp $");
 #include <sys/ioctl.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_PATHS_H
 #include <paths.h>
+#endif
 #include <signal.h>
 
 #include <openssl/dh.h>
-- 
2.45.2