From 6b6b58e2d05bb2d303babbcf18bfda26c9c2b163 Mon Sep 17 00:00:00 2001
From: Ruben Pollan <meskio@sindominio.net>
Date: Thu, 23 Aug 2018 12:01:57 +0200
Subject: [osx] allow 10.4x.0.1 dns on client.up.sh

- Resolves: #22
---
 osx/client.up.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/osx/client.up.sh b/osx/client.up.sh
index a713c10..095e8a8 100755
--- a/osx/client.up.sh
+++ b/osx/client.up.sh
@@ -329,10 +329,11 @@ sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
 	if [ ${#vDNS[*]} -eq 0 ] ; then
 		readonly FIN_DNS_SA="${CUR_DNS_SA}"
 	else
-		if [ "${MAN_DNS_SA}" != "" ] ; then
-			logMessage "WARNING: Ignoring ServerAddresses '$DYN_DNS_SA' because ServerAddresses was set manually"
-			readonly FIN_DNS_SA="${CUR_DNS_SA}"
-		else
+		# RiseupVPN: let's allow 10.4x.0.1 DNS providers
+		#if [ "${MAN_DNS_SA}" != "" ] ; then
+		#	logMessage "WARNING: Ignoring ServerAddresses '$DYN_DNS_SA' because ServerAddresses was set manually"
+		#	readonly FIN_DNS_SA="${CUR_DNS_SA}"
+		#else
 			case "${OSVER}" in
 				10.4 | 10.5 )
 					# We need to remove duplicate DNS entries, so that our reference list matches MacOSX's
@@ -357,7 +358,7 @@ sed -e 's/^[[:space:]]*[[:digit:]]* : //g' | tr '\n' ' '
 					logMessage "Not aggregating ServerAddresses because running on OS X 10.6 or higher"
 					;;
 			esac
-		fi
+		#fi
 	fi
 
 	# SMB WINSAddresses (FIN_SMB_WA) are aggregated for 10.4 and 10.5
-- 
cgit v1.2.3