summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorDamien Miller <djm@cvs.openbsd.org>2001-02-07 22:27:19 +0000
committerDamien Miller <djm@cvs.openbsd.org>2001-02-07 22:27:19 +0000
commitbbfc3bb73825f97856bf29f30ccf007edb39cc46 (patch)
tree3dd91c25e7c0f2184255fe94bca4923fb4d18a3b /usr.bin
parent539a444989e40e98d8ee085a28a3bb08c2d1ceee (diff)
Don't forward agent and X11 in sftp. Suggestion from Roumen Petrov
<roumen.petrov@skalasoft.com>
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/sftp.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.bin/ssh/sftp.c b/usr.bin/ssh/sftp.c
index 3897ca47083..1cc89a6ee8d 100644
--- a/usr.bin/ssh/sftp.c
+++ b/usr.bin/ssh/sftp.c
@@ -24,7 +24,7 @@
#include "includes.h"
-RCSID("$OpenBSD: sftp.c,v 1.5 2001/02/06 23:53:54 djm Exp $");
+RCSID("$OpenBSD: sftp.c,v 1.6 2001/02/07 22:27:18 djm Exp $");
/* XXX: commandline mode */
/* XXX: copy between two remote hosts (commandline) */
@@ -91,11 +91,13 @@ make_ssh_args(char *add_arg)
/* Init args array */
if (args == NULL) {
- nargs = 4;
+ nargs = 6;
i = 0;
args = xmalloc(sizeof(*args) * nargs);
args[i++] = "ssh";
args[i++] = "-oProtocol=2";
+ args[i++] = "-oForwardAgent=no";
+ args[i++] = "-oForwardX11=no";
args[i++] = "-s";
args[i++] = NULL;
}