OpenVPN - regression in dc6215633a adding "client-config-dir" when server directive isn't set on a /30 tunnel.

This commit is contained in:
Ad Schellevis 2021-08-05 09:55:24 +02:00
parent 5c9341820d
commit 98ac4f4d77

View File

@ -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':