From c35e38c5e9387137a7836fa6aa1a6f9a242387cf Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Wed, 2 Sep 2009 15:17:14 +0000
Subject: [PATCH] - Remove options that dbclient won't know about

--HG--
extra : convert_revision : 2d401308f73352e92d3c662d33920b24fc12bfa1
---
 scp.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scp.c b/scp.c
index da64dd16..48b4017e 100644
--- a/scp.c
+++ b/scp.c
@@ -343,7 +343,7 @@ main(int argc, char **argv)
 			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 @@ toremote(char *targ, int argc, char **argv)
 			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)
-- 
GitLab