From fe2accf77663693628835d7063da7d871b1ad268 Mon Sep 17 00:00:00 2001 From: Jan Cholasta Date: Mon, 22 Jun 2015 09:59:33 +0000 Subject: ipalib: Load ipaserver plugins when api.env.in_server is True https://fedorahosted.org/freeipa/ticket/3090 https://fedorahosted.org/freeipa/ticket/5073 Reviewed-By: Martin Babinsky --- ipalib/plugins/baseuser.py | 2 -- ipalib/plugins/stageuser.py | 2 -- ipalib/plugins/user.py | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) (limited to 'ipalib/plugins') diff --git a/ipalib/plugins/baseuser.py b/ipalib/plugins/baseuser.py index d2bc68f45..9068ef0fd 100644 --- a/ipalib/plugins/baseuser.py +++ b/ipalib/plugins/baseuser.py @@ -38,8 +38,6 @@ from ipapython.ipavalidate import Email from ipalib.capabilities import client_has_capability from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, convert_sshpubkey_post) -if api.env.in_server and api.env.context in ['lite', 'server']: - from ipaserver.plugins.ldap2 import ldap2 __doc__ = _(""" Baseuser diff --git a/ipalib/plugins/stageuser.py b/ipalib/plugins/stageuser.py index 7c714f627..01c01cea3 100644 --- a/ipalib/plugins/stageuser.py +++ b/ipalib/plugins/stageuser.py @@ -42,8 +42,6 @@ from ipapython.ipavalidate import Email from ipalib.capabilities import client_has_capability from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, convert_sshpubkey_post) -if api.env.in_server and api.env.context in ['lite', 'server']: - from ipaserver.plugins.ldap2 import ldap2 __doc__ = _(""" Stageusers diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 0b90519b2..96de65ac5 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -44,7 +44,7 @@ from ipapython.ipavalidate import Email from ipalib.capabilities import client_has_capability from ipalib.util import (normalize_sshpubkey, validate_sshpubkey, convert_sshpubkey_post) -if api.env.in_server and api.env.context in ['lite', 'server']: +if api.env.in_server: from ipaserver.plugins.ldap2 import ldap2 __doc__ = _(""" -- cgit