openvpn: revert a change and fix deprecated option

PR: https://forum.opnsense.org/index.php?topic=6843.0 PR: #1996
opnsense · Jan 12, 2018 · 0ec330d · 0ec330d
1 parent 607bec1
commit 0ec330d
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc
@@ -615,7 +615,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
                         $conf .= "server-ipv6 {$ipv6}/{$prefix}\n";
                     }
                 }
-                break;
+                /* XXX FALLTHROUGH */
             case 'p2p_shared_key':
                 if (!empty($ip) && !empty($mask)) {
                     list($ip1, $ip2) = openvpn_get_interface_ip($ip, $mask);
@@ -668,8 +668,9 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
         // configure user auth modes
         switch ($settings['mode']) {
             case 'server_user':
+                /* XXX DEPRECATED, use: verify-client-cert none|optional */
                 $conf .= "client-cert-not-required\n";
-                break;
+                /* FALLTHROUGH */
             case 'server_tls_user':
                 /* username-as-common-name is not compatible with server-bridge */
                 if (stristr($conf, "server-bridge") === false && empty($settings['use-common-name'])) {
@@ -740,7 +741,7 @@ function openvpn_reconfigure($mode, $settings, $device_only = false)
         switch ($settings['mode']) {
             case 'p2p_tls':
                 $conf .= "tls-client\n";
-                break;
+                /* XXX FALLTHROUGH */
             case 'shared_key':
                 $conf .= "client\n";
                 break;