Attachment #1359 for bug #1368

View | Details | Raw Unified | Return to bug 1368
Collapse All | Expand All

Lines 28-33 Link Here

(-)openssh/scp.1 (+8 lines)
28	.Op Fl o Ar ssh_option	28	.Op Fl o Ar ssh_option
29	.Op Fl P Ar port	29	.Op Fl P Ar port
30	.Op Fl S Ar program	30	.Op Fl S Ar program
		31	.Op Fl R Ar program
31	.Sm off	32	.Sm off
32	.Oo	33	.Oo
33	.Op Ar user No @	34	.Op Ar user No @
Lines 188-193 Link Here
188	The program must understand	189	The program must understand
189	.Xr ssh 1	190	.Xr ssh 1
190	options.	191	options.
		192	.It Fl R Ar program
		193	Name of the
		194	.Nm
		195	.Ar program
		196	to run on the remote server.
		197	Defaults to
		198	.Sq scp .
191	.It Fl v	199	.It Fl v
192	Verbose mode.	200	Verbose mode.
193	Causes	201	Causes

Lines 131-136 Link Here

(-)openssh/scp.c (-2 / +9 lines)
131	/* This is the program to execute for the secured connection. ("ssh" or -S) */	131	/* This is the program to execute for the secured connection. ("ssh" or -S) */
132	char *ssh_program = _PATH_SSH_PROGRAM;	132	char *ssh_program = _PATH_SSH_PROGRAM;
133		133
		134	/* This is the remote name of the scp program ("scp" or -R) */
		135	char *scp_program = "scp";
		136
134	/* This is used to store the pid of ssh_program */	137	/* This is used to store the pid of ssh_program */
135	pid_t do_cmd_pid = -1;	138	pid_t do_cmd_pid = -1;
136		139
Lines 313-319 Link Here
313	addargs(&args, "-oClearAllForwardings yes");	316	addargs(&args, "-oClearAllForwardings yes");
314		317
315	fflag = tflag = 0;	318	fflag = tflag = 0;
316	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:")) != -1)	319	while ((ch = getopt(argc, argv, "dfl:prtvBCc:i:P:q1246S:o:F:R:")) != -1)
317	switch (ch) {	320	switch (ch) {
318	/* User-visible flags. */	321	/* User-visible flags. */
319	case '1':	322	case '1':
Lines 347-352 Link Here
347	case 'r':	350	case 'r':
348	iamrecursive = 1;	351	iamrecursive = 1;
349	break;	352	break;
		353	case 'R':
		354	scp_program = xstrdup(optarg);
		355	break;
350	case 'S':	356	case 'S':
351	ssh_program = xstrdup(optarg);	357	ssh_program = xstrdup(optarg);
352	break;	358	break;
Lines 408-414 Link Here
408	remin = remout = -1;	414	remin = remout = -1;
409	do_cmd_pid = -1;	415	do_cmd_pid = -1;
410	/* Command to be executed on remote system using "ssh". */	416	/* Command to be executed on remote system using "ssh". */
411	(void) snprintf(cmd, sizeof cmd, "scp%s%s%s%s",	417	(void) snprintf(cmd, sizeof cmd, "%s%s%s%s%s",
		418	scp_program,
412	verbose_mode ? " -v" : "",	419	verbose_mode ? " -v" : "",
413	iamrecursive ? " -r" : "", pflag ? " -p" : "",	420	iamrecursive ? " -r" : "", pflag ? " -p" : "",
414	targetshouldbedirectory ? " -d" : "");	421	targetshouldbedirectory ? " -d" : "");

Lines 94-100 Link Here

(-)openssh/regress/test-exec.sh (-1 / +2 lines)
94	SFTPSERVER="${TEST_SSH_SFTPSERVER}"	94	SFTPSERVER="${TEST_SSH_SFTPSERVER}"
95	fi	95	fi
96	if [ "x$TEST_SSH_SCP" != "x" ]; then	96	if [ "x$TEST_SSH_SCP" != "x" ]; then
97	SCP="${TEST_SSH_SCP}"	97	SCP="${TEST_SSH_SCP} -R ${TEST_SSH_SCP}"
		98
98	fi	99	fi
99		100
100	# Path to sshd must be absolute for rexec	101	# Path to sshd must be absolute for rexec

Return to bug 1368

Lines 392-397 Link Here

(-)openssh/Makefile.in (+2 lines)
392	TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \	392	TEST_SSH_SSHKEYGEN="$${BUILDDIR}/ssh-keygen"; \
393	TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \	393	TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
394	TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \	394	TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
		395	TEST_SSH_SCP="$${BUILDDIR}/scp"; \
395	TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \	396	TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
396	cd $(srcdir)/regress \|\| exit $$?; \	397	cd $(srcdir)/regress \|\| exit $$?; \
397	$(MAKE) \	398	$(MAKE) \
Lines 408-413 Link Here
408	TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \	409	TEST_SSH_SSHKEYGEN="$${TEST_SSH_SSHKEYGEN}" \
409	TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \	410	TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
410	TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \	411	TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
		412	TEST_SSH_SCP="$${TEST_SSH_SCP}" \
411	TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \	413	TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
412	EXEEXT="$(EXEEXT)" \	414	EXEEXT="$(EXEEXT)" \
413	$@	415	$@