2 files changed, 10 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 9d9a60541..7b5c68448 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
      very basic regress test against Twisted Conch in "make interop"
      target (conch is available in ports/devel/py-twisted/conch);
      ok markus@
+ - (djm) [regress/Makefile] search for conch by path, like we do putty
 
 20080629
  - (djm) OpenBSD CVS Sync
@@ -4479,4 +4480,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.5037 2008/06/29 22:07:56 djm Exp $
+$Id: ChangeLog,v 1.5038 2008/06/29 22:12:37 djm Exp $
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 652bd49d3..b54448912 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -70,9 +70,9 @@ SFTPSERVER=/usr/libexec/openssh/sftp-server
 SCP=scp
 
 # Interop testing
-PLINK=/usr/local/bin/plink
-PUTTYGEN=/usr/local/bin/puttygen
-CONCH=/usr/local/bin/conch
+PLINK=plink
+PUTTYGEN=puttygen
+CONCH=conch
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
         SSH="${TEST_SSH_SSH}"
@@ -116,7 +116,11 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
         esac
 fi
 if [ "x$TEST_SSH_CONCH" != "x" ]; then
-        CONCH="${TEST_SSH_CONCH}"
+        # Find real binary, if it exists
+        case "${TEST_SSH_CONCH}" in
+        /*) CONCH="${TEST_SSH_CONCH}" ;;
+        *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
+        esac
 fi
 
 # Path to sshd must be absolute for rexec