# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1251904634 0
# Node ID 281ed8384eb499a1748239854a5c9e2ae562826d
# Parent  fb9a341e4454a8a001c24cfe0d4680d8ed761cce
- Remove options that dbclient won't know about

diff -r fb9a341e4454 -r 281ed8384eb4 scp.c
--- 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)