From cf7b0e53650dd540ba41b64eed9611eda8e2e31c Mon Sep 17 00:00:00 2001
From: Ivan Ilves <ivan.ilves@schibsted.com>
Date: Mon, 20 Feb 2017 11:44:43 +0100
Subject: [PATCH] Set Mac DNS. ALWAYS

---
 scripts/darwin/client-update-macosx-dns.sh | 15 ++++-----------
 xiringuito                                 |  2 +-
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/scripts/darwin/client-update-macosx-dns.sh b/scripts/darwin/client-update-macosx-dns.sh
index 090a248..000cc1c 100755
--- a/scripts/darwin/client-update-macosx-dns.sh
+++ b/scripts/darwin/client-update-macosx-dns.sh
@@ -2,14 +2,7 @@
 #
 # Update MacOSX DNS
 #
-if [[ ${#} != 1 ]]; then
-  echo "Usage: ${0} LOCAL_TUNNEL_ID"
-  exit 1
-fi
-
-if [[ -f /tmp/xiringuito.dns.${1} ]]; then
-  NETWORK_SERVICE="$($(dirname ${0})/get-network-service-name.sh)"
-  DNS_SERVERS=$(grep nameserver /etc/resolv.conf | awk '{print $2}' | tr '\n' ' ')
-  echo "* Setting DNS for \"${NETWORK_SERVICE}\": ${DNS_SERVERS}"
-  sudo networksetup -setdnsservers "${NETWORK_SERVICE}" ${DNS_SERVERS}
-fi
+NETWORK_SERVICE="$($(dirname ${0})/get-network-service-name.sh)"
+DNS_SERVERS=$(grep nameserver /etc/resolv.conf | awk '{print $2}' | tr '\n' ' ')
+echo "* Setting DNS for \"${NETWORK_SERVICE}\": ${DNS_SERVERS}"
+sudo networksetup -setdnsservers "${NETWORK_SERVICE}" ${DNS_SERVERS}
diff --git a/xiringuito b/xiringuito
index f932bcd..cb15c44 100755
--- a/xiringuito
+++ b/xiringuito
@@ -114,7 +114,7 @@ if [[ ! ${NO_DNS} && ! -z "${NETWORKS}" ]]; then
     echo "${REMOTE_RESOLV_CONF}" | ./scripts/client-update-resolv-conf.sh
 
     if [[ ${KERNEL} == darwin ]]; then
-      ./scripts/${KERNEL}/client-update-macosx-dns.sh ${LOCAL_TUNNEL_ID}
+      ./scripts/${KERNEL}/client-update-macosx-dns.sh
     fi
   fi
 fi