[NetworkManager-openvpn/th/fix-detect-version] service: assume that we run openvpn 2.4 or newer by default

[Thomas Haller <thaller src gnome org>]

commit 3c47520e999d5301eec69838e11ad4053bef4f20
Author: Thomas Haller <thaller redhat com>
Date:   Mon Jun 7 19:00:45 2021 +0200

    service: assume that we run openvpn 2.4 or newer by default
    
    Our version detection might fail or give the wrong result. So change
    the code to assume (in case of unknown version) that we run version 2.4
    or newer. By now, that should be the common case and we should only assume
    to run 2.3 or older if we successfully detected it.

 src/nm-openvpn-service.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 9b3f52c..8cdbbd4 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -1536,15 +1536,15 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
        case NMOVPN_COMP_DISABLED:
                break;
        case NMOVPN_COMP_LZO:
-               if (openvpn_binary_version == OPENVPN_BINARY_VERSION_2_4_OR_NEWER)
-                       args_add_strv (args, "--compress", "lzo");
-               else
+               if (openvpn_binary_version == OPENVPN_BINARY_VERSION_2_3_OR_OLDER)
                        args_add_strv (args, "--comp-lzo", "yes");
+               else
+                       args_add_strv (args, "--compress", "lzo");
                break;
        case NMOVPN_COMP_LZ4:
        case NMOVPN_COMP_LZ4_V2:
        case NMOVPN_COMP_AUTO:
-               if (openvpn_binary_version != OPENVPN_BINARY_VERSION_2_4_OR_NEWER)
+               if (openvpn_binary_version == OPENVPN_BINARY_VERSION_2_3_OR_OLDER)
                        _LOGW ("\"compress\" option supported only by OpenVPN >= 2.4");
 
                if (comp == NMOVPN_COMP_LZ4)
@@ -1556,7 +1556,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
                break;
        case NMOVPN_COMP_LEGACY_LZO_DISABLED:
        case NMOVPN_COMP_LEGACY_LZO_ADAPTIVE:
-               if (openvpn_binary_version == OPENVPN_BINARY_VERSION_2_4_OR_NEWER)
+               if (openvpn_binary_version != OPENVPN_BINARY_VERSION_2_3_OR_OLDER)
                        _LOGW ("\"comp-lzo\" is deprecated and will be removed in future OpenVPN releases");
 
                args_add_strv (args, "--comp-lzo",
@@ -1741,7 +1741,7 @@ nm_openvpn_start_openvpn_binary (NMOpenvpnPlugin *plugin,
 
        tmp = nm_setting_vpn_get_data_item (s_vpn, NM_OPENVPN_KEY_TLS_REMOTE);
        if (nmovpn_arg_is_set (tmp)) {
-               if (openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) != 
OPENVPN_BINARY_VERSION_2_4_OR_NEWER) {
+               if (openvpn_binary_detect_version_cached (openvpn_binary, &openvpn_binary_version) == 
OPENVPN_BINARY_VERSION_2_3_OR_OLDER) {
                        _LOGW ("the tls-remote option is deprecated and removed from OpenVPN 2.4. Update your 
connection to use verify-x509-name (for example, \"verify-x509-name=name:%s\")", tmp);
                        args_add_strv (args, "--tls-remote", tmp);
                } else {