summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-11-17 11:19:05 +0100
committerDamien Miller <djm@mindrot.org>2003-11-17 11:19:05 +0100
commitc1f2792bd056dcefef5de55c5cbfdb1f790fd339 (patch)
tree80a2b14594fa4f33a171d69028c922103431f805
parent - jakob@cvs.openbsd.org 2003/11/10 16:23:41 (diff)
downloadopenssh-c1f2792bd056dcefef5de55c5cbfdb1f790fd339.tar.xz
openssh-c1f2792bd056dcefef5de55c5cbfdb1f790fd339.zip
- 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@
-rw-r--r--ChangeLog5
-rw-r--r--scp.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d1b0f6421..40a393109 100644
--- 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
@@ -1448,4 +1451,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
-$Id: ChangeLog,v 1.3104 2003/11/17 10:18:23 djm Exp $
+$Id: ChangeLog,v 1.3105 2003/11/17 10:19:05 djm Exp $
diff --git a/scp.c b/scp.c
index 364ab2860..36cf1b442 100644
--- 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;