summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-06-29 16:05:07 +0200
committerJan Cholasta <jcholast@redhat.com>2016-06-30 14:09:24 +0200
commit7d9afd988aef0ae570683d387770995a8f21dc9f (patch)
tree3f148803af07cdbc8b2ef40f88228379b5af7be5
parenta901ec1ce988b0b3d0c8e7a063de260eb9ede7e8 (diff)
downloadfreeipa-7d9afd988aef0ae570683d387770995a8f21dc9f.tar.gz
freeipa-7d9afd988aef0ae570683d387770995a8f21dc9f.tar.xz
freeipa-7d9afd988aef0ae570683d387770995a8f21dc9f.zip
xmlserver: initialize RPC server plugins only in server context
Do not initialize the plugins for all in-server API instances, as they are used only in the server context. This prevents code using in-server API instances from attempting to initialize the session manager. https://fedorahosted.org/freeipa/ticket/5988 Reviewed-By: Martin Babinsky <mbabinsk@redhat.com>
-rw-r--r--ipaserver/plugins/xmlserver.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipaserver/plugins/xmlserver.py b/ipaserver/plugins/xmlserver.py
index cc496544b..d8fe24e0c 100644
--- a/ipaserver/plugins/xmlserver.py
+++ b/ipaserver/plugins/xmlserver.py
@@ -27,7 +27,7 @@ from ipalib import Registry, api
register = Registry()
-if 'in_server' in api.env and api.env.in_server is True:
+if api.env.context in ('server', 'lite'):
from ipaserver.rpcserver import wsgi_dispatch, xmlserver, jsonserver_kerb, jsonserver_session, login_kerberos, login_password, change_password, sync_token, xmlserver_session
register()(wsgi_dispatch)
register()(xmlserver)