summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--auth.h3
-rw-r--r--dispatch.c4
-rw-r--r--kex.h5
-rw-r--r--sftp-client.c2
5 files changed, 15 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 000c57828..7f7679402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,10 @@
95 [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c] 95 [ssh-keysign.c ssh-rsa.c ssh.c sshconnect.c sshconnect1.c sshconnect2.c]
96 [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c] 96 [sshd.c sshlogin.c sshpty.c ttymodes.c uidswap.c xmalloc.c]
97 move #include <string.h> out of includes.h 97 move #include <string.h> out of includes.h
98 - stevesk@cvs.openbsd.org 2006/07/23 01:11:05
99 [auth.h dispatch.c kex.h sftp-client.c]
100 #include <signal.h> for sig_atomic_t; need this prior to <sys/param.h>
101 move
98 102
9920060713 10320060713
100 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h 104 - (dtucker) [auth-krb5.c auth-pam.c] Still more errno.h
@@ -5013,4 +5017,4 @@
5013 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 5017 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
5014 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 5018 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
5015 5019
5016$Id: ChangeLog,v 1.4428 2006/07/24 04:13:33 djm Exp $ 5020$Id: ChangeLog,v 1.4429 2006/07/24 04:14:19 djm Exp $
diff --git a/auth.h b/auth.h
index 6688c3dc5..65250138f 100644
--- a/auth.h
+++ b/auth.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: auth.h,v 1.54 2006/07/06 16:03:53 stevesk Exp $ */ 1/* $OpenBSD: auth.h,v 1.55 2006/07/23 01:11:05 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -32,6 +32,7 @@
32 32
33#include <signal.h> 33#include <signal.h>
34#include <pwd.h> 34#include <pwd.h>
35#include <signal.h>
35 36
36#include "buffer.h" 37#include "buffer.h"
37#include <openssl/rsa.h> 38#include <openssl/rsa.h>
diff --git a/dispatch.c b/dispatch.c
index 4f965a62d..c1d98a78e 100644
--- a/dispatch.c
+++ b/dispatch.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dispatch.c,v 1.19 2006/04/20 09:27:09 djm Exp $ */ 1/* $OpenBSD: dispatch.c,v 1.20 2006/07/23 01:11:05 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2000 Markus Friedl. All rights reserved. 3 * Copyright (c) 2000 Markus Friedl. All rights reserved.
4 * 4 *
@@ -24,6 +24,8 @@
24 */ 24 */
25#include "includes.h" 25#include "includes.h"
26 26
27#include <signal.h>
28
27#include "ssh1.h" 29#include "ssh1.h"
28#include "ssh2.h" 30#include "ssh2.h"
29#include "log.h" 31#include "log.h"
diff --git a/kex.h b/kex.h
index a4a8af33e..a48c5c885 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: kex.h,v 1.42 2006/04/20 09:27:09 djm Exp $ */ 1/* $OpenBSD: kex.h,v 1.43 2006/07/23 01:11:05 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -28,6 +28,9 @@
28 28
29#include <signal.h> 29#include <signal.h>
30#include <openssl/evp.h> 30#include <openssl/evp.h>
31
32#include <signal.h>
33
31#include "buffer.h" 34#include "buffer.h"
32#include "cipher.h" 35#include "cipher.h"
33#include "key.h" 36#include "key.h"
diff --git a/sftp-client.c b/sftp-client.c
index 84dae58d2..9e7011ffd 100644
--- a/sftp-client.c
+++ b/sftp-client.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-client.c,v 1.69 2006/07/22 20:48:23 stevesk Exp $ */ 1/* $OpenBSD: sftp-client.c,v 1.70 2006/07/23 01:11:05 stevesk Exp $ */
2/* 2/*
3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> 3 * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
4 * 4 *