travelmate: update 2.1.2-6

[feed/packages.git] / net / travelmate / files / travelmate.sh

diff --git a/net/travelmate/files/travelmate.sh b/net/travelmate/files/travelmate.sh
index 35a12c3305f037436334a4c0f87d2e14f2eb3451..39660dd81bf4c1e59f1a5198154da8b8e4c8f02d 100755 (executable)
--- a/net/travelmate/files/travelmate.sh
+++ b/net/travelmate/files/travelmate.sh
@@ -14,7 +14,7 @@ trm_debug="0"
 trm_iface=""
 trm_captive="1"
 trm_proactive="1"
-trm_vpn="1"
+trm_vpn="0"
 trm_netcheck="0"
 trm_autoadd="0"
 trm_randomize="0"
@@ -233,9 +233,11 @@ f_vpn() {
                                        f_log "info" "take down openvpn instance '${vpn_instance}' (switch)"
                                        rc="1"
                                fi
-                               [ "${rc}" = "1" ] && break
+                               if [ "${rc}" = "1" ]; then
+                                       rm -f "${trm_vpnfile}"
+                                       break
+                               fi
                        done
-                       rm -f "${trm_vpnfile}"
                fi
                if [ -x "${trm_vpnpgm}" ] && [ -n "${vpn_service}" ] && [ -n "${vpn_iface}" ]; then
                        if { [ "${vpn_action}" = "disable" ] && [ -f "${trm_vpnfile}" ]; } ||