summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--lib/network/vpn/openvpn.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 57be929..db23cc2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,3 @@
-0.87:
- properly update /etc/hosts file when there are multiple aliases for the
the same ip (#30168).
- ndiswrapper support:
@@ -14,6 +13,7 @@
- Don't guess gateway and nameserver if not specified (#28033)
- Sort wireless networks by signal level by default
- Fix inverted wireless networks signal level sorting
+- disable CA certificate field if pkcs12 certificate is used (#38463)
0.86.1:
- ignore non-fatal wpa_supplicant messages (#54002)
diff --git a/lib/network/vpn/openvpn.pm b/lib/network/vpn/openvpn.pm
index ac5acf1..813f453 100644
--- a/lib/network/vpn/openvpn.pm
+++ b/lib/network/vpn/openvpn.pm
@@ -142,7 +142,7 @@ sub get_key_settings {
N("Certificate Authority (CA)"),
type => 'file',
val => \$connection->{ca_file},
- disabled => sub { $connection->{type} ne 'pki' },
+ disabled => sub { $connection->{type} ne 'pki' || $connection->{pkcs12_file} },
},
{
label => N("Certificate"),