- djm@cvs.openbsd.org 2004/01/21 03:07:59

[sftp.c]
     initialise infile in main, rather than statically - from portable
This commit is contained in:
Damien Miller 2004-01-21 14:11:05 +11:00
parent fb1310eded
commit e4f5a82d6e
2 changed files with 8 additions and 3 deletions

View File

@ -23,6 +23,9 @@
- markus@cvs.openbsd.org 2004/01/19 21:25:15
[auth2-hostbased.c auth2-pubkey.c serverloop.c ssh-keysign.c sshconnect2.c]
fix mem leaks; some fixes from Pete Flugstad; tested dtucker@
- djm@cvs.openbsd.org 2004/01/21 03:07:59
[sftp.c]
initialise infile in main, rather than statically - from portable
20040114
- (dtucker) [auth-pam.c] Have monitor die if PAM authentication thread exits
@ -1692,4 +1695,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.3175 2004/01/21 00:02:50 djm Exp $
$Id: ChangeLog,v 1.3176 2004/01/21 03:11:05 djm Exp $

6
sftp.c
View File

@ -24,7 +24,7 @@
#include "includes.h"
RCSID("$OpenBSD: sftp.c,v 1.39 2004/01/13 09:25:05 djm Exp $");
RCSID("$OpenBSD: sftp.c,v 1.40 2004/01/21 03:07:59 djm Exp $");
#include "buffer.h"
#include "xmalloc.h"
@ -43,7 +43,7 @@ extern char *__progname;
char *__progname;
#endif
FILE* infile = stdin;
FILE* infile;
int batchmode = 0;
size_t copy_buffer_len = 32768;
size_t num_requests = 16;
@ -141,7 +141,9 @@ main(int argc, char **argv)
addargs(&args, "-oForwardX11 no");
addargs(&args, "-oForwardAgent no");
addargs(&args, "-oClearAllForwardings yes");
ll = SYSLOG_LEVEL_INFO;
infile = stdin;
while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {
switch (ch) {