summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sftp-common.h4
-rw-r--r--sftp-glob.c5
-rw-r--r--sftp.c3
4 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index ba0b72033..6964eb523 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,11 @@
6 for SHUT_RD. 6 for SHUT_RD.
7 - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs <netinet/in.h> before 7 - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs <netinet/in.h> before
8 <netinet/ip.h>. 8 <netinet/ip.h>.
9 - (dtucker) OpenBSD CVS Sync
10 - stevesk@cvs.openbsd.org 2006/07/10 16:01:57
11 [sftp-glob.c sftp-common.h sftp.c]
12 buffer.h only needed in sftp-common.h and remove some unneeded
13 user includes; ok djm@
9 14
1020060711 1520060711
11 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c 16 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4855,4 +4860,4 @@
4855 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4860 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4856 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4861 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4857 4862
4858$Id: ChangeLog,v 1.4391 2006/07/12 09:05:56 dtucker Exp $ 4863$Id: ChangeLog,v 1.4392 2006/07/12 12:07:08 dtucker Exp $
diff --git a/sftp-common.h b/sftp-common.h
index 88c76c17e..9a64dc522 100644
--- a/sftp-common.h
+++ b/sftp-common.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-common.h,v 1.8 2006/03/25 22:22:43 djm Exp $ */ 1/* $OpenBSD: sftp-common.h,v 1.9 2006/07/10 16:01:57 stevesk Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2001 Markus Friedl. All rights reserved. 4 * Copyright (c) 2001 Markus Friedl. All rights reserved.
@@ -28,6 +28,8 @@
28#include <sys/types.h> 28#include <sys/types.h>
29#include <sys/stat.h> 29#include <sys/stat.h>
30 30
31#include "buffer.h"
32
31/* Maximum packet that we are willing to send/accept */ 33/* Maximum packet that we are willing to send/accept */
32#define SFTP_MAX_MSG_LENGTH (256 * 1024) 34#define SFTP_MAX_MSG_LENGTH (256 * 1024)
33 35
diff --git a/sftp-glob.c b/sftp-glob.c
index 3d092d133..0342de47d 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp-glob.c,v 1.19 2006/03/25 13:17:02 djm Exp $ */ 1/* $OpenBSD: sftp-glob.c,v 1.20 2006/07/10 16:01:57 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 *
@@ -24,10 +24,7 @@
24 24
25#include <dirent.h> 25#include <dirent.h>
26 26
27#include "buffer.h"
28#include "bufaux.h"
29#include "xmalloc.h" 27#include "xmalloc.h"
30#include "log.h"
31 28
32#include "sftp.h" 29#include "sftp.h"
33#include "sftp-common.h" 30#include "sftp-common.h"
diff --git a/sftp.c b/sftp.c
index a6c22aa67..27099ef06 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sftp.c,v 1.83 2006/07/08 21:47:12 stevesk Exp $ */ 1/* $OpenBSD: sftp.c,v 1.84 2006/07/10 16:01:57 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 *
@@ -35,7 +35,6 @@ typedef void EditLine;
35#endif 35#endif
36#include <signal.h> 36#include <signal.h>
37 37
38#include "buffer.h"
39#include "xmalloc.h" 38#include "xmalloc.h"
40#include "log.h" 39#include "log.h"
41#include "pathnames.h" 40#include "pathnames.h"