From 5f79544e599e0105aafe1721f6fcfaec8777e7fc Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Wed, 13 Mar 2019 21:35:15 +0100
Subject: [PATCH] IPsec Mobile Client: Split DNS, INTERNAL_DNS_DOMAIN, closes
 https://github.com/opnsense/core/issues/3325

---
 src/etc/inc/plugins.inc.d/ipsec.inc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc
index 091705509..bc45ff749 100644
--- a/src/etc/inc/plugins.inc.d/ipsec.inc
+++ b/src/etc/inc/plugins.inc.d/ipsec.inc
@@ -936,12 +936,16 @@ function ipsec_configure_do($verbose = false, $interface = '')
             if (!empty($a_client['dns_domain'])) {
                 $strongswanTree['charon']['plugins']['attr']['# Search domain and default domain'] = '';
                 $strongswanTree['charon']['plugins']['attr']['28674'] = $a_client['dns_domain'];
-
-                if (empty($a_client['dns_split'])) {
-                    $strongswanTree['charon']['plugins']['attr']['28675'] = $a_client['dns_domain'];
+            }
+            # 28675 --> UNITY_SPLITDNS_NAME
+            # 25 --> INTERNAL_DNS_DOMAIN
+            foreach (array("28675", "25") as $attr) {
+                if (!empty($a_client['dns_split'])) {
+                    $strongswanTree['charon']['plugins']['attr'][$attr] = $a_client['dns_split'];
+                } elseif (!empty($a_client['dns_domain'])) {
+                    $strongswanTree['charon']['plugins']['attr'][$attr] = $a_client['dns_domain'];
                 }
             }
-
             if (!empty($a_client['dns_split'])) {
                 $strongswanTree['charon']['plugins']['attr']['28675'] = $a_client['dns_split'];
             }