From: Samuli Seppänen <samuli@openvpn.net>
Date: Wed, 9 Nov 2016 12:42:05 +0000 (+0200)
Subject: Fix a logic problem in handling of --up scripts in t_client.sh
X-Git-Tag: v2.4_beta1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd9a4f0ecf06e907c57f4fa7ab035b897268d54a;p=thirdparty%2Fopenvpn.git

Fix a logic problem in handling of --up scripts in t_client.sh

Previously the $up variable was never reset after being set. This mean that
"--up update_t_client_ips.sh" was appended to all subsequent openvpn
command-lines, even if cached IPs existed.

Signed-off-by: Samuli Seppänen <samuli@openvpn.net>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1478695325-18038-1-git-send-email-samuli@openvpn.net>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg12979.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/tests/t_client.sh.in b/tests/t_client.sh.in
index 076f6bd86..b92cb65de 100755
--- a/tests/t_client.sh.in
+++ b/tests/t_client.sh.in
@@ -276,6 +276,8 @@ do
     # script to generate them dynamically.
     if [ -z "$expect_ifconfig4" ] || [ -z "$expect_ifconfig6" ]; then
         up="--setenv TESTNUM $SUF --setenv TOP_BUILDDIR ${top_builddir} --script-security 2 --up ${srcdir}/update_t_client_ips.sh"
+    else
+        up=""
     fi
 
     echo -e "\n### test run $SUF: '$test_run_title' ###\n"