From 0bb8cca027ab32a54f6792ab1b1368e2f1845368 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Fri, 3 Aug 2012 10:46:22 +0900
Subject: check also for a suitable polkit-authentication-agent running

fix #382.
---
 src/leap/eip/config.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'src/leap/eip/config.py')

diff --git a/src/leap/eip/config.py b/src/leap/eip/config.py
index 4577837a..9583720e 100644
--- a/src/leap/eip/config.py
+++ b/src/leap/eip/config.py
@@ -4,13 +4,18 @@ import os
 import platform
 
 from leap.util.fileutil import which, mkdir_p
-from leap.baseapp.permcheck import is_pkexec_in_system
+from leap.baseapp.permcheck import (is_pkexec_in_system,
+                                    is_auth_agent_running)
 
 
 class EIPNoPkexecAvailable(Exception):
     pass
 
 
+class EIPNoPolkitAuthAgentAvailable(Exception):
+    pass
+
+
 def build_ovpn_options(daemon=False):
     """
     build a list of options
@@ -34,6 +39,7 @@ def build_ovpn_options(daemon=False):
 
     opts = []
     opts.append('--persist-tun')
+    opts.append('--persist-key')
 
     # set user and group
     opts.append('--user')
@@ -104,9 +110,8 @@ def build_ovpn_command(config, debug=False):
         if not is_pkexec_in_system():
             raise EIPNoPkexecAvailable
 
-        #TBD --
-        #if not is_auth_agent_running()
-        # raise EIPNoPolkitAuthAgentAvailable
+        if not is_auth_agent_running():
+            raise EIPNoPolkitAuthAgentAvailable
 
         command.append('pkexec')
 
-- 
cgit v1.2.3