diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sftp-glob.c | 6 | ||||
-rw-r--r-- | sftp.c | 5 |
3 files changed, 12 insertions, 5 deletions
@@ -1,6 +1,10 @@ | |||
1 | 20040218 | 1 | 20040218 |
2 | - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a | 2 | - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a |
3 | path with a "-" in it. From Sergio.Gelato at astro.su.se. | 3 | path with a "-" in it. From Sergio.Gelato at astro.su.se. |
4 | - (djm) OpenBSD CVS Sync | ||
5 | - djm@cvs.openbsd.org 2004/02/17 07:17:29 | ||
6 | [sftp-glob.c sftp.c] | ||
7 | Remove useless headers; ok deraadt@ | ||
4 | 8 | ||
5 | 20040217 | 9 | 20040217 |
6 | - (djm) Simplify the license on code I have written. No code changes. | 10 | - (djm) Simplify the license on code I have written. No code changes. |
@@ -1870,4 +1874,4 @@ | |||
1870 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1874 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1871 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1875 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1872 | 1876 | ||
1873 | $Id: ChangeLog,v 1.3234 2004/02/18 00:21:12 dtucker Exp $ | 1877 | $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 @@ | |||
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $"); | 18 | RCSID("$OpenBSD: sftp-glob.c,v 1.15 2004/02/17 07:17:29 djm Exp $"); |
19 | 19 | ||
20 | #include "buffer.h" | 20 | #include "buffer.h" |
21 | #include "bufaux.h" | 21 | #include "bufaux.h" |
@@ -25,7 +25,9 @@ RCSID("$OpenBSD: sftp-glob.c,v 1.14 2004/02/17 05:39:51 djm Exp $"); | |||
25 | #include "sftp.h" | 25 | #include "sftp.h" |
26 | #include "sftp-common.h" | 26 | #include "sftp-common.h" |
27 | #include "sftp-client.h" | 27 | #include "sftp-client.h" |
28 | #include "sftp-glob.h" | 28 | |
29 | int remote_glob(struct sftp_conn *, const char *, int, | ||
30 | int (*)(const char *, int), glob_t *); | ||
29 | 31 | ||
30 | struct SFTP_OPENDIR { | 32 | struct SFTP_OPENDIR { |
31 | SFTP_DIRENT **dir; | 33 | SFTP_DIRENT **dir; |
@@ -16,7 +16,7 @@ | |||
16 | 16 | ||
17 | #include "includes.h" | 17 | #include "includes.h" |
18 | 18 | ||
19 | RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $"); | 19 | RCSID("$OpenBSD: sftp.c,v 1.43 2004/02/17 07:17:29 djm Exp $"); |
20 | 20 | ||
21 | #include "buffer.h" | 21 | #include "buffer.h" |
22 | #include "xmalloc.h" | 22 | #include "xmalloc.h" |
@@ -27,7 +27,8 @@ RCSID("$OpenBSD: sftp.c,v 1.42 2004/02/17 05:39:51 djm Exp $"); | |||
27 | #include "sftp.h" | 27 | #include "sftp.h" |
28 | #include "sftp-common.h" | 28 | #include "sftp-common.h" |
29 | #include "sftp-client.h" | 29 | #include "sftp-client.h" |
30 | #include "sftp-int.h" | 30 | |
31 | int interactive_loop(int, int, char *, char *); /* sftp-int.c */ | ||
31 | 32 | ||
32 | #ifdef HAVE___PROGNAME | 33 | #ifdef HAVE___PROGNAME |
33 | extern char *__progname; | 34 | extern char *__progname; |