From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Sat, 22 Oct 2016 11:24:16 +0000 (+0300)
Subject: starttls: search for chat in sbin if it is not present in PATH
X-Git-Tag: gnutls_3_5_6~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7b2680eef635d7f8a16df6ddb863fa4a8e7325d8;p=thirdparty%2Fgnutls.git

starttls: search for chat in sbin if it is not present in PATH

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---

diff --git a/tests/starttls.sh b/tests/starttls.sh
index cc55cf7a26..dd67e27212 100755
--- a/tests/starttls.sh
+++ b/tests/starttls.sh
@@ -37,6 +37,21 @@ if test ! -x /usr/bin/socat;then
 	exit 77
 fi
 
+for file in `which chat` /sbin/chat /ust/sbin/chat /ust/local/sbin/chat
+do
+	if test -x "$file"
+	then
+		CHAT="$file"
+		break
+	fi
+done
+
+if test -z "$CHAT"
+then
+	echo "chat not found"
+	exit 77
+fi
+
 . "${srcdir}/scripts/common.sh"
 
 echo "Checking STARTTLS"
@@ -56,7 +71,7 @@ wait
 echo "Checking STARTTLS over SMTP"
 
 eval "${GETPORT}"
-socat TCP-LISTEN:${PORT} EXEC:"chat -e -S -v -f ${srcdir}/starttls-smtp.txt",pty &
+socat TCP-LISTEN:${PORT} EXEC:"$CHAT -e -S -v -f ${srcdir}/starttls-smtp.txt",pty &
 PID=$!
 wait_server ${PID}
 
@@ -71,7 +86,7 @@ wait
 echo "Checking STARTTLS over FTP"
 
 eval "${GETPORT}"
-socat TCP-LISTEN:${PORT} EXEC:"chat -e -S -v -f ${srcdir}/starttls-ftp.txt",pty &
+socat TCP-LISTEN:${PORT} EXEC:"$CHAT -e -S -v -f ${srcdir}/starttls-ftp.txt",pty &
 PID=$!
 wait_server ${PID}