View | Details | Raw Unified | Return to bug 831 | Differences between
and this patch

Collapse All | Expand All

(-)scp.1 (-1 / +6 lines)
Lines 18-24 Link Here
18
.Nd secure copy (remote file copy program)
18
.Nd secure copy (remote file copy program)
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 83-88 to use IPv4 addresses only. Link Here
83
Forces
83
Forces
84
.Nm
84
.Nm
85
to use IPv6 addresses only.
85
to use IPv6 addresses only.
86
.It Fl A
87
Enables forwarding of the authentication agent connection for copies
88
between two remote hosts.
89
This option is directly passed to
90
.Xr ssh 1 .
86
.It Fl B
91
.It Fl B
87
Selects batch mode (prevents asking for passwords or passphrases).
92
Selects batch mode (prevents asking for passwords or passphrases).
88
.It Fl C
93
.It Fl C
(-)scp.c (-2 / +5 lines)
Lines 404-410 main(int argc, char **argv) Link Here
404
404
405
	fflag = Tflag = tflag = 0;
405
	fflag = Tflag = tflag = 0;
406
	while ((ch = getopt(argc, argv,
406
	while ((ch = getopt(argc, argv,
407
	    "dfl:prtTvBCc:i:P:q12346S:o:F:J:")) != -1) {
407
	    "dfl:prtTvABCc:i:P:q12346S:o:F:J:")) != -1) {
408
		switch (ch) {
408
		switch (ch) {
409
		/* User-visible flags. */
409
		/* User-visible flags. */
410
		case '1':
410
		case '1':
Lines 437-442 main(int argc, char **argv) Link Here
437
			if (sshport <= 0)
437
			if (sshport <= 0)
438
				fatal("bad port \"%s\"\n", optarg);
438
				fatal("bad port \"%s\"\n", optarg);
439
			break;
439
			break;
440
		case 'A':
441
			addargs(&remote_remote_args, "-A");
442
			break;
440
		case 'B':
443
		case 'B':
441
			addargs(&remote_remote_args, "-oBatchmode=yes");
444
			addargs(&remote_remote_args, "-oBatchmode=yes");
442
			addargs(&args, "-oBatchmode=yes");
445
			addargs(&args, "-oBatchmode=yes");
Lines 1566-1572 void Link Here
1566
usage(void)
1569
usage(void)
1567
{
1570
{
1568
	(void) fprintf(stderr,
1571
	(void) fprintf(stderr,
1569
	    "usage: scp [-346BCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
1572
	    "usage: scp [-346ABCpqrTv] [-c cipher] [-F ssh_config] [-i identity_file]\n"
1570
	    "            [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
1573
	    "            [-J destination] [-l limit] [-o ssh_option] [-P port]\n"
1571
	    "            [-S program] source ... target\n");
1574
	    "            [-S program] source ... target\n");
1572
	exit(1);
1575
	exit(1);

Return to bug 831