- (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove

leftover debug code.
This commit is contained in:
Darren Tucker 2007-12-02 22:48:40 +11:00
parent 319b3d9b00
commit e566230cb0
2 changed files with 5 additions and 3 deletions

View File

@ -1,6 +1,8 @@
20071202 20071202
- (dtucker) [configure.ac] Enable -fstack-protector-all on systems where - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where
gcc supports it. ok djm@ gcc supports it. ok djm@
- (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove
leftover debug code.
20071030 20071030
- (djm) OpenBSD CVS Sync - (djm) OpenBSD CVS Sync
@ -3418,4 +3420,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4795 2007/12/02 10:02:22 dtucker Exp $ $Id: ChangeLog,v 1.4796 2007/12/02 11:48:40 dtucker Exp $

4
scp.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: scp.c,v 1.160 2007/08/06 19:16:06 sobrado Exp $ */ /* $OpenBSD: scp.c,v 1.161 2007/10/24 03:44:02 djm Exp $ */
/* /*
* scp - secure remote copy. This is basically patched BSD rcp which * scp - secure remote copy. This is basically patched BSD rcp which
* uses ssh to do the data transfer (instead of using rcmd). * uses ssh to do the data transfer (instead of using rcmd).
@ -132,7 +132,7 @@ int verbose_mode = 0;
int showprogress = 1; int showprogress = 1;
/* This is the program to execute for the secured connection. ("ssh" or -S) */ /* This is the program to execute for the secured connection. ("ssh" or -S) */
char *ssh_program = "/home/djm/bin/ssh"; char *ssh_program = _PATH_SSH_PROGRAM;
/* This is used to store the pid of ssh_program */ /* This is used to store the pid of ssh_program */
pid_t do_cmd_pid = -1; pid_t do_cmd_pid = -1;