diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2008-10-23 11:43:47 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2008-10-23 11:43:47 -0400 |
| commit | 43ad16676f21629d399c41ef0b51a666eba4c219 (patch) | |
| tree | 40f451f31ebc3905fdd9edb6add3609cc5c3af61 | |
| parent | 06a82bf4b646cd077a43841abb5670d9a495b24c (diff) | |
| download | freeipa-43ad16676f21629d399c41ef0b51a666eba4c219.tar.gz freeipa-43ad16676f21629d399c41ef0b51a666eba4c219.tar.xz freeipa-43ad16676f21629d399c41ef0b51a666eba4c219.zip | |
Use ldaphost and ldapport environment variables in mod_python xml-rpc server
Fix default environment creation
| -rw-r--r-- | ipa_server/mod_python_xmlrpc.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipa_server/mod_python_xmlrpc.py b/ipa_server/mod_python_xmlrpc.py index 2a16e11d1..814b1f65e 100644 --- a/ipa_server/mod_python_xmlrpc.py +++ b/ipa_server/mod_python_xmlrpc.py @@ -144,8 +144,7 @@ class ModXMLRPCRequestHandler(object): # for e in req.subprocess_env: # logging.debug("IPA: environment %s: %s" % (e, req.subprocess_env[e])) - # FIXME: don't hardcode server and port - context.conn = conn.IPAConn("localhost", 389, krbccache, context.opts.get('ipadebug')) + context.conn = conn.IPAConn(api.env.ldaphost, api.env.ldapport, krbccache, context.opts.get('ipadebug')) start = time.time() # generate response @@ -354,9 +353,10 @@ def load_modules(): api.finalize() # Initialize our environment + config.set_default_env(api.env) env_dict = config.read_config() env_dict['server_context'] = True - api.env.update(config.generate_env(env_dict)) + api.env.update(env_dict) # Get and register all the methods for cmd in api.Command: |