Attachment #3437 for bug #831

Lines 18-24 Link Here

(-)a/scp.1 (-1 / +6 lines)
18	.Nd OpenSSH secure file copy	18	.Nd OpenSSH secure file copy
19	.Sh SYNOPSIS	19	.Sh SYNOPSIS
20	.Nm scp	20	.Nm scp
21	.Op Fl 346BCpqrTv	21	.Op Fl 346ABCpqrTv
22	.Op Fl c Ar cipher	22	.Op Fl c Ar cipher
23	.Op Fl F Ar ssh_config	23	.Op Fl F Ar ssh_config
24	.Op Fl i Ar identity_file	24	.Op Fl i Ar identity_file
Lines 86-91 to use IPv4 addresses only. Link Here
86	Forces	86	Forces
87	.Nm	87	.Nm
88	to use IPv6 addresses only.	88	to use IPv6 addresses only.
		89	.It Fl A
		90	Allows forwarding of
		91	.Xr ssh-agent 1
		92	to the remote system.
		93	The default is not to forward an authentication agent.
89	.It Fl B	94	.It Fl B
90	Selects batch mode (prevents asking for passwords or passphrases).	95	Selects batch mode (prevents asking for passwords or passphrases).
91	.It Fl C	96	.It Fl C




	args.list = remote_remote_args.list = NULL;
	addargs(&args, "%s", ssh_program);
	addargs(&args, "-x");
	addargs(&args, "-oForwardAgent=no");
	addargs(&args, "-oPermitLocalCommand=no");
	addargs(&args, "-oClearAllForwardings=yes");
	addargs(&args, "-oRemoteCommand=none");


	fflag = Tflag = tflag = 0;
	while ((ch = getopt(argc, argv,
	    "12346ABCTdfpqrtvF:J:P:S:c:i:l:o:")) != -1) {
		switch (ch) {
		/* User-visible flags. */
		case '1':

		case '2':
			/* Ignored */
			break;
		case 'A':
		case '4':
		case '6':
		case 'C':

	argc -= optind;
	argv += optind;

	/* Do this last because we want the user to be able to override it */
	addargs(&args, "-oForwardAgent=no");

	if ((pwd = getpwuid(userid = getuid())) == NULL)
		fatal("unknown user %u", (u_int) userid);


usage(void)
{
	(void) fprintf(stderr,
	    "usage: scp [-346ABCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
	    "            [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
	    "            [-S program] source ... target\n");
	exit(1);

Lines 30-36 Link Here

(-)a/sftp.1 (-1 / +6 lines)
30	.Nd OpenSSH secure file transfer	30	.Nd OpenSSH secure file transfer
31	.Sh SYNOPSIS	31	.Sh SYNOPSIS
32	.Nm sftp	32	.Nm sftp
33	.Op Fl 46aCfNpqrv	33	.Op Fl 46AaCfNpqrv
34	.Op Fl B Ar buffer_size	34	.Op Fl B Ar buffer_size
35	.Op Fl b Ar batchfile	35	.Op Fl b Ar batchfile
36	.Op Fl c Ar cipher	36	.Op Fl c Ar cipher
Lines 104-109 to use IPv4 addresses only. Link Here
104	Forces	104	Forces
105	.Nm	105	.Nm
106	to use IPv6 addresses only.	106	to use IPv6 addresses only.
		107	.It Fl A
		108	Allows forwarding of
		109	.Xr ssh-agent 1
		110	to the remote system.
		111	The default is not to forward an authentication agent.
107	.It Fl a	112	.It Fl a
108	Attempt to continue interrupted transfers rather than overwriting	113	Attempt to continue interrupted transfers rather than overwriting
109	existing partial or complete copies of files.	114	existing partial or complete copies of files.




	extern char *__progname;

	fprintf(stderr,
	    "usage: %s [-46AaCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
	    "          [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
	    "          [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
	    "          [-R num_requests] [-S program] [-s subsystem | sftp_server]\n"

	args.list = NULL;
	addargs(&args, "%s", ssh_program);
	addargs(&args, "-oForwardX11 no");
	addargs(&args, "-oForwardAgent no");
	addargs(&args, "-oPermitLocalCommand no");
	addargs(&args, "-oClearAllForwardings yes");


	infile = stdin;

	while ((ch = getopt(argc, argv,
	    "1246AafhNpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
		switch (ch) {
		/* Passed through to ssh(1) */
		case 'A':
		case '4':
		case '6':
		case 'C':

		}
	}

	/* Do this last because we want the user to be able to override it */
	addargs(&args, "-oForwardAgent no");

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


Return to bug 831

Lines 401-407 main(int argc, char **argv) Link Here

(-)a/scp.c (-3 / +6 lines)
401	args.list = remote_remote_args.list = NULL;	401	args.list = remote_remote_args.list = NULL;
402	addargs(&args, "%s", ssh_program);	402	addargs(&args, "%s", ssh_program);
403	addargs(&args, "-x");	403	addargs(&args, "-x");
404	addargs(&args, "-oForwardAgent=no");
405	addargs(&args, "-oPermitLocalCommand=no");	404	addargs(&args, "-oPermitLocalCommand=no");
406	addargs(&args, "-oClearAllForwardings=yes");	405	addargs(&args, "-oClearAllForwardings=yes");
407	addargs(&args, "-oRemoteCommand=none");	406	addargs(&args, "-oRemoteCommand=none");
Lines 409-415 main(int argc, char **argv) Link Here
409		408
410	fflag = Tflag = tflag = 0;	409	fflag = Tflag = tflag = 0;
411	while ((ch = getopt(argc, argv,	410	while ((ch = getopt(argc, argv,
412	"dfl:prtTvBCc:i:P:q12346S:o:F:J:")) != -1) {	411	"12346ABCTdfpqrtvF:J:P:S:c:i:l:o:")) != -1) {
413	switch (ch) {	412	switch (ch) {
414	/* User-visible flags. */	413	/* User-visible flags. */
415	case '1':	414	case '1':
Lines 418-423 main(int argc, char **argv) Link Here
418	case '2':	417	case '2':
419	/* Ignored */	418	/* Ignored */
420	break;	419	break;
		420	case 'A':
421	case '4':	421	case '4':
422	case '6':	422	case '6':
423	case 'C':	423	case 'C':
Lines 496-501 main(int argc, char **argv) Link Here
496	argc -= optind;	496	argc -= optind;
497	argv += optind;	497	argv += optind;
498		498
		499	/* Do this last because we want the user to be able to override it */
		500	addargs(&args, "-oForwardAgent=no");
		501
499	if ((pwd = getpwuid(userid = getuid())) == NULL)	502	if ((pwd = getpwuid(userid = getuid())) == NULL)
500	fatal("unknown user %u", (u_int) userid);	503	fatal("unknown user %u", (u_int) userid);
501		504
Lines 1558-1564 void Link Here
1558	usage(void)	1561	usage(void)
1559	{	1562	{
1560	(void) fprintf(stderr,	1563	(void) fprintf(stderr,
1561	"usage: scp [-346BCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"	1564	"usage: scp [-346ABCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
1562	" [-J destination] [-l limit] [-o ssh_option] [-P port]\n"	1565	" [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
1563	" [-S program] source ... target\n");	1566	" [-S program] source ... target\n");
1564	exit(1);	1567	exit(1);

Lines 2316-2322 usage(void) Link Here

(-)a/sftp.c (-3 / +6 lines)
2316	extern char *__progname;	2316	extern char *__progname;
2317		2317
2318	fprintf(stderr,	2318	fprintf(stderr,
2319	"usage: %s [-46aCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"	2319	"usage: %s [-46AaCfNpqrv] [-B buffer_size] [-b batchfile] [-c cipher]\n"
2320	" [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"	2320	" [-D sftp_server_path] [-F ssh_config] [-i identity_file]\n"
2321	" [-J destination] [-l limit] [-o ssh_option] [-P port]\n"	2321	" [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
2322	" [-R num_requests] [-S program] [-s subsystem \| sftp_server]\n"	2322	" [-R num_requests] [-S program] [-s subsystem \| sftp_server]\n"
Lines 2351-2357 main(int argc, char **argv) Link Here
2351	args.list = NULL;	2351	args.list = NULL;
2352	addargs(&args, "%s", ssh_program);	2352	addargs(&args, "%s", ssh_program);
2353	addargs(&args, "-oForwardX11 no");	2353	addargs(&args, "-oForwardX11 no");
2354	addargs(&args, "-oForwardAgent no");
2355	addargs(&args, "-oPermitLocalCommand no");	2354	addargs(&args, "-oPermitLocalCommand no");
2356	addargs(&args, "-oClearAllForwardings yes");	2355	addargs(&args, "-oClearAllForwardings yes");
2357		2356
Lines 2359-2367 main(int argc, char **argv) Link Here
2359	infile = stdin;	2358	infile = stdin;
2360		2359
2361	while ((ch = getopt(argc, argv,	2360	while ((ch = getopt(argc, argv,
2362	"1246afhNpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {	2361	"1246AafhNpqrvCc:D:i:l:o:s:S:b:B:F:J:P:R:")) != -1) {
2363	switch (ch) {	2362	switch (ch) {
2364	/* Passed through to ssh(1) */	2363	/* Passed through to ssh(1) */
		2364	case 'A':
2365	case '4':	2365	case '4':
2366	case '6':	2366	case '6':
2367	case 'C':	2367	case 'C':
Lines 2461-2466 main(int argc, char **argv) Link Here
2461	}	2461	}
2462	}	2462	}
2463		2463
		2464	/* Do this last because we want the user to be able to override it */
		2465	addargs(&args, "-oForwardAgent no");
		2466
2464	if (!isatty(STDERR_FILENO))	2467	if (!isatty(STDERR_FILENO))
2465	showprogress = 0;	2468	showprogress = 0;
2466		2469