summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--includes.h3
-rw-r--r--scp.c4
-rw-r--r--sftp-glob.c4
-rw-r--r--sftp-server.c4
5 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 707411e33..d87509fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,9 @@
47 [includes.h packet.c] 47 [includes.h packet.c]
48 move #include <netinet/in_systm.h> and <netinet/ip.h> out of 48 move #include <netinet/in_systm.h> and <netinet/ip.h> out of
49 includes.h; ok markus@ 49 includes.h; ok markus@
50 - stevesk@cvs.openbsd.org 2006/02/08 23:51:24
51 [includes.h scp.c sftp-glob.c sftp-server.c]
52 move #include <dirent.h> out of includes.h; ok markus@
50 53
5120060313 5420060313
52 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong) 55 - (dtucker) [configure.ac] Bug #1171: Don't use printf("%lld", longlong)
@@ -3948,4 +3951,4 @@
3948 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3951 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3949 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3952 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3950 3953
3951$Id: ChangeLog,v 1.4153 2006/03/15 00:24:12 djm Exp $ 3954$Id: ChangeLog,v 1.4154 2006/03/15 00:25:13 djm Exp $
diff --git a/includes.h b/includes.h
index 60053b8d3..6452d2fc5 100644
--- a/includes.h
+++ b/includes.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: includes.h,v 1.29 2006/02/08 14:38:18 stevesk Exp $ */ 1/* $OpenBSD: includes.h,v 1.30 2006/02/08 23:51:24 stevesk Exp $ */
2 2
3/* 3/*
4 * Author: Tatu Ylonen <ylo@cs.hut.fi> 4 * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -35,7 +35,6 @@ static /**/const char *const rcsid[] = { (const char *)rcsid, "\100(#)" msg }
35#include <pwd.h> 35#include <pwd.h>
36#include <grp.h> 36#include <grp.h>
37#include <time.h> 37#include <time.h>
38#include <dirent.h>
39#include <stddef.h> 38#include <stddef.h>
40 39
41#ifdef HAVE_LIMITS_H 40#ifdef HAVE_LIMITS_H
diff --git a/scp.c b/scp.c
index 620024ea7..0b65ff081 100644
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,9 @@
71 */ 71 */
72 72
73#include "includes.h" 73#include "includes.h"
74RCSID("$OpenBSD: scp.c,v 1.130 2006/01/31 10:35:43 djm Exp $"); 74RCSID("$OpenBSD: scp.c,v 1.131 2006/02/08 23:51:24 stevesk Exp $");
75
76#include <dirent.h>
75 77
76#include "xmalloc.h" 78#include "xmalloc.h"
77#include "atomicio.h" 79#include "atomicio.h"
diff --git a/sftp-glob.c b/sftp-glob.c
index 16c5e206a..9dfbf9538 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -15,7 +15,9 @@
15 */ 15 */
16 16
17#include "includes.h" 17#include "includes.h"
18RCSID("$OpenBSD: sftp-glob.c,v 1.15 2004/02/17 07:17:29 djm Exp $"); 18RCSID("$OpenBSD: sftp-glob.c,v 1.16 2006/02/08 23:51:24 stevesk Exp $");
19
20#include <dirent.h>
19 21
20#include "buffer.h" 22#include "buffer.h"
21#include "bufaux.h" 23#include "bufaux.h"
diff --git a/sftp-server.c b/sftp-server.c
index 7060c44ad..96fe1a7bb 100644
--- a/sftp-server.c
+++ b/sftp-server.c
@@ -14,7 +14,9 @@
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */ 15 */
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: sftp-server.c,v 1.50 2006/01/02 01:20:31 djm Exp $"); 17RCSID("$OpenBSD: sftp-server.c,v 1.51 2006/02/08 23:51:24 stevesk Exp $");
18
19#include <dirent.h>
18 20
19#include "buffer.h" 21#include "buffer.h"
20#include "bufaux.h" 22#include "bufaux.h"