From 7b2680eef635d7f8a16df6ddb863fa4a8e7325d8 Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Sat, 22 Oct 2016 14:24:16 +0300 Subject: starttls: search for chat in sbin if it is not present in PATH Signed-off-by: Dmitry Eremin-Solenikov --- tests/starttls.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) 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} -- cgit v1.2.1