diff options
Diffstat (limited to 'ipa-server/xmlrpc-server')
| -rw-r--r-- | ipa-server/xmlrpc-server/Makefile.am | 8 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/funcs.py | 3 | ||||
| -rw-r--r-- | ipa-server/xmlrpc-server/ipaxmlrpc.py | 4 |
3 files changed, 8 insertions, 7 deletions
diff --git a/ipa-server/xmlrpc-server/Makefile.am b/ipa-server/xmlrpc-server/Makefile.am index 5e9da065..cf142019 100644 --- a/ipa-server/xmlrpc-server/Makefile.am +++ b/ipa-server/xmlrpc-server/Makefile.am @@ -10,10 +10,14 @@ html_DATA = \ unauthorized.html \ $(NULL) -serverdir = $(IPA_DATA_DIR)/ipaserver -server_PYTHON = \ +coredir = $(pythondir)/ipaserver +core_PYTHON = \ attrs.py \ funcs.py \ + $(NULL) + +serverdir = $(IPA_DATA_DIR)/ipaserver +server_PYTHON = \ ipaxmlrpc.py \ $(NULL) diff --git a/ipa-server/xmlrpc-server/funcs.py b/ipa-server/xmlrpc-server/funcs.py index d0600b51..cc2705d2 100644 --- a/ipa-server/xmlrpc-server/funcs.py +++ b/ipa-server/xmlrpc-server/funcs.py @@ -18,7 +18,6 @@ # import sys -sys.path.append("/usr/share/ipa") import krbV import ldap @@ -26,7 +25,7 @@ import ldap.dn import ipaserver.dsinstance import ipaserver.ipaldap import copy -import attrs +from ipaserver import attrs from ipa import ipaerror from ipa import ipautil from urllib import quote,unquote diff --git a/ipa-server/xmlrpc-server/ipaxmlrpc.py b/ipa-server/xmlrpc-server/ipaxmlrpc.py index 3f3e38b8..59f5e596 100644 --- a/ipa-server/xmlrpc-server/ipaxmlrpc.py +++ b/ipa-server/xmlrpc-server/ipaxmlrpc.py @@ -24,7 +24,6 @@ # Rob Crittenden <rcritten@redhat.com> import sys -sys.path.append("/usr/share/ipa") import time @@ -34,8 +33,7 @@ from xmlrpclib import Marshaller,loads,dumps,Fault from mod_python import apache import logging -import ipaserver -import funcs +from ipaserver import funcs from ipa import ipaerror, ipautil import ldap |