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

     [sftp.c]
     initialise infile in main, rather than statically - from portable

diff --git a/ChangeLog b/ChangeLog
index d9168f6ae608d57a7c1f66f2872727bf7a928121..dc788f5be6e969894ef466951ba4fbbb7fa2b0d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/sftp.c b/sftp.c
index e288302fa06710607e22b3db4fc67a64062f9bed..0be27887fdde0151f868afb68af7e41995868a25 100644 (file)
--- a/sftp.c
+++ b/sftp.c
@@ -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) {