diff options
author | Jan Cholasta <jcholast@redhat.com> | 2015-06-22 09:59:33 +0000 |
---|---|---|
committer | Jan Cholasta <jcholast@redhat.com> | 2015-07-01 13:05:30 +0000 |
commit | fe2accf77663693628835d7063da7d871b1ad268 (patch) | |
tree | 95a5aaf3254edd12e305d2a1548f7c0a80ca72d2 /ipaserver | |
parent | f87ba5ee080ebf24d2420d105aa4026e844439db (diff) | |
download | freeipa-fe2accf77663693628835d7063da7d871b1ad268.tar.gz freeipa-fe2accf77663693628835d7063da7d871b1ad268.tar.xz freeipa-fe2accf77663693628835d7063da7d871b1ad268.zip |
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 <mbabinsk@redhat.com>
Diffstat (limited to 'ipaserver')
-rw-r--r-- | ipaserver/dcerpc.py | 1 | ||||
-rw-r--r-- | ipaserver/install/bindinstance.py | 1 | ||||
-rw-r--r-- | ipaserver/install/ipa_server_certinstall.py | 2 | ||||
-rw-r--r-- | ipaserver/install/ipa_server_upgrade.py | 1 | ||||
-rw-r--r-- | ipaserver/install/ldapupdate.py | 1 | ||||
-rw-r--r-- | ipaserver/install/plugins/update_managed_permissions.py | 1 | ||||
-rw-r--r-- | ipaserver/install/server/install.py | 3 | ||||
-rw-r--r-- | ipaserver/rpcserver.py | 6 |
8 files changed, 5 insertions, 11 deletions
diff --git a/ipaserver/dcerpc.py b/ipaserver/dcerpc.py index a1c57d22c..ee92664a5 100644 --- a/ipaserver/dcerpc.py +++ b/ipaserver/dcerpc.py @@ -31,7 +31,6 @@ from ipapython import ipautil from ipapython.ipa_log_manager import * from ipapython.dn import DN from ipaserver.install import installutils -from ipaserver.plugins import ldap2 from ipalib.util import normalize_name import os, string, struct, copy diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 77ff342d7..102a8e5f6 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -29,7 +29,6 @@ import ldap import installutils import service -from ipaserver.plugins import ldap2 from ipaserver.install.cainstance import IPA_CA_RECORD from ipapython import sysrestore, ipautil, ipaldap from ipapython.ipa_log_manager import * diff --git a/ipaserver/install/ipa_server_certinstall.py b/ipaserver/install/ipa_server_certinstall.py index 9e24c4ce0..2e3e34a5e 100644 --- a/ipaserver/install/ipa_server_certinstall.py +++ b/ipaserver/install/ipa_server_certinstall.py @@ -31,7 +31,7 @@ from ipapython.ipautil import user_input, write_tmp_file from ipalib import api, errors from ipalib.constants import CACERT from ipaserver.install import certs, dsinstance, httpinstance, installutils -from ipaserver.plugins.ldap2 import ldap2 + class ServerCertInstall(admintool.AdminTool): command_name = 'ipa-server-certinstall' diff --git a/ipaserver/install/ipa_server_upgrade.py b/ipaserver/install/ipa_server_upgrade.py index 8373b2134..d0a839d0a 100644 --- a/ipaserver/install/ipa_server_upgrade.py +++ b/ipaserver/install/ipa_server_upgrade.py @@ -41,7 +41,6 @@ class ServerUpgrade(admintool.AdminTool): super(ServerUpgrade, self).run() api.bootstrap(in_server=True, context='updates') - import ipaserver.plugins.dogtag # ensure profile backend gets loaded api.finalize() try: diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index f30659fe9..848ff1db8 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -45,7 +45,6 @@ from ipaplatform import services from ipapython.dn import DN from ipapython.ipa_log_manager import * from ipapython.ipautil import wait_for_open_socket -from ipaserver.plugins import ldap2 UPDATES_DIR=paths.UPDATES_DIR diff --git a/ipaserver/install/plugins/update_managed_permissions.py b/ipaserver/install/plugins/update_managed_permissions.py index 11765fba3..a2f289f83 100644 --- a/ipaserver/install/plugins/update_managed_permissions.py +++ b/ipaserver/install/plugins/update_managed_permissions.py @@ -91,7 +91,6 @@ from ipalib.plugins.permission import permission, permission_del from ipalib.aci import ACI from ipalib import Updater from ipapython import ipautil -from ipaserver.plugins.ldap2 import ldap2 register = Registry() diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index bde348518..2c5183ba4 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -592,9 +592,6 @@ def install_check(installer): api.env.ca_host = host_name api.bootstrap(**cfg) - if setup_ca: - # ensure profile backend is available - import ipaserver.plugins.dogtag api.finalize() if setup_ca: diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 5158c4212..43ee63e63 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -748,7 +748,8 @@ class jsonserver_session(jsonserver, KerberosSession): def __init__(self): super(jsonserver_session, self).__init__() - auth_mgr = AuthManagerKerb(self.__class__.__name__) + name = '{0}_{1}'.format(self.__class__.__name__, id(self)) + auth_mgr = AuthManagerKerb(name) session_mgr.auth_mgr.register(auth_mgr.name, auth_mgr) def _on_finalize(self): @@ -1200,7 +1201,8 @@ class xmlserver_session(xmlserver, KerberosSession): def __init__(self): super(xmlserver_session, self).__init__() - auth_mgr = AuthManagerKerb(self.__class__.__name__) + name = '{0}_{1}'.format(self.__class__.__name__, id(self)) + auth_mgr = AuthManagerKerb(name) session_mgr.auth_mgr.register(auth_mgr.name, auth_mgr) def _on_finalize(self): |