diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-07-12 22:07:08 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-07-12 22:07:08 +1000 |
commit | a5362458d0e1d2387a05f5c7c29e4f5b87501824 (patch) | |
tree | 46ed672ee8e9a69c3e12da0cdec036d994714aa6 | |
parent | 686852f665376c2287c716f8d388b42c1727210b (diff) |
- stevesk@cvs.openbsd.org 2006/07/10 16:01:57
[sftp-glob.c sftp-common.h sftp.c]
buffer.h only needed in sftp-common.h and remove some unneeded
user includes; ok djm@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | sftp-common.h | 4 | ||||
-rw-r--r-- | sftp-glob.c | 5 | ||||
-rw-r--r-- | sftp.c | 3 |
4 files changed, 11 insertions, 8 deletions
@@ -6,6 +6,11 @@ for SHUT_RD. - (dtucker) [openbsd-compat/port-tun.c] OpenBSD needs <netinet/in.h> before <netinet/ip.h>. + - (dtucker) OpenBSD CVS Sync + - stevesk@cvs.openbsd.org 2006/07/10 16:01:57 + [sftp-glob.c sftp-common.h sftp.c] + buffer.h only needed in sftp-common.h and remove some unneeded + user includes; ok djm@ 20060711 - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c @@ -4855,4 +4860,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4391 2006/07/12 09:05:56 dtucker Exp $ +$Id: ChangeLog,v 1.4392 2006/07/12 12:07:08 dtucker Exp $ diff --git a/sftp-common.h b/sftp-common.h index 88c76c17..9a64dc52 100644 --- a/sftp-common.h +++ b/sftp-common.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-common.h,v 1.8 2006/03/25 22:22:43 djm Exp $ */ +/* $OpenBSD: sftp-common.h,v 1.9 2006/07/10 16:01:57 stevesk Exp $ */ /* * Copyright (c) 2001 Markus Friedl. All rights reserved. @@ -28,6 +28,8 @@ #include <sys/types.h> #include <sys/stat.h> +#include "buffer.h" + /* Maximum packet that we are willing to send/accept */ #define SFTP_MAX_MSG_LENGTH (256 * 1024) diff --git a/sftp-glob.c b/sftp-glob.c index 3d092d13..0342de47 100644 --- a/sftp-glob.c +++ b/sftp-glob.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp-glob.c,v 1.19 2006/03/25 13:17:02 djm Exp $ */ +/* $OpenBSD: sftp-glob.c,v 1.20 2006/07/10 16:01:57 stevesk Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -24,10 +24,7 @@ #include <dirent.h> -#include "buffer.h" -#include "bufaux.h" #include "xmalloc.h" -#include "log.h" #include "sftp.h" #include "sftp-common.h" @@ -1,4 +1,4 @@ -/* $OpenBSD: sftp.c,v 1.83 2006/07/08 21:47:12 stevesk Exp $ */ +/* $OpenBSD: sftp.c,v 1.84 2006/07/10 16:01:57 stevesk Exp $ */ /* * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> * @@ -35,7 +35,6 @@ typedef void EditLine; #endif #include <signal.h> -#include "buffer.h" #include "xmalloc.h" #include "log.h" #include "pathnames.h" |