Attachment #594 for bug #831

Lines 20-26 Link Here

(-)usr.bin/ssh/scp.1 (-1 / +5 lines)
20	.Sh SYNOPSIS	20	.Sh SYNOPSIS
21	.Nm scp	21	.Nm scp
22	.Bk -words	22	.Bk -words
23	.Op Fl 1246BCpqrv	23	.Op Fl 1246ABCpqrv
24	.Op Fl c Ar cipher	24	.Op Fl c Ar cipher
25	.Op Fl F Ar ssh_config	25	.Op Fl F Ar ssh_config
26	.Op Fl i Ar identity_file	26	.Op Fl i Ar identity_file
Lines 80-85 Link Here
80	to use IPv6 addresses only.	80	to use IPv6 addresses only.
81	.It Fl B	81	.It Fl B
82	Selects batch mode (prevents asking for passwords or passphrases).	82	Selects batch mode (prevents asking for passwords or passphrases).
		83	.It Fl A
		84	Enables
		85	.Xr ssh-agent 1
		86	forwarding (default is disabled).
83	.It Fl C	87	.It Fl C
84	Compression enable.	88	Compression enable.
85	Passes the	89	Passes the

Lines 212-218 Link Here

(-)usr.bin/ssh/scp.c (-3 / +9 lines)
212	int	212	int
213	main(int argc, char **argv)	213	main(int argc, char **argv)
214	{	214	{
215	int ch, fflag, tflag, status;	215	int ch, fflag, tflag, status, aflag = 0;
216	double speed;	216	double speed;
217	char targ, endp;	217	char targ, endp;
218	extern char *optarg;	218	extern char *optarg;
Lines 221-233 Link Here
221	args.list = NULL;	221	args.list = NULL;
222	addargs(&args, "ssh"); /* overwritten with ssh_program */	222	addargs(&args, "ssh"); /* overwritten with ssh_program */
223	addargs(&args, "-x");	223	addargs(&args, "-x");
224	addargs(&args, "-oForwardAgent no");	224	addargs(&args, "-oForwardX11 no");
225	addargs(&args, "-oClearAllForwardings yes");	225	addargs(&args, "-oClearAllForwardings yes");
226		226
227	fflag = tflag = 0;	227	fflag = tflag = 0;
228	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)	228	while ((ch = getopt(argc, argv, "Adfl:prtvBCc:i:P:q1246S:o:F:")) != -1)
229	switch (ch) {	229	switch (ch) {
230	/* User-visible flags. */	230	/* User-visible flags. */
		231	case 'A':
		232	aflag = 1;
		233	break;
231	case '1':	234	case '1':
232	case '2':	235	case '2':
233	case '4':	236	case '4':
Lines 286-291 Link Here
286	default:	289	default:
287	usage();	290	usage();
288	}	291	}
		292
		293	addargs(&args, "-oForwardAgent %s", aflag ? "yes" : "no");
		294
289	argc -= optind;	295	argc -= optind;
290	argv += optind;	296	argv += optind;
291		297

Lines 31-37 Link Here

(-)usr.bin/ssh/sftp.1 (-1 / +5 lines)
31	.Sh SYNOPSIS	31	.Sh SYNOPSIS
32	.Nm sftp	32	.Nm sftp
33	.Bk -words	33	.Bk -words
34	.Op Fl 1Cv	34	.Op Fl 1ACv
35	.Op Fl B Ar buffer_size	35	.Op Fl B Ar buffer_size
36	.Op Fl b Ar batchfile	36	.Op Fl b Ar batchfile
37	.Op Fl F Ar ssh_config	37	.Op Fl F Ar ssh_config
Lines 86-91 Link Here
86	.Bl -tag -width Ds	86	.Bl -tag -width Ds
87	.It Fl 1	87	.It Fl 1
88	Specify the use of protocol version 1.	88	Specify the use of protocol version 1.
		89	.It Fl A
		90	Enables
		91	.Xr ssh-agent 1
		92	forwarding (default is disabled).
89	.It Fl B Ar buffer_size	93	.It Fl B Ar buffer_size
90	Specify the size of the buffer that	94	Specify the size of the buffer that
91	.Nm	95	.Nm




int
main(int argc, char **argv)
{
	int in, out, ch, err, aflag = 0;
	char *host, *userhost, *cp, *file2;
	int debug_level = 0, sshver = 2;
	char *file1 = NULL, *sftp_server = NULL;

	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, "1AChvB:F:P:R:S:b:o:s:")) != -1) {
		switch (ch) {
		case 'A':
			aflag = 1;
			break;
		case 'C':
			addargs(&args, "-C");
			break;

			usage();
		}
	}

	addargs(&args, "-oForwardAgent %s", aflag ? "yes" : "no");

	if (!isatty(STDERR_FILENO))
		showprogress = 0;

Return to bug 831

Lines 1270-1276 Link Here

(-)usr.bin/ssh/sftp.c (-3 / +7 lines)
1270	int	1270	int
1271	main(int argc, char **argv)	1271	main(int argc, char **argv)
1272	{	1272	{
1273	int in, out, ch, err;	1273	int in, out, ch, err, aflag = 0;
1274	char host, userhost, cp, file2;	1274	char host, userhost, cp, file2;
1275	int debug_level = 0, sshver = 2;	1275	int debug_level = 0, sshver = 2;
1276	char file1 = NULL, sftp_server = NULL;	1276	char file1 = NULL, sftp_server = NULL;
Lines 1283-1296 Link Here
1283	args.list = NULL;	1283	args.list = NULL;
1284	addargs(&args, "ssh"); /* overwritten with ssh_program */	1284	addargs(&args, "ssh"); /* overwritten with ssh_program */
1285	addargs(&args, "-oForwardX11 no");	1285	addargs(&args, "-oForwardX11 no");
1286	addargs(&args, "-oForwardAgent no");
1287	addargs(&args, "-oClearAllForwardings yes");	1286	addargs(&args, "-oClearAllForwardings yes");
1288		1287
1289	ll = SYSLOG_LEVEL_INFO;	1288	ll = SYSLOG_LEVEL_INFO;
1290	infile = stdin;	1289	infile = stdin;
1291		1290
1292	while ((ch = getopt(argc, argv, "1hvCo:s:S:b:B:F:P:R:")) != -1) {	1291	while ((ch = getopt(argc, argv, "1AChvB:F:P:R:S:b:o:s:")) != -1) {
1293	switch (ch) {	1292	switch (ch) {
		1293	case 'A':
		1294	aflag = 1;
		1295	break;
1294	case 'C':	1296	case 'C':
1295	addargs(&args, "-C");	1297	addargs(&args, "-C");
1296	break;	1298	break;
Lines 1346-1351 Link Here
1346	usage();	1348	usage();
1347	}	1349	}
1348	}	1350	}
		1351
		1352	addargs(&args, "-oForwardAgent %s", aflag ? "yes" : "no");
1349		1353
1350	if (!isatty(STDERR_FILENO))	1354	if (!isatty(STDERR_FILENO))
1351	showprogress = 0;	1355	showprogress = 0;