- (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

diff --git a/ChangeLog b/ChangeLog
index fd5e220db9b96bcb329e81bd9253b048bdbc5fd7..cb68fd4cefd870a9ad730cd51395c49b1965af9c 100644 (file)
--- 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 8ff3320d30f44cfcff3f234e4519b2c5bc47e715..5cbec772c85fec14782c4f22b6bfb0d437e7290c 100644 (file)
--- 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 dba3e96c328102265d34efb3092317eed8684ed5..83706c297b813fab43c153255cec8e9e796c0c85 100644 (file)
--- 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 800d23e90b18b95476bcdeeb59e150443aee5f6a..431fa2d13f478e5ad61a709b75778ac999a0dab6 100644 (file)
--- 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 30849a3719e7382e0553081615b7fafde4c33efe..502d54efa62bc7927053a13210a6e7e7cca8db63 100644 (file)
--- 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 b921524521304471b3ffd050e507e5e7aa85c03b..c266431b94b98f47eed2be74109aa38f31266c56 100644 (file)
--- 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 8eb62b7a8b45923ded4206453922cb4aeb971aa0..28929de67316d651d7ab142cf64843935cc8025c 100644 (file)
--- 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 f6a04ea3f4fe3f2efca01fefb22fd50f4f338112..fd3d86c4c330284096eeb1e7c5d00670a5db9e34 100644 (file)
--- 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 88e04c5200bcaacb7f4663146c1b10cb0b727948..53a50c5121de660e9cb2157291813b00eed2e12b 100644 (file)
--- 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 919c0174a9068f5c99dfe9381cf98aa4fe94f420..95e26dcd45f9b1ff91dff7cd2c0b8911f9b7c124 100644 (file)
--- 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 6fb63d3ad90b53c8f314b93996bf3181d2cca296..8eb1a03e574d9ff708c02f9e1620d21364048504 100644 (file)
--- 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 042ab8879000329261a1a542caeb77e9ce3b01ef..6637feca4ac8752c50da718eb8e4f5bafeb89a4a 100644 (file)
--- 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 f2ee214e11257805268219eb34c9b8c2f4bc1542..aa0260bf867615500e08e6b1f8eea27bacf82d2c 100644 (file)
--- 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 6f185b4a7ef37f16ae211b1f934febcd7e29fbe5..911231a6c7b29b098cb6587196a670b21acee355 100644 (file)
--- 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 9d1c8593c8fb0d1b213b755fc1fd8762610954c7..3402707311e4b7490b6f582517f7b1d7680743ff 100644 (file)
--- 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 b01a3ca5bff1d48e0db8754129e5be431d8d9ef6..2467d235c6b7d3986bec2119b21e9912c5de8ea5 100644 (file)
--- 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 6f458eb3be48080a054d7bab5974bd5186f57959..aef4db109fba0fa16d4d70cd73cd3cf8cd089faa 100644 (file)
--- 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>