vpnc-script: create dnsmasq entries for connections where default domain is set

Relates to #1975

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>

diff --git a/net/vpnc-scripts/Makefile b/net/vpnc-scripts/Makefile
index 3af3695ae83fb97af8bbf133e8c767a5821489a7..350afec93b3a3f3dc64bedd5c2a7cccbb7debfc4 100644 (file)
--- a/net/vpnc-scripts/Makefile
+++ b/net/vpnc-scripts/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vpnc-scripts
 PKG_VERSION:=20150116
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/net/vpnc-scripts/files/vpnc-script b/net/vpnc-scripts/files/vpnc-script
index 48c8ed04bb9a9314c37567d8c46754f9a96b736d..7660d9c6d6c24bd8109657c730da847593316364 100755 (executable)
--- a/net/vpnc-scripts/files/vpnc-script
+++ b/net/vpnc-scripts/files/vpnc-script
@@ -81,10 +81,10 @@ do_connect() {
                [[ "$addr" != "$mask" ]] && proto_add_ipv6_address "$addr" "$mask"
        fi
 
+       DNSMASQ_FILE="/tmp/dnsmasq.d/openconnect.$TUNDEV"
+       rm -f $DNSMASQ_FILE
        if [ -n "$CISCO_SPLIT_DNS" ] && [ -d "/tmp/dnsmasq.d/" ];then
                SDNS=`echo $CISCO_SPLIT_DNS|sed 's/,/\n/g'`
-               DNSMASQ_FILE="/tmp/dnsmasq.d/openconnect.$TUNDEV"
-               rm -f $DNSMASQ_FILE
                echo "$SDNS" | while read i; do
                        if [ -n "$INTERNAL_IP4_DNS" ];then
                                for dns in "$INTERNAL_IP4_DNS";do
@@ -110,7 +110,19 @@ do_connect() {
                                proto_add_dns_server "$dns"
                        done
                fi
-               [ -n "$CISCO_DEF_DOMAIN" ] && proto_add_dns_search "$CISCO_DEF_DOMAIN"
+               if [ -n "$CISCO_DEF_DOMAIN" ];then
+                       if [ -n "$INTERNAL_IP4_DNS" ];then
+                               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
+                                       echo "server=/$CISCO_DEF_DOMAIN/$dns" >> $DNSMASQ_FILE
+                               done
+                       fi
+                       proto_add_dns_search "$CISCO_DEF_DOMAIN"
+               fi
        fi
 
        if [ -n "$CISCO_SPLIT_INC" ]; then