Attachment 594 Details for Bug 831 – Add -A option to scp and sftp

[patch] Add -A option to scp and sftp

ssh-agent-scp-sftp.diff (text/plain), 3.62 KB, created by Damien Miller on 2004-04-05 16:59:14 AEST

(hide)

Description:

Filename:

MIME Type:

Creator: Damien Miller

Created: 2004-04-05 16:59:14 AEST

Size: 3.62 KB

patch

obsolete

>Index: usr.bin/ssh/scp.1
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scp.1,v
>retrieving revision 1.33
>diff -u -r1.33 scp.1
>--- usr.bin/ssh/scp.1	5 Mar 2004 10:53:58 -0000	1.33
>+++ usr.bin/ssh/scp.1	5 Apr 2004 01:54:13 -0000
>@@ -20,7 +20,7 @@
> .Sh SYNOPSIS
> .Nm scp
> .Bk -words
>-.Op Fl 1246BCpqrv
>+.Op Fl 1246ABCpqrv
> .Op Fl c Ar cipher
> .Op Fl F Ar ssh_config
> .Op Fl i Ar identity_file
>@@ -80,6 +80,10 @@
> to use IPv6 addresses only.
> .It Fl B
> Selects batch mode (prevents asking for passwords or passphrases).
>+.It Fl A
>+Enables
>+.Xr ssh-agent 1
>+forwarding (default is disabled).
> .It Fl C
> Compression enable.
> Passes the
>Index: usr.bin/ssh/scp.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/scp.c,v
>retrieving revision 1.114
>diff -u -r1.114 scp.c
>--- usr.bin/ssh/scp.c	1 Apr 2004 12:19:57 -0000	1.114
>+++ usr.bin/ssh/scp.c	5 Apr 2004 01:54:15 -0000
>@@ -212,7 +212,7 @@
> int
> main(int argc, char **argv)
> {
>-	int ch, fflag, tflag, status;
>+	int ch, fflag, tflag, status, aflag = 0;
> 	double speed;
> 	char *targ, *endp;
> 	extern char *optarg;
>@@ -221,13 +221,16 @@
> 	args.list = NULL;
> 	addargs(&args, "ssh");		/* overwritten with ssh_program */
> 	addargs(&args, "-x");
>-	addargs(&args, "-oForwardAgent no");
>+	addargs(&args, "-oForwardX11 no");
> 	addargs(&args, "-oClearAllForwardings yes");
> 
> 	fflag = tflag = 0;
>-	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
>+	while ((ch = getopt(argc, argv, "Adfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
> 		switch (ch) {
> 		/* User-visible flags. */
>+		case 'A':
>+			aflag = 1;
>+			break;
> 		case '1':
> 		case '2':
> 		case '4':
>@@ -286,6 +289,9 @@
> 		default:
> 			usage();
> 		}
>+
>+	addargs(&args, "-oForwardAgent %s", aflag ? "yes" : "no");
>+
> 	argc -= optind;
> 	argv += optind;
> 
>Index: usr.bin/ssh/sftp.1
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sftp.1,v
>retrieving revision 1.52
>diff -u -r1.52 sftp.1
>--- usr.bin/ssh/sftp.1	5 Mar 2004 10:53:58 -0000	1.52
>+++ usr.bin/ssh/sftp.1	5 Apr 2004 01:54:15 -0000
>@@ -31,7 +31,7 @@
> .Sh SYNOPSIS
> .Nm sftp
> .Bk -words
>-.Op Fl 1Cv
>+.Op Fl 1ACv
> .Op Fl B Ar buffer_size
> .Op Fl b Ar batchfile
> .Op Fl F Ar ssh_config
>@@ -86,6 +86,10 @@
> .Bl -tag -width Ds
> .It Fl 1
> Specify the use of protocol version 1.
>+.It Fl A
>+Enables
>+.Xr ssh-agent 1
>+forwarding (default is disabled).
> .It Fl B Ar buffer_size
> Specify the size of the buffer that
> .Nm
>Index: usr.bin/ssh/sftp.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/sftp.c,v
>retrieving revision 1.45
>diff -u -r1.45 sftp.c
>--- usr.bin/ssh/sftp.c	3 Mar 2004 09:31:20 -0000	1.45
>+++ usr.bin/ssh/sftp.c	5 Apr 2004 01:54:17 -0000
>@@ -1270,7 +1270,7 @@
> int
> main(int argc, char **argv)
> {
>-	int in, out, ch, err;
>+	int in, out, ch, err, aflag = 0;
> 	char *host, *userhost, *cp, *file2;
> 	int debug_level = 0, sshver = 2;
> 	char *file1 = NULL, *sftp_server = NULL;
>@@ -1283,14 +1283,16 @@
> 	args.list = NULL;
> 	addargs(&args, "ssh");		/* overwritten with ssh_program */
> 	addargs(&args, "-oForwardX11 no");
>-	addargs(&args, "-oForwardAgent no");
> 	addargs(&args, "-oClearAllForwardings yes");
> 
> 	ll = SYSLOG_LEVEL_INFO;
> 	infile = stdin;
> 
>-	while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {
>+	while ((ch = getopt(argc, argv, "1AChvB:F:P:R:S:b:o:s:")) != -1) {
> 		switch (ch) {
>+		case 'A':
>+			aflag = 1;
>+			break;
> 		case 'C':
> 			addargs(&args, "-C");
> 			break;
>@@ -1346,6 +1348,8 @@
> 			usage();
> 		}
> 	}
>+
>+	addargs(&args, "-oForwardAgent %s", aflag ? "yes" : "no");
> 
> 	if (!isatty(STDERR_FILENO))
> 		showprogress = 0;

Actions: View | Diff

Attachments on bug 831: 594 | 2683 | 3328 | 3437