From 31ffe4403c277e7c3ae446bb875514f691cab8d8 Mon Sep 17 00:00:00 2001
From: "Robert.Schreib" <robert.schreib@e-mundo.de>
Date: Wed, 21 Apr 2021 12:02:31 +0200
Subject: [PATCH] Check if DNS servers need to be Applied on macOS

---
 osdep/MacDNSHelper.mm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/osdep/MacDNSHelper.mm b/osdep/MacDNSHelper.mm
index c50de7915..89384ba28 100644
--- a/osdep/MacDNSHelper.mm
+++ b/osdep/MacDNSHelper.mm
@@ -39,18 +39,22 @@ void MacDNSHelper::setDNS(uint64_t nwid, const char *domain, const std::vector<I
     sprintf(buf, "State:/Network/Service/%.16llx/DNS", nwid);
     CFStringRef key = CFStringCreateWithCString(NULL, buf, kCFStringEncodingUTF8);
     CFArrayRef list = SCDynamicStoreCopyKeyList(ds, key);
-
     CFIndex i = 0, j = CFArrayGetCount(list);
-    bool ret = TRUE;
-    if (j <= 0) {
-        ret &= SCDynamicStoreAddValue(ds, key, dict);
-    } else {
-        ret &= SCDynamicStoreSetValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i), dict);
-    }
-    if (!ret) {
-        fprintf(stderr, "Error writing DNS configuration\n");
+
+    CFPropertyListRef oldDNSServers = SCDynamicStoreCopyValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i));
+    if (!CFEqual(oldDNSServers,dict)) {
+        bool ret = TRUE;
+        if (j <= 0) {
+            ret &= SCDynamicStoreAddValue(ds, key, dict);
+        } else {
+            ret &= SCDynamicStoreSetValue(ds, (CFStringRef)CFArrayGetValueAtIndex(list, i), dict);
+        }
+        if (!ret) {
+            fprintf(stderr, "Error writing DNS configuration\n");
+        }
     }
 
+    CFRelease(oldDNSServers);
     CFRelease(list);
     CFRelease(key);
     CFRelease(dict);