From 8476b0241f32ce5ba02797ee1c81a51f747b1995 Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Sun, 29 Jun 2008 22:12:37 +0000
Subject: [PATCH]  - (djm) [regress/Makefile] search for conch by path, like we
 do putty

---
 ChangeLog            |  1 +
 regress/test-exec.sh | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 979c2844..b5aa7ef7 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
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 652bd49d..b5444891 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
-- 
2.45.2