Merge pull request #19372 from cotequeiroz/libgd

[feed/packages.git] / net / vpnc-scripts / files / vpnc-script

diff --git a/net/vpnc-scripts/files/vpnc-script b/net/vpnc-scripts/files/vpnc-script
index 7af5074d98636f85d7024403961773f39d94c840..772c4a45a1ba14b6ebae96de6a11ad551a2f8a02 100755 (executable)
--- a/net/vpnc-scripts/files/vpnc-script
+++ b/net/vpnc-scripts/files/vpnc-script
@@ -91,12 +91,12 @@ do_connect() {
                                continue
                        fi
                        if [ -n "$INTERNAL_IP4_DNS" ];then
-                               for dns in "$INTERNAL_IP4_DNS";do
+                               for dns in $INTERNAL_IP4_DNS;do
                                        echo "server=/$i/$dns" >> $DNSMASQ_FILE
                                done
                        fi
                        if [ -n "$INTERNAL_IP6_DNS" ];then
-                               for dns in "$INTERNAL_IP6_DNS";do
+                               for dns in $INTERNAL_IP6_DNS;do
                                        echo "server=/$i/$dns" >> $DNSMASQ_FILE
                                done
                        fi
@@ -105,23 +105,23 @@ do_connect() {
                /etc/init.d/dnsmasq restart
        else
                if [ -n "$INTERNAL_IP4_DNS" ];then
-                       for dns in "$INTERNAL_IP4_DNS";do
+                       for dns in $INTERNAL_IP4_DNS;do
                                proto_add_dns_server "$dns"
                        done
                fi
                if [ -n "$INTERNAL_IP6_DNS" ];then
-                       for dns in "$INTERNAL_IP6_DNS";do
+                       for dns in $INTERNAL_IP6_DNS;do
                                proto_add_dns_server "$dns"
                        done
                fi
                if [ -n "$CISCO_DEF_DOMAIN" ] && [ "$CISCO_DEF_DOMAIN" != "$LOCAL_DOMAIN" ];then
                        if [ -n "$INTERNAL_IP4_DNS" ];then
-                               for dns in "$INTERNAL_IP4_DNS";do
+                               for dns in $INTERNAL_IP4_DNS;do
                                        echo "server=/$CISCO_DEF_DOMAIN/$dns" >> $DNSMASQ_FILE
                                done
                        fi
                        if [ -n "$INTERNAL_IP6_DNS" ];then
-                               for dns in "$INTERNAL_IP6_DNS";do
+                               for dns in $INTERNAL_IP6_DNS;do
                                        echo "server=/$CISCO_DEF_DOMAIN/$dns" >> $DNSMASQ_FILE
                                done
                        fi
@@ -164,7 +164,11 @@ do_connect() {
 }
 
 do_disconnect() {
-       rm -f "/tmp/dnsmasq.d/openconnect.$TUNDEV"
+       if [ -f "/tmp/dnsmasq.d/openconnect.$TUNDEV" ]; then
+               rm -f "/tmp/dnsmasq.d/openconnect.$TUNDEV"
+               /etc/init.d/dnsmasq restart
+       fi
+
        proto_init_update "$TUNDEV" 0
        proto_send_update "$INTERFACE"
 }
@@ -210,6 +214,9 @@ case "$reason" in
        reconnect)
                run_hooks reconnect
                ;;
+       attempt-reconnect)
+               run_hooks attempt-reconnect
+               ;;
        *)
                logger -t openconnect "unknown reason '$reason'. Maybe vpnc-script is out of date" 1>&2
                exit 1