diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | scp.c | 4 |
2 files changed, 5 insertions, 3 deletions
@@ -1,6 +1,8 @@ | |||
1 | 20071202 | 1 | 20071202 |
2 | - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where | 2 | - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where |
3 | gcc supports it. ok djm@ | 3 | gcc supports it. ok djm@ |
4 | - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove | ||
5 | leftover debug code. | ||
4 | 6 | ||
5 | 20071030 | 7 | 20071030 |
6 | - (djm) OpenBSD CVS Sync | 8 | - (djm) OpenBSD CVS Sync |
@@ -3418,4 +3420,4 @@ | |||
3418 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3420 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3419 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3421 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3420 | 3422 | ||
3421 | $Id: ChangeLog,v 1.4795 2007/12/02 10:02:22 dtucker Exp $ | 3423 | $Id: ChangeLog,v 1.4796 2007/12/02 11:48:40 dtucker Exp $ |
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: scp.c,v 1.160 2007/08/06 19:16:06 sobrado Exp $ */ | 1 | /* $OpenBSD: scp.c,v 1.161 2007/10/24 03:44:02 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * scp - secure remote copy. This is basically patched BSD rcp which | 3 | * scp - secure remote copy. This is basically patched BSD rcp which |
4 | * uses ssh to do the data transfer (instead of using rcmd). | 4 | * uses ssh to do the data transfer (instead of using rcmd). |
@@ -132,7 +132,7 @@ int verbose_mode = 0; | |||
132 | int showprogress = 1; | 132 | int showprogress = 1; |
133 | 133 | ||
134 | /* This is the program to execute for the secured connection. ("ssh" or -S) */ | 134 | /* This is the program to execute for the secured connection. ("ssh" or -S) */ |
135 | char *ssh_program = "/home/djm/bin/ssh"; | 135 | char *ssh_program = _PATH_SSH_PROGRAM; |
136 | 136 | ||
137 | /* This is used to store the pid of ssh_program */ | 137 | /* This is used to store the pid of ssh_program */ |
138 | pid_t do_cmd_pid = -1; | 138 | pid_t do_cmd_pid = -1; |