2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 828992558..655c9ece6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -83,6 +83,9 @@
    - deraadt@cvs.openbsd.org 2001/09/05 06:23:07
      [scp.1 sftp.1 ssh.1 ssh-agent.1 sshd.8 ssh-keygen.1 ssh-keyscan.1]
      avoid first person in manual pages
+   - stevesk@cvs.openbsd.org 2001/09/12 18:18:25
+     [scp.c]
+     don't forward agent for non third-party copies; ok markus@
 
 20010815
  - (bal) Fixed stray code in readconf.c that went in by mistake.
@@ -6406,4 +6409,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1509 2001/09/12 18:35:30 mouring Exp $
+$Id: ChangeLog,v 1.1510 2001/09/12 18:45:09 mouring Exp $
diff --git a/scp.c b/scp.c
index 9b0a23f0e..654496847 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.81 2001/08/29 20:44:03 markus Exp $");
+RCSID("$OpenBSD: scp.c,v 1.82 2001/09/12 18:18:25 stevesk Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -237,6 +237,7 @@ main(argc, argv)
         args.list = NULL;
         addargs(&args, "ssh");          /* overwritten with ssh_program */
         addargs(&args, "-x");
+        addargs(&args, "-oForwardAgent no");
         addargs(&args, "-oFallBackToRsh no");
 
         fflag = tflag = 0;