From 4b565fdadcd16502b52ebf3d964771296640875e Mon Sep 17 00:00:00 2001 From: dtucker Date: Sun, 2 Dec 2007 11:48:40 +0000 Subject: [PATCH] - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove leftover debug code. --- ChangeLog | 2 ++ scp.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b9b6ffc6..5bcdce36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 20071202 - (dtucker) [configure.ac] Enable -fstack-protector-all on systems where gcc supports it. ok djm@ + - (dtucker) [scp.c] Update $OpenBSD tag missing from rev 1.175 and remove + leftover debug code. 20071030 - (djm) OpenBSD CVS Sync diff --git a/scp.c b/scp.c index fb17f287..8febe12a 100644 --- a/scp.c +++ b/scp.c @@ -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 * uses ssh to do the data transfer (instead of using rcmd). @@ -132,7 +132,7 @@ int verbose_mode = 0; int showprogress = 1; /* 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 */ pid_t do_cmd_pid = -1; -- 2.45.2