diff options
| author | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-02 16:38:18 +0000 |
|---|---|---|
| committer | Claudio Matsuoka <claudio@mandriva.com> | 2010-03-02 16:38:18 +0000 |
| commit | 9dc6fe9a88114e78f1910795fb87006fd1f54d15 (patch) | |
| tree | 7ad8c76f3627b1f976343d195be665ca092b8d3e | |
| parent | 9c60f0dd2e7a41f97719e005acd0aa13241f707d (diff) | |
| download | drakx-net-9dc6fe9a88114e78f1910795fb87006fd1f54d15.tar drakx-net-9dc6fe9a88114e78f1910795fb87006fd1f54d15.tar.gz drakx-net-9dc6fe9a88114e78f1910795fb87006fd1f54d15.tar.bz2 drakx-net-9dc6fe9a88114e78f1910795fb87006fd1f54d15.tar.xz drakx-net-9dc6fe9a88114e78f1910795fb87006fd1f54d15.zip | |
disable CA certificate field if pkcs12 certificate is used (#38463)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/vpn/openvpn.pm | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -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"), |