- dtucker@cvs.openbsd.org 2003/11/12 10:12:15

     [scp.c]
     When called with -q, pass -q to ssh; suppresses SSH2 banner.  ok markus@

diff --git a/ChangeLog b/ChangeLog
index 3b2d12bf13a01e95d949cf8a8cbedbd2725cf4c8..4a7f64c6c303f004b93a3745493fb84e9b174285 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,9 @@
      [key.h sftp-common.c sftp-common.h sftp-server.c sshconnect.c sshd.c]
      [ssh-dss.c ssh-rsa.c uuencode.c uuencode.h]
      constify. ok markus@ & djm@
+   - dtucker@cvs.openbsd.org 2003/11/12 10:12:15
+     [scp.c]
+     When called with -q, pass -q to ssh; suppresses SSH2 banner.  ok markus@
 
 20031115
  - (dtucker) [regress/agent-ptrace.sh] Test for GDB output from Solaris and

diff --git a/scp.c b/scp.c
index 364ab2860d53470affd699b65ef873236d6f68e5..36cf1b44285b35c893611ff1b4d13f654d6bdbc6 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -71,7 +71,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: scp.c,v 1.110 2003/10/08 08:27:36 jmc Exp $");
+RCSID("$OpenBSD: scp.c,v 1.111 2003/11/12 10:12:15 dtucker Exp $");
 
 #include "xmalloc.h"
 #include "atomicio.h"
@@ -273,6 +273,7 @@ main(int argc, char **argv)
                        verbose_mode = 1;
                        break;
                case 'q':
+                       addargs(&args, "-q");
                        showprogress = 0;
                        break;