From ec2a3fe49a0be24737d3a4a589eed45c37b7650d Mon Sep 17 00:00:00 2001
From: Claudio Matsuoka <claudio@mandriva.com>
Date: Mon, 8 Mar 2010 20:50:49 +0000
Subject: Also prevent CA certificate from being written if pkcs12 used
 (#38463)

---
 lib/network/vpn/openvpn.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/network/vpn')

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};
-- 
cgit v1.2.1