3 files changed, 12 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index e150ef6f4..349eec382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 20040218
  - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a
    path with a "-" in it.  From Sergio.Gelato at astro.su.se.
+ - (djm) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2004/02/17 07:17:29
+     [sftp-glob.c sftp.c]
+     Remove useless headers; ok deraadt@
 
 20040217
  - (djm) Simplify the license on code I have written. No code changes.
@@ -1870,4 +1874,4 @@
  - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
    Report from murple@murple.net, diagnosis from dtucker@zip.com.au
 
-$Id: ChangeLog,v 1.3234 2004/02/18 00:21:12 dtucker Exp $
+$Id: ChangeLog,v 1.3235 2004/02/18 03:11:13 djm Exp $
diff --git a/sftp-glob.c b/sftp-glob.c
index f47367f10..16c5e206a 100644
--- a/sftp-glob.c
+++ b/sftp-glob.c
@@ -15,7 +15,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp-glob.c,v 1.15 2004/02/17 07:17:29 djm Exp $");
 
 #include "buffer.h"
 #include "bufaux.h"
@@ -25,7 +25,9 @@ RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $");
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
-#include "sftp-glob.h"
+
+int remote_glob(struct sftp_conn *, const char *, int,
+    int (*)(const char *, int), glob_t *);
 
 struct SFTP_OPENDIR {
         SFTP_DIRENT **dir;
diff --git a/sftp.c b/sftp.c
index a6e976e58..04b859a8d 100644
--- a/sftp.c
+++ b/sftp.c
@@ -16,7 +16,7 @@
 
 #include "includes.h"
 
-RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.43 2004/02/17 07:17:29 djm Exp $");
 
 #include "buffer.h"
 #include "xmalloc.h"
@@ -27,7 +27,8 @@ RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $");
 #include "sftp.h"
 #include "sftp-common.h"
 #include "sftp-client.h"
-#include "sftp-int.h"
+
+int interactive_loop(int, int, char *, char *); /* sftp-int.c */
 
 #ifdef HAVE___PROGNAME
 extern char *__progname;