[NetworkManager-openvpn] service: Don't add cert and key when they are not set



commit e41a5875c0fa391a169deb41c95f59a8291832e6
Author: Jonathan Kang <jonathankang gnome org>
Date:   Tue Jun 15 15:55:41 2021 +0800

    service: Don't add cert and key when they are not set
    
    fixes 34a0c9257aac9ed6e3ac7cdad6f6cc7d8107eef1.
    
    https://bugzilla.suse.com/show_bug.cgi?id=1186091
    https://gitlab.gnome.org/GNOME/NetworkManager-openvpn/-/merge_requests/38

 src/nm-openvpn-service.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/src/nm-openvpn-service.c b/src/nm-openvpn-service.c
index 8cdbbd4..af57227 100644
--- a/src/nm-openvpn-service.c
+++ b/src/nm-openvpn-service.c
@@ -364,8 +364,10 @@ args_add_vpn_certs (GPtrArray *args, NMSettingVpn *s_vpn)
        if (nmovpn_arg_is_set (cert) && is_pkcs12 (cert))
                args_add_strv (args, "--pkcs12", cert);
        else {
-               args_add_strv (args, "--cert", cert);
-               args_add_strv (args, "--key", key);
+               if (nmovpn_arg_is_set (cert))
+                       args_add_strv (args, "--cert", cert);
+               if (nmovpn_arg_is_set (key))
+                       args_add_strv (args, "--key", key);
        }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]