Mercurial > dropbear

diff scp.c @ 571:281ed8384eb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Remove options that dbclient won't know about
author Matt Johnston <matt@ucc.asn.au>
date Wed, 02 Sep 2009 15:17:14 +0000
parents 910c2da71235
children cf5a167776c3
line wrap: on
line diff
--- a/scp.c	Wed Sep 02 15:05:14 2009 +0000
+++ b/scp.c	Wed Sep 02 15:17:14 2009 +0000
@@ -343,7 +343,7 @@
 			addargs(&args, "-p%s", optarg);
 			break;
 		case 'B':
-			addargs(&args, "-oBatchmode yes");
+			fprintf(stderr, "Note: -B option is disabled in this version of scp");
 			break;
 		case 'l':
 			speed = strtod(optarg, &endp);
@@ -492,9 +492,13 @@
 			addargs(&alist, "%s", ssh_program);
 			if (verbose_mode)
 				addargs(&alist, "-v");
+#if 0
+			// Disabled since dbclient won't understand them
+			// and scp works fine without them.
 			addargs(&alist, "-x");
 			addargs(&alist, "-oClearAllForwardings yes");
 			addargs(&alist, "-n");
+#endif
 
 			*src++ = 0;
 			if (*src == 0)