summaryrefslogtreecommitdiffstats
path: root/lib/network/vpn
diff options
context:
space:
mode:
authorClaudio Matsuoka <claudio@mandriva.com>2010-03-08 20:50:49 +0000
committerClaudio Matsuoka <claudio@mandriva.com>2010-03-08 20:50:49 +0000
commitec2a3fe49a0be24737d3a4a589eed45c37b7650d (patch)
tree677f73abc82156b7f2d5f9f96b101241d961509f /lib/network/vpn
parenta2c08c3e562f556e4613881dbaa8eb2321d988da (diff)
downloaddrakx-net-ec2a3fe49a0be24737d3a4a589eed45c37b7650d.tar
drakx-net-ec2a3fe49a0be24737d3a4a589eed45c37b7650d.tar.gz
drakx-net-ec2a3fe49a0be24737d3a4a589eed45c37b7650d.tar.bz2
drakx-net-ec2a3fe49a0be24737d3a4a589eed45c37b7650d.tar.xz
drakx-net-ec2a3fe49a0be24737d3a4a589eed45c37b7650d.zip
Also prevent CA certificate from being written if pkcs12 used (#38463)
Diffstat (limited to 'lib/network/vpn')
-rw-r--r--lib/network/vpn/openvpn.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/network/vpn/openvpn.pm b/lib/network/vpn/openvpn.pm
index 813f453..68e1b3f 100644
--- a/lib/network/vpn/openvpn.pm
+++ b/lib/network/vpn/openvpn.pm
@@ -73,6 +73,8 @@ sub write_config {
}
delete $connection->{keysize} if !$connection->{cipher};
+ delete $connection->{ca_file} if $connection->{pkcs12_file};
+
if ($connection->{type} eq 'static') {
$connection->{secret_file} = delete $connection->{key};
delete $connection->{ca_file};