From 6b8d88fef5bc9e373e13f00c46b8f95df43ce75e Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Tue, 15 Dec 2020 13:57:57 +0100
Subject: [PATCH] Consider last appearing DOMAIN option

---
 .../Protocols/OpenVPN/ConfigurationParser.swift  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift b/TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
index 9396414..730ed42 100644
--- a/TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
+++ b/TunnelKit/Sources/Protocols/OpenVPN/ConfigurationParser.swift
@@ -531,15 +531,10 @@ extension OpenVPN {
                     optDNSServers?.append($0[1])
                 }
                 Regex.domain.enumerateArguments(in: line) {
-                    guard $0.count == 2, optDomain == nil else {
+                    guard $0.count == 2 else {
                         return
                     }
                     optDomain = $0[1]
-                    if optSearchDomains == nil {
-                        optSearchDomains = [optDomain!]
-                    } else {
-                        optSearchDomains?.insert(optDomain!, at: 0)
-                    }
                 }
                 Regex.domainSearch.enumerateArguments(in: line) {
                     guard $0.count == 2 else {
@@ -763,6 +758,15 @@ extension OpenVPN {
                 )
             }
             
+            // prepend search domains with main domain (if set)
+            if let domain = optDomain {
+                if optSearchDomains == nil {
+                    optSearchDomains = [domain]
+                } else {
+                    optSearchDomains?.insert(domain, at: 0)
+                }
+            }
+
             sessionBuilder.dnsServers = optDNSServers
             sessionBuilder.searchDomains = optSearchDomains
             sessionBuilder.httpProxy = optHTTPProxy