- (djm) OpenBSD CVS Sync

- djm@cvs.openbsd.org 2004/02/17 07:17:29
     [sftp-glob.c sftp.c]
     Remove useless headers; ok deraadt@
This commit is contained in:
Damien Miller 2004-02-18 14:11:13 +11:00
parent a22897df06
commit d7d46bb606
3 changed files with 12 additions and 5 deletions

View File

@ -1,6 +1,10 @@
20040218 20040218
- (dtucker) [configure.ac] Handle case where krb5-config --libs returns a - (dtucker) [configure.ac] Handle case where krb5-config --libs returns a
path with a "-" in it. From Sergio.Gelato at astro.su.se. 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 20040217
- (djm) Simplify the license on code I have written. No code changes. - (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. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

View File

@ -15,7 +15,7 @@
*/ */
#include "includes.h" #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 "buffer.h"
#include "bufaux.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.h"
#include "sftp-common.h" #include "sftp-common.h"
#include "sftp-client.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 { struct SFTP_OPENDIR {
SFTP_DIRENT **dir; SFTP_DIRENT **dir;

5
sftp.c
View File

@ -16,7 +16,7 @@
#include "includes.h" #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 "buffer.h"
#include "xmalloc.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.h"
#include "sftp-common.h" #include "sftp-common.h"
#include "sftp-client.h" #include "sftp-client.h"
#include "sftp-int.h"
int interactive_loop(int, int, char *, char *); /* sftp-int.c */
#ifdef HAVE___PROGNAME #ifdef HAVE___PROGNAME
extern char *__progname; extern char *__progname;