mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Use ldaphost and ldapport environment variables in mod_python xml-rpc server
Fix default environment creation
This commit is contained in:
parent
06a82bf4b6
commit
43ad16676f
@ -144,8 +144,7 @@ class ModXMLRPCRequestHandler(object):
|
|||||||
# for e in req.subprocess_env:
|
# for e in req.subprocess_env:
|
||||||
# logging.debug("IPA: environment %s: %s" % (e, req.subprocess_env[e]))
|
# logging.debug("IPA: environment %s: %s" % (e, req.subprocess_env[e]))
|
||||||
|
|
||||||
# FIXME: don't hardcode server and port
|
context.conn = conn.IPAConn(api.env.ldaphost, api.env.ldapport, krbccache, context.opts.get('ipadebug'))
|
||||||
context.conn = conn.IPAConn("localhost", 389, krbccache, context.opts.get('ipadebug'))
|
|
||||||
|
|
||||||
start = time.time()
|
start = time.time()
|
||||||
# generate response
|
# generate response
|
||||||
@ -354,9 +353,10 @@ def load_modules():
|
|||||||
api.finalize()
|
api.finalize()
|
||||||
|
|
||||||
# Initialize our environment
|
# Initialize our environment
|
||||||
|
config.set_default_env(api.env)
|
||||||
env_dict = config.read_config()
|
env_dict = config.read_config()
|
||||||
env_dict['server_context'] = True
|
env_dict['server_context'] = True
|
||||||
api.env.update(config.generate_env(env_dict))
|
api.env.update(env_dict)
|
||||||
|
|
||||||
# Get and register all the methods
|
# Get and register all the methods
|
||||||
for cmd in api.Command:
|
for cmd in api.Command:
|
||||||
|
Loading…
Reference in New Issue
Block a user