~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix character set problems. Some systems lack the ISO8859 codepages,
[sgt/putty]
/
scp.c
diff --git
a/scp.c
b/scp.c
index
7a8cebd
..
8237f90
100644
(file)
--- a/
scp.c
+++ b/
scp.c
@@
-91,7
+91,7
@@
void logevent(char *string)
{
}
{
}
-void ldisc_send(char *buf, int len)
+void ldisc_send(char *buf, int len
, int interactive
)
{
/*
* This is only here because of the calls to ldisc_send(NULL,
{
/*
* This is only here because of the calls to ldisc_send(NULL,
@@
-375,8
+375,6
@@
int from_backend(int is_stderr, char *data, int datalen)
return 0;
}
return 0;
}
- inbuf_head = 0;
-
/*
* If this is before the real session begins, just return.
*/
/*
* If this is before the real session begins, just return.
*/
@@
-604,6
+602,15
@@
static void do_cmd(char *host, char *user, char *cmd)
cfg.port = portnumber;
/*
cfg.port = portnumber;
/*
+ * Disable scary things which shouldn't be enabled for simple
+ * things like SCP and SFTP: agent forwarding, port forwarding,
+ * X forwarding.
+ */
+ cfg.x11_forward = 0;
+ cfg.agentfwd = 0;
+ cfg.portfwd[0] = cfg.portfwd[1] = '\0';
+
+ /*
* Attempt to start the SFTP subsystem as a first choice,
* falling back to the provided scp command if that fails.
*/
* Attempt to start the SFTP subsystem as a first choice,
* falling back to the provided scp command if that fails.
*/