blob: 67f6fb8a6e9ea0153e01bd61391534f0f9921427 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
|
From 4efe2cba72d317a03abad3869532d97e1f0259a6 Mon Sep 17 00:00:00 2001
From: Jan Cholasta <jcholast@redhat.com>
Date: Tue, 2 Aug 2016 12:56:44 +0200
Subject: [PATCH 2/3] dogtag, vault: do not import `pki` in makeapi
---
ipaserver/plugins/dogtag.py | 2 +-
ipaserver/plugins/vault.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ipaserver/plugins/dogtag.py b/ipaserver/plugins/dogtag.py
index aef1e88..53c3270 100644
--- a/ipaserver/plugins/dogtag.py
+++ b/ipaserver/plugins/dogtag.py
@@ -253,7 +253,7 @@ import ipapython.cookie
from ipapython import dogtag
from ipapython import ipautil
-if api.env.in_server:
+if not api.env.validate_api:
import pki
from pki.client import PKIConnection
import pki.crypto as cryptoutil
diff --git a/ipaserver/plugins/vault.py b/ipaserver/plugins/vault.py
index c9b7cb9..52cbf17 100644
--- a/ipaserver/plugins/vault.py
+++ b/ipaserver/plugins/vault.py
@@ -35,7 +35,7 @@ from ipalib import _, ngettext
from ipapython import kerberos
from ipapython.dn import DN
-if api.env.in_server:
+if not api.env.validate_api:
import pki.account
import pki.key
--
2.7.4
|