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

   leftover debug code.

diff --git a/ChangeLog b/ChangeLog
index b9b6ffc6b245c97d4867690f9fdf5358a3c93f3f..5bcdce365718ba95015b00508a9129414afd8881 100644 (file)
--- 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 fb17f287997c14bfc010aae3d425d6d8d6c6f919..8febe12a1e801130bce59faad55c78df52ce30fb 100644 (file)
--- 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;