summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog8
-rw-r--r--auth-pam.c7
-rw-r--r--clientloop.c2
-rw-r--r--includes.h1
-rw-r--r--monitor.c2
-rw-r--r--openbsd-compat/bsd-misc.c5
-rw-r--r--openbsd-compat/bsd-openpty.c2
-rw-r--r--openbsd-compat/glob.c3
-rw-r--r--openbsd-compat/mktemp.c4
-rw-r--r--openbsd-compat/readpassphrase.c2
-rw-r--r--session.c2
-rw-r--r--sftp-client.c1
-rw-r--r--ssh-keysign.c2
-rw-r--r--ssh.c2
-rw-r--r--sshconnect.c2
-rw-r--r--sshconnect2.c1
-rw-r--r--sshd.c2
17 files changed, 44 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index d361e71f2..c30c0e399 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -258,6 +258,12 @@
258 - (djm) [ssh-agent.c] Restore dropped stat.h 258 - (djm) [ssh-agent.c] Restore dropped stat.h
259 - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out 259 - (djm) [openbsd-compat/sha2.h openbsd-compat/sha2.c] Comment out
260 SHA384, which we don't need and doesn't compile without tweaks 260 SHA384, which we don't need and doesn't compile without tweaks
261 - (djm) [auth-pam.c clientloop.c includes.h monitor.c session.c]
262 [sftp-client.c ssh-keysign.c ssh.c sshconnect.c sshconnect2.c]
263 [sshd.c openbsd-compat/bsd-misc.c openbsd-compat/bsd-openpty.c]
264 [openbsd-compat/glob.c openbsd-compat/mktemp.c]
265 [openbsd-compat/readpassphrase.c] Lots of include fixes for
266 OpenSolaris
261 267
26220060313 26820060313
263 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 269 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -4159,4 +4165,4 @@
4159 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4165 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4160 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4166 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4161 4167
4162$Id: ChangeLog,v 1.4217 2006/03/15 03:37:48 djm Exp $ 4168$Id: ChangeLog,v 1.4218 2006/03/15 03:42:54 djm Exp $
diff --git a/auth-pam.c b/auth-pam.c
index fb9ae954a..49cf32369 100644
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -47,7 +47,12 @@
47 47
48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */ 48/* Based on $FreeBSD: src/crypto/openssh/auth2-pam-freebsd.c,v 1.11 2003/03/31 13:48:18 des Exp $ */
49#include "includes.h" 49#include "includes.h"
50RCSID("$Id: auth-pam.c,v 1.128 2006/01/29 05:46:13 dtucker Exp $"); 50RCSID("$Id: auth-pam.c,v 1.129 2006/03/15 03:42:55 djm Exp $");
51
52#include <sys/types.h>
53#include <sys/stat.h>
54#include <sys/wait.h>
55#include <signal.h>
51 56
52#ifdef USE_PAM 57#ifdef USE_PAM
53#if defined(HAVE_SECURITY_PAM_APPL_H) 58#if defined(HAVE_SECURITY_PAM_APPL_H)
diff --git a/clientloop.c b/clientloop.c
index dba3e96c3..83706c297 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 $");
68#include <sys/ioctl.h> 68#include <sys/ioctl.h>
69 69
70#include <ctype.h> 70#include <ctype.h>
71#ifdef HAVE_PATHS_H
71#include <paths.h> 72#include <paths.h>
73#endif
72#include <signal.h> 74#include <signal.h>
73#include <termios.h> 75#include <termios.h>
74 76
diff --git a/includes.h b/includes.h
index 800d23e90..431fa2d13 100644
--- a/includes.h
+++ b/includes.h
@@ -103,6 +103,7 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
103#ifdef HAVE_STDINT_H 103#ifdef HAVE_STDINT_H
104# include <stdint.h> 104# include <stdint.h>
105#endif 105#endif
106#include <termios.h>
106#ifdef HAVE_SYS_BITYPES_H 107#ifdef HAVE_SYS_BITYPES_H
107# include <sys/bitypes.h> /* For u_intXX_t */ 108# include <sys/bitypes.h> /* For u_intXX_t */
108#endif 109#endif
diff --git a/monitor.c b/monitor.c
index 30849a371..502d54efa 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 $");
30#include <sys/types.h> 30#include <sys/types.h>
31#include <sys/wait.h> 31#include <sys/wait.h>
32 32
33#ifdef HAVE_PATHS_H
33#include <paths.h> 34#include <paths.h>
35#endif
34#include <signal.h> 36#include <signal.h>
35 37
36#ifdef SKEY 38#ifdef SKEY
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index d32b054d7..00482616d 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -16,9 +16,12 @@
16 */ 16 */
17 17
18#include "includes.h" 18#include "includes.h"
19
20#include <signal.h>
21
19#include "xmalloc.h" 22#include "xmalloc.h"
20 23
21RCSID("$Id: bsd-misc.c,v 1.28 2005/11/01 22:07:31 dtucker Exp $"); 24RCSID("$Id: bsd-misc.c,v 1.29 2006/03/15 03:42:57 djm Exp $");
22 25
23#ifndef HAVE___PROGNAME 26#ifndef HAVE___PROGNAME
24char *__progname; 27char *__progname;
diff --git a/openbsd-compat/bsd-openpty.c b/openbsd-compat/bsd-openpty.c
index 8eb62b7a8..28929de67 100644
--- a/openbsd-compat/bsd-openpty.c
+++ b/openbsd-compat/bsd-openpty.c
@@ -46,6 +46,8 @@
46# include <sys/stropts.h> 46# include <sys/stropts.h>
47#endif 47#endif
48 48
49#include <signal.h>
50
49#ifndef O_NOCTTY 51#ifndef O_NOCTTY
50#define O_NOCTTY 0 52#define O_NOCTTY 0
51#endif 53#endif
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index f6a04ea3f..fd3d86c4c 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -34,6 +34,9 @@
34/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */ 34/* OPENBSD ORIGINAL: lib/libc/gen/glob.c */
35 35
36#include "includes.h" 36#include "includes.h"
37#include <sys/types.h>
38#include <sys/stat.h>
39#include <dirent.h>
37#include <ctype.h> 40#include <ctype.h>
38 41
39static long 42static long
diff --git a/openbsd-compat/mktemp.c b/openbsd-compat/mktemp.c
index 88e04c520..53a50c512 100644
--- a/openbsd-compat/mktemp.c
+++ b/openbsd-compat/mktemp.c
@@ -35,6 +35,10 @@
35 35
36#include "includes.h" 36#include "includes.h"
37 37
38#include <sys/types.h>
39#include <sys/stat.h>
40#include <ctype.h>
41
38#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP) 42#if !defined(HAVE_MKDTEMP) || defined(HAVE_STRICT_MKSTEMP)
39 43
40static int _gettemp(char *, int *, int, int); 44static int _gettemp(char *, int *, int, int);
diff --git a/openbsd-compat/readpassphrase.c b/openbsd-compat/readpassphrase.c
index 919c0174a..95e26dcd4 100644
--- a/openbsd-compat/readpassphrase.c
+++ b/openbsd-compat/readpassphrase.c
@@ -27,6 +27,8 @@
27#ifndef HAVE_READPASSPHRASE 27#ifndef HAVE_READPASSPHRASE
28 28
29#include <termios.h> 29#include <termios.h>
30#include <signal.h>
31#include <ctype.h>
30#include <readpassphrase.h> 32#include <readpassphrase.h>
31 33
32#ifdef TCSASOFT 34#ifdef TCSASOFT
diff --git a/session.c b/session.c
index 6fb63d3ad..8eb1a03e5 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 $");
42#include <sys/wait.h> 42#include <sys/wait.h>
43#include <sys/un.h> 43#include <sys/un.h>
44 44
45#ifdef HAVE_PATHS_H
45#include <paths.h> 46#include <paths.h>
47#endif
46#include <signal.h> 48#include <signal.h>
47 49
48#include "ssh.h" 50#include "ssh.h"
diff --git a/sftp-client.c b/sftp-client.c
index 042ab8879..6637feca4 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 $");
26#ifdef HAVE_SYS_STAT_H 26#ifdef HAVE_SYS_STAT_H
27# include <sys/stat.h> 27# include <sys/stat.h>
28#endif 28#endif
29# include <signal.h>
29 30
30#include "openbsd-compat/sys-queue.h" 31#include "openbsd-compat/sys-queue.h"
31 32
diff --git a/ssh-keysign.c b/ssh-keysign.c
index f2ee214e1..aa0260bf8 100644
--- a/ssh-keysign.c
+++ b/ssh-keysign.c
@@ -24,7 +24,9 @@
24#include "includes.h" 24#include "includes.h"
25RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $"); 25RCSID("$OpenBSD: ssh-keysign.c,v 1.20 2006/02/08 12:15:27 stevesk Exp $");
26 26
27#ifdef HAVE_PATHS_H
27#include <paths.h> 28#include <paths.h>
29#endif
28 30
29#include <openssl/evp.h> 31#include <openssl/evp.h>
30#include <openssl/rand.h> 32#include <openssl/rand.h>
diff --git a/ssh.c b/ssh.c
index 6f185b4a7..911231a6c 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 $");
51#include <sys/un.h> 51#include <sys/un.h>
52 52
53#include <ctype.h> 53#include <ctype.h>
54#ifdef HAVE_PATHS_H
54#include <paths.h> 55#include <paths.h>
56#endif
55#include <signal.h> 57#include <signal.h>
56 58
57#include <openssl/evp.h> 59#include <openssl/evp.h>
diff --git a/sshconnect.c b/sshconnect.c
index 9d1c8593c..340270731 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 $");
20#include <sys/stat.h> 20#include <sys/stat.h>
21 21
22#include <ctype.h> 22#include <ctype.h>
23#ifdef HAVE_PATHS_H
23#include <paths.h> 24#include <paths.h>
25#endif
24 26
25#include "ssh.h" 27#include "ssh.h"
26#include "xmalloc.h" 28#include "xmalloc.h"
diff --git a/sshconnect2.c b/sshconnect2.c
index b01a3ca5b..2467d235c 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 $");
27 27
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/wait.h> 29#include <sys/wait.h>
30#include <sys/queue.h>
31#include <sys/stat.h> 30#include <sys/stat.h>
32 31
33#include "openbsd-compat/sys-queue.h" 32#include "openbsd-compat/sys-queue.h"
diff --git a/sshd.c b/sshd.c
index 6f458eb3b..aef4db109 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 $");
51#include <sys/ioctl.h> 51#include <sys/ioctl.h>
52#include <sys/wait.h> 52#include <sys/wait.h>
53 53
54#ifdef HAVE_PATHS_H
54#include <paths.h> 55#include <paths.h>
56#endif
55#include <signal.h> 57#include <signal.h>
56 58
57#include <openssl/dh.h> 59#include <openssl/dh.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-26 18:38:55 +0000