From 98ac4f4d772f99fae96ef68b047cbe2c1d71c62c Mon Sep 17 00:00:00 2001
From: Ad Schellevis <ad@opnsense.org>
Date: Thu, 5 Aug 2021 09:55:24 +0200
Subject: [PATCH] OpenVPN - regression in
 https://github.com/opnsense/core/commit/dc6215633a73027a0cf7002fca6854c5fb7391ff
 adding "client-config-dir" when server directive isn't set on a /30 tunnel.

---
 src/etc/inc/plugins.inc.d/openvpn.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
index 5fa1e1b39..96dea6d35 100644
--- a/src/etc/inc/plugins.inc.d/openvpn.inc
+++ b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -593,11 +593,12 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
                     //  See ticket #1417
                     if (is_ipaddrv4($ip) && !empty($mask) && $cidr < 30) {
                         $conf .= "server {$ip} {$mask}\n";
+                        $conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";
                     }
                     if (is_ipaddrv6($ipv6) && !empty($prefix)) {
                         $conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
+                        $conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";
                     }
-                    $conf .= "client-config-dir /var/etc/openvpn-csc/" . $vpnid . "\n";
                 }
                 /* XXX FALLTHROUGH */
             case 'p2p_shared_key':