summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:15:11 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-09 01:15:11 +0000
commit9cc94646138a4fefb6805dd9e03e9e88e7359d3f (patch)
treef5b708c86c91a3d0638703b54c02eaa010418417
parent2a097a454378e9ae496bcfa303029d8a9d7361ce (diff)
- markus@cvs.openbsd.org 2001/06/03 19:38:42
[scp.c] pass -v to ssh; from slade@shore.net
-rw-r--r--ChangeLog5
-rw-r--r--scp.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8703d4f1b..2c28cc6fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,9 @@
27 - markus@cvs.openbsd.org 2001/06/03 19:36:44 27 - markus@cvs.openbsd.org 2001/06/03 19:36:44
28 [ssh-keygen.1] 28 [ssh-keygen.1]
29 1-2 bits of entrophy per character (not per word), ok stevesk@ 29 1-2 bits of entrophy per character (not per word), ok stevesk@
30 - markus@cvs.openbsd.org 2001/06/03 19:38:42
31 [scp.c]
32 pass -v to ssh; from slade@shore.net
30 33
3120010606 3420010606
32 - OpenBSD CVS Sync 35 - OpenBSD CVS Sync
@@ -5538,4 +5541,4 @@
5538 - Wrote replacements for strlcpy and mkdtemp 5541 - Wrote replacements for strlcpy and mkdtemp
5539 - Released 1.0pre1 5542 - Released 1.0pre1
5540 5543
5541$Id: ChangeLog,v 1.1255 2001/06/09 01:13:40 mouring Exp $ 5544$Id: ChangeLog,v 1.1256 2001/06/09 01:15:11 mouring Exp $
diff --git a/scp.c b/scp.c
index 89f05ad96..b18e7323c 100644
--- a/scp.c
+++ b/scp.c
@@ -75,7 +75,7 @@
75 */ 75 */
76 76
77#include "includes.h" 77#include "includes.h"
78RCSID("$OpenBSD: scp.c,v 1.71 2001/05/19 16:05:41 markus Exp $"); 78RCSID("$OpenBSD: scp.c,v 1.72 2001/06/03 19:38:42 markus Exp $");
79 79
80#include "xmalloc.h" 80#include "xmalloc.h"
81#include "atomicio.h" 81#include "atomicio.h"
@@ -265,6 +265,7 @@ main(argc, argv)
265 ssh_program = xstrdup(optarg); 265 ssh_program = xstrdup(optarg);
266 break; 266 break;
267 case 'v': 267 case 'v':
268 addargs(&args, "-v");
268 verbose_mode = 1; 269 verbose_mode = 1;
269 break; 270 break;
270 case 'q': 271 case 'q':