Remove some duplicated code that was moved to ipaserver and use it Remove some unused files

5 files changed, 0 insertions, 1174 deletions

diff --git a/ipa-python/aci.py b/ipa-python/aci.py
deleted file mode 100644
index 58a3b1d2..00000000
--- a/ipa-python/aci.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright (C) 2007    Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.    See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-import re
-import urllib
-import ldap
-
-import ipa.ipautil
-
-class ACI:
-    """
-    Holds the basic data for an ACI entry, as stored in the cn=accounts
-    entry in LDAP.  Has methods to parse an ACI string and export to an
-    ACI String.
-    """
-
-    def __init__(self,acistr=None):
-        self.name = ''
-        self.source_group = ''
-        self.dest_group = ''
-        self.attrs = []
-        self.orig_acistr = acistr
-        if acistr is not None:
-            self.parse_acistr(acistr)
-
-    def __getitem__(self,key):
-        """Fake getting attributes by key for sorting"""
-        if key == 0:
-            return self.name
-        if key == 1:
-            return self.source_group
-        if key == 2:
-            return self.dest_group
-        raise TypeError("Unknown key value %s" % key)
-
-    def export_to_string(self):
-        """Converts the ACI to a string suitable for an LDAP aci attribute."""
-        attrs_str = ' || '.join(self.attrs)
-
-        # dest_group and source_group are assumed to be pre-escaped.
-        # dn's aren't typed in, but searched for, and the search results
-        # will return escaped dns
-
-        acistr = ('(targetattr="%s")' +
-                  '(targetfilter="(memberOf=%s)")' +
-                  '(version 3.0;' +
-                  'acl "%s";' +
-                  'allow (write) ' +
-                  'groupdn="ldap:///%s";)') % (attrs_str,
-                                       self.dest_group,
-                                       self.name,
-                                       urllib.quote(self.source_group, "/=, "))
-        return acistr
-
-    def to_dict(self):
-        result = ipa.ipautil.CIDict()
-        result['name'] = self.name
-        result['source_group'] = self.source_group
-        result['dest_group'] = self.dest_group
-        result['attrs'] = self.attrs
-        result['orig_acistr'] = self.orig_acistr
-
-        return result
-
-    def _match(self, prefix, inputstr):
-        """Returns inputstr with prefix removed, or else raises a
-           SyntaxError."""
-        if inputstr.startswith(prefix):
-            return inputstr[len(prefix):]
-        else:
-            raise SyntaxError, "'%s' not found at '%s'" % (prefix, inputstr)
-
-    def _match_str(self, inputstr):
-        """Tries to extract a " delimited string from the front of inputstr.
-           Returns (string, inputstr) where:
-             - string is the extracted string (minus the enclosing " chars)
-             - inputstr is the parameter with the string removed.
-           Raises SyntaxError is a string is not found."""
-        if not inputstr.startswith('"'):
-            raise SyntaxError, "string not found at '%s'" % inputstr
-
-        found = False
-        start_index = 1
-        final_index = 1
-        while not found and (final_index < len(inputstr)):
-            if inputstr[final_index] == '\\':
-                final_index += 2
-            elif inputstr[final_index] == '"':
-                found = True
-            else:
-                final_index += 1
-        if not found:
-            raise SyntaxError, "string not found at '%s'" % inputstr
-
-        match = inputstr[start_index:final_index]
-        inputstr = inputstr[final_index + 1:]
-
-        return(match, inputstr)
-
-    def parse_acistr(self, acistr):
-        """Parses the acistr.  If the string isn't recognized, a SyntaxError
-           is raised."""
-        self.orig_acistr = acistr
-
-        acistr = self._match('(targetattr=', acistr)
-        (attrstr, acistr) = self._match_str(acistr)
-        self.attrs = attrstr.split(' || ')
-
-        acistr = self._match(')(targetfilter=', acistr)
-        (target_dn_str, acistr) = self._match_str(acistr)
-        target_dn_str = self._match('(memberOf=', target_dn_str)
-        if target_dn_str.endswith(')'):
-            self.dest_group = target_dn_str[:-1]
-        else:
-            raise SyntaxError, "illegal dest_group at '%s'" % target_dn_str
-
-        acistr = self._match(')(version 3.0;acl ', acistr)
-        (name_str, acistr) = self._match_str(acistr)
-        self.name = name_str
-
-        acistr = self._match(';allow (write) groupdn=', acistr)
-        (src_dn_str, acistr) = self._match_str(acistr)
-        src_dn_str = self._match('ldap:///', src_dn_str)
-        self.source_group = urllib.unquote(src_dn_str)
-
-        acistr = self._match(';)', acistr)
-        if len(acistr) > 0:
-            raise SyntaxError, "unexpected aci suffix at '%s'" % acistr
-
-def extract_group_cns(aci_list, client):
-    """Extracts all the cn's from a list of aci's and returns them as a hash
-       from group_dn to group_cn.
-
-       It first tries to cheat by looking at the first rdn for the
-       group dn.  If that's not cn for some reason, it looks up the group."""
-    group_dn_to_cn = {}
-    for aci in aci_list:
-        for dn in (aci.source_group, aci.dest_group):
-            if not group_dn_to_cn.has_key(dn):
-                rdn_list = ldap.explode_dn(dn, 0)
-                first_rdn = rdn_list[0]
-                (type,value) = first_rdn.split('=')
-                if type == "cn":
-                    group_dn_to_cn[dn] = value
-                else:
-                    try:
-                        group = client.get_entry_by_dn(dn, ['cn'])
-                        group_dn_to_cn[dn] = group.getValue('cn')
-                    except ipaerror.IPAError, e:
-                        group_dn_to_cn[dn] = 'unknown'
-
-    return group_dn_to_cn
diff --git a/ipa-python/group.py b/ipa-python/group.py
deleted file mode 100644
index 342a905b..00000000
--- a/ipa-python/group.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2007  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-from ipa.entity import Entity
-
-class Group(Entity):
-
-    def __init2__(self):
-        pass
-        
diff --git a/ipa-python/krbtransport.py b/ipa-python/krbtransport.py
deleted file mode 100644
index b700afe7..00000000
--- a/ipa-python/krbtransport.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# Authors: Rob Crittenden <rcritten@redhat.com>
-#
-# Copyright (C) 2007  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-import httplib
-import xmlrpclib
-import kerberos
-
-class KerbTransport(xmlrpclib.SafeTransport):
-    """Handles Kerberos Negotiation authentication to an XML-RPC server."""
-
-    def get_host_info(self, host):
-
-        host, extra_headers, x509 = xmlrpclib.Transport.get_host_info(self, host)
-
-        # Set the remote host principal
-        h = host
-        hostinfo = h.split(':')
-        service = "HTTP@" + hostinfo[0]
-
-        try:
-            rc, vc = kerberos.authGSSClientInit(service,
-                                                kerberos.GSS_C_DELEG_FLAG |
-                                                kerberos.GSS_C_MUTUAL_FLAG |
-                                                kerberos.GSS_C_SEQUENCE_FLAG)
-        except kerberos.GSSError, e:
-            raise kerberos.GSSError(e)
-
-        try:
-            kerberos.authGSSClientStep(vc, "");
-        except kerberos.GSSError, e:
-            raise kerberos.GSSError(e)
-
-        extra_headers = [
-            ("Authorization", "negotiate %s" % kerberos.authGSSClientResponse(vc) )
-            ]
-
-        return host, extra_headers, x509
-
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
deleted file mode 100644
index a8001767..00000000
--- a/ipa-python/rpcclient.py
+++ /dev/null
@@ -1,906 +0,0 @@
-# Authors: Rob Crittenden <rcritten@redhat.com>
-#
-# Copyright (C) 2007  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-import xmlrpclib
-import socket
-import config
-import errno
-from krbtransport import KerbTransport
-from kerberos import GSSError
-from ipa import ipaerror, ipautil
-from ipa import config
-
-# Some errors to catch
-# http://cvs.fedora.redhat.com/viewcvs/ldapserver/ldap/servers/plugins/pam_passthru/README?root=dirsec&rev=1.6&view=auto
-
-class RPCClient:
-
-    def __init__(self, verbose=False):
-        self.server = None
-        self.verbose = verbose
-        config.init_config()
-    
-    def server_url(self, server):
-        """Build the XML-RPC server URL from our configuration"""
-        url = "https://" + server + "/ipa/xml"
-        if self.verbose:
-            print "Connecting to IPA server: %s" % url
-        return url
-    
-    def setup_server(self):
-        """Create our XML-RPC server connection using kerberos
-           authentication"""
-        if not self.server:
-            serverlist = config.config.get_server()
-
-            # Try each server until we succeed or run out of servers to try
-            # Guaranteed by ipa.config to have at least 1 in the list
-            for s in serverlist:
-                try:
-                    self.server = s
-                    remote = xmlrpclib.ServerProxy(self.server_url(s), KerbTransport())
-                    result = remote.ping()
-                    break
-                except socket.error, e:
-                    if (e[0] == errno.ECONNREFUSED) or (e[0] == errno.ECONNREFUSED) or (e[0] == errno.EHOSTDOWN) or (e[0] == errno.EHOSTUNREACH):
-                        continue
-                    else:
-                        raise e
-                except GSSError:
-                    continue
-
-        return xmlrpclib.ServerProxy(self.server_url(self.server), KerbTransport(), verbose=self.verbose)
-    
-# Higher-level API
-
-    def get_aci_entry(self, sattrs=None):
-        """Returns the entry containing access control ACIs."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_aci_entry(sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-
-# General searches
-
-    def get_entry_by_dn(self,dn,sattrs=None):
-        """Get a specific entry. If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a dict."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_entry_by_dn(dn, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_entry_by_cn(self,cn,sattrs=None):
-        """Get a specific entry by cn. If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a dict."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_entry_by_cn(cn, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_entry(self,oldentry,newentry):
-        """Update an existing entry. oldentry and newentry are dicts of attributes"""
-        server = self.setup_server()
-
-        try:
-            result = server.update_entry(ipautil.wrap_binary_data(oldentry),
-                    ipautil.wrap_binary_data(newentry))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-
-# User support
-
-    def get_user_by_uid(self,uid,sattrs=None):
-        """Get a specific user. If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a dict."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_user_by_uid(uid, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_user_by_principal(self,principal,sattrs=None):
-        """Get a specific user. If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a dict."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_user_by_principal(principal, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_user_by_email(self,email,sattrs=None):
-        """Get a specific user's entry. Return as a dict of values.
-           Multi-valued fields are represented as lists. The result is a
-           dict.
-        """
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_user_by_email(email, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_users_by_manager(self,manager_dn,sattrs=None):
-        """Gets the users that report to a manager.
-           If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a list of dicts."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_users_by_manager(manager_dn, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_user(self,user,user_container=None):
-        """Add a new user. Takes as input a dict where the key is the
-           attribute name and the value is either a string or in the case
-           of a multi-valued field a list of values"""
-        server = self.setup_server()
-
-        if user_container is None:
-            user_container = "__NONE__"
-    
-        try:
-            result = server.add_user(ipautil.wrap_binary_data(user),
-                    user_container)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-        
-    def get_custom_fields(self):
-        """Get custom user fields."""
-        server = self.setup_server()
-        
-        try:
-            result = server.get_custom_fields()
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-      
-        return ipautil.unwrap_binary_data(result)
-
-    def set_custom_fields(self, schema):
-        """Set custom user fields."""
-        server = self.setup_server()
-        
-        try:
-            result = server.set_custom_fields(schema)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-      
-    def get_all_users (self):
-        """Return a list containing a dict for each existing user."""
-    
-        server = self.setup_server()
-        try:
-            result = server.get_all_users()
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def find_users (self, criteria, sattrs=None, sizelimit=-1, timelimit=-1):
-        """Return a list: counter followed by a dict for each user that
-           matches the criteria. If the results are truncated, counter will
-           be set to -1"""
-    
-        server = self.setup_server()
-        try:
-            # None values are not allowed in XML-RPC
-            if sattrs is None:
-                sattrs = "__NONE__"
-            result = server.find_users(criteria, sattrs, sizelimit, timelimit)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def update_user(self,olduser,newuser):
-        """Update an existing user. olduser and newuser are dicts of attributes"""
-        server = self.setup_server()
-    
-        try:
-            result = server.update_user(ipautil.wrap_binary_data(olduser),
-                    ipautil.wrap_binary_data(newuser))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def delete_user(self,uid):
-        """Delete a user. uid is the uid of the user to delete."""
-        server = self.setup_server()
-    
-        try:
-            result = server.delete_user(uid)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return result
-
-    def modifyPassword(self,principal,oldpass,newpass):
-        """Modify a user's password"""
-        server = self.setup_server()
-
-        if oldpass is None:
-            oldpass = "__NONE__"
-    
-        try:
-            result = server.modifyPassword(principal,oldpass,newpass)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return result
-
-    def mark_user_active(self,uid):
-        """Mark a user as active"""
-        server = self.setup_server()
-    
-        try:
-            result = server.mark_user_active(uid)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def mark_user_inactive(self,uid):
-        """Mark a user as inactive"""
-        server = self.setup_server()
-    
-        try:
-            result = server.mark_user_inactive(uid)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-
-# Group support
-
-    def get_groups_by_member(self,member_dn,sattrs=None):
-        """Gets the groups that member_dn belongs to.
-           If sattrs is not None then only those
-           attributes will be returned, otherwise all available
-           attributes are returned. The result is a list of dicts."""
-        server = self.setup_server()
-        if sattrs is None:
-            sattrs = "__NONE__"
-        try:
-            result = server.get_groups_by_member(member_dn, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_group(self,group,group_container=None):
-        """Add a new group. Takes as input a dict where the key is the
-           attribute name and the value is either a string or in the case
-           of a multi-valued field a list of values"""
-        server = self.setup_server()
-
-        if group_container is None:
-            group_container = "__NONE__"
-    
-        try:
-            result = server.add_group(ipautil.wrap_binary_data(group),
-                    group_container)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def find_groups (self, criteria, sattrs=None, sizelimit=-1, timelimit=-1):
-        """Return a list containing a Group object for each group that matches
-           the criteria."""
-    
-        server = self.setup_server()
-        try:
-            # None values are not allowed in XML-RPC
-            if sattrs is None:
-                sattrs = "__NONE__"
-            result = server.find_groups(criteria, sattrs, sizelimit, timelimit)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def add_member_to_group(self, member_dn, group_dn):
-        """Add a new member to an existing group.
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_member_to_group(member_dn, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_members_to_group(self, member_dns, group_dn):
-        """Add several members to an existing group.
-           member_dns is a list of the dns to add
-
-           Returns a list of the dns that were not added.
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_members_to_group(member_dns, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def remove_member_from_group(self, member_dn, group_dn):
-        """Remove a member from an existing group.
-        """
-        server = self.setup_server()
-        try:
-            result = server.remove_member_from_group(member_dn, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def remove_members_from_group(self, member_dns, group_dn):
-        """Remove several members from an existing group.
-
-           Returns a list of the dns that were not removed.
-        """
-        server = self.setup_server()
-        try:
-            result = server.remove_members_from_group(member_dns, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_user_to_group(self, user_uid, group_dn):
-        """Add a user to an existing group.
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_user_to_group(user_uid, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_users_to_group(self, user_uids, group_dn):
-        """Add several users to an existing group.
-           user_uids is a list of the uids of the users to add
-
-           Returns a list of the user uids that were not added.
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_users_to_group(user_uids, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def remove_user_from_group(self, user_uid, group_dn):
-        """Remove a user from an existing group.
-        """
-        server = self.setup_server()
-        try:
-            result = server.remove_user_from_group(user_uid, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def remove_users_from_group(self, user_uids, group_dn):
-        """Remove several users from an existing group.
-           user_uids is a list of the uids of the users to remove
-
-           Returns a list of the user uids that were not removed.
-        """
-        server = self.setup_server()
-        try:
-            result = server.remove_users_from_group(user_uids, group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def add_groups_to_user(self, group_dns, user_dn):
-        """Given a list of group dn's add them to the user.
-
-           Returns a list of the group dns that were not added.
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_groups_to_user(group_dns, user_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def remove_groups_from_user(self, group_dns, user_dn):
-        """Given a list of group dn's remove them from the user.
-
-           Returns a list of the group dns that were not removed.
-        """
-        server = self.setup_server()
-        try:
-            result = server.remove_groups_from_user(group_dns, user_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_group(self,oldgroup,newgroup):
-        """Update an existing group. oldgroup and newgroup are dicts of attributes"""
-        server = self.setup_server()
-    
-        try:
-            result = server.update_group(ipautil.wrap_binary_data(oldgroup),
-                    ipautil.wrap_binary_data(newgroup))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def delete_group(self,group_dn):
-        """Delete a group. group_dn is the dn of the group to be deleted."""
-        server = self.setup_server()
-    
-        try:
-            result = server.delete_group(group_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_group_to_group(self, group_cn, tgroup_cn):
-        """Add a group to an existing group.
-           group_cn is a cn of the group to add
-           tgroup_cn is the cn of the group to be added to
-        """
-        server = self.setup_server()
-        try:
-            result = server.add_group_to_group(group_cn, tgroup_cn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def attrs_to_labels(self,attrs):
-        """Convert a list of LDAP attributes into a more readable form."""
-
-        server = self.setup_server()
-        try:
-            result = server.attrs_to_labels(attrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_all_attrs(self):
-        """We have a list of hardcoded attributes -> readable labels. Return
-           that complete list if someone wants it.
-        """
-
-        server = self.setup_server()
-        try:
-            result = server.get_all_attrs()
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def group_members(self, groupdn, attr_list=None, memberstype=0):
-        """Do a memberOf search of groupdn and return the attributes in
-           attr_list (an empty list returns everything)."""
-
-        if attr_list is None:
-            attr_list = "__NONE__"
-
-        server = self.setup_server()
-        try:
-            result = server.group_members(groupdn, attr_list, memberstype)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def mark_group_active(self,cn):
-        """Mark a group as active"""
-        server = self.setup_server()
-    
-        try:
-            result = server.mark_group_active(cn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def mark_group_inactive(self,cn):
-        """Mark a group as inactive"""
-        server = self.setup_server()
-    
-        try:
-            result = server.mark_group_inactive(cn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-# Configuration support
-
-    def get_ipa_config(self):
-        """Get the IPA configuration"""
-        server = self.setup_server()
-        try:
-            result = server.get_ipa_config()
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_ipa_config(self, oldconfig, newconfig):
-        """Update the IPA configuration"""
-        server = self.setup_server()
-        try:
-            result = server.update_ipa_config(ipautil.wrap_binary_data(oldconfig), ipautil.wrap_binary_data(newconfig))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def get_password_policy(self):
-        """Get the IPA password policy"""
-        server = self.setup_server()
-        try:
-            result = server.get_password_policy()
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_password_policy(self, oldpolicy, newpolicy):
-        """Update the IPA password policy"""
-        server = self.setup_server()
-        try:
-            result = server.update_password_policy(ipautil.wrap_binary_data(oldpolicy), ipautil.wrap_binary_data(newpolicy))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_service_principal(self, princ_name, force):
-        server = self.setup_server()
-    
-        try:
-            result = server.add_service_principal(princ_name, force)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def delete_service_principal(self, principal_dn):
-        server = self.setup_server()
-    
-        try:
-            result = server.delete_service_principal(principal_dn)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def find_service_principal (self, criteria, sattrs=None, sizelimit=-1, timelimit=-1):
-        """Return a list: counter followed by a Entity object for each host that
-           matches the criteria. If the results are truncated, counter will
-           be set to -1"""
-    
-        server = self.setup_server()
-        try:
-            # None values are not allowed in XML-RPC
-            if sattrs is None:
-                sattrs = "__NONE__"
-            result = server.find_service_principal(criteria, sattrs, sizelimit, timelimit)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def get_keytab(self, princ_name):
-        server = self.setup_server()
-    
-        try:
-            result = server.get_keytab(princ_name)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-# radius support
-
-    def get_radius_client_by_ip_addr(self, ip_addr, container, sattrs=None):
-        server = self.setup_server()
-        if container is None: container = "__NONE__"
-        if sattrs is None: sattrs = "__NONE__"
-        try:
-            result = server.get_radius_client_by_ip_addr(ip_addr, container, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_radius_client(self, client, container=None):
-        server = self.setup_server()
-
-        if container is None: container = "__NONE__"
-
-        try:
-            result = server.add_radius_client(ipautil.wrap_binary_data(client), container)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_radius_client(self, oldclient, newclient):
-        server = self.setup_server()
-    
-        try:
-            result = server.update_radius_client(ipautil.wrap_binary_data(oldclient),
-                                                 ipautil.wrap_binary_data(newclient))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-        
-    def delete_radius_client(self, ip_addr, container=None):
-        server = self.setup_server()
-        if container is None: container = "__NONE__"
-    
-        try:
-            result = server.delete_radius_client(ip_addr, container)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def find_radius_clients(self, criteria, container=None, sattrs=None, sizelimit=-1, timelimit=-1):
-        server = self.setup_server()
-        if container is None: container = "__NONE__"
-        try:
-            # None values are not allowed in XML-RPC
-            if sattrs is None:
-                sattrs = "__NONE__"
-            result = server.find_radius_clients(criteria, container, sattrs, sizelimit, timelimit)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
-    def get_radius_profile_by_uid(self, ip_addr, user_profile, sattrs=None):
-        server = self.setup_server()
-        if user_profile is None: user_profile = "__NONE__"
-        if sattrs is None: sattrs = "__NONE__"
-        try:
-            result = server.get_radius_profile_by_uid(ip_addr, user_profile, sattrs)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def add_radius_profile(self, profile, user_profile=None):
-        server = self.setup_server()
-
-        if user_profile is None: user_profile = "__NONE__"
-
-        try:
-            result = server.add_radius_profile(ipautil.wrap_binary_data(profile), user_profile)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def update_radius_profile(self, oldprofile, newprofile):
-        server = self.setup_server()
-    
-        try:
-            result = server.update_radius_profile(ipautil.wrap_binary_data(oldprofile),
-                                                 ipautil.wrap_binary_data(newprofile))
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-        
-    def delete_radius_profile(self, ip_addr, user_profile=None):
-        server = self.setup_server()
-        if user_profile is None: user_profile = "__NONE__"
-    
-        try:
-            result = server.delete_radius_profile(ip_addr, user_profile)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-
-        return ipautil.unwrap_binary_data(result)
-
-    def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, sizelimit=-1, timelimit=-1):
-        server = self.setup_server()
-        if user_profile is None: user_profile = "__NONE__"
-        try:
-            # None values are not allowed in XML-RPC
-            if sattrs is None:
-                sattrs = "__NONE__"
-            result = server.find_radius_profiles(criteria, user_profile, sattrs, sizelimit, timelimit)
-        except xmlrpclib.Fault, fault:
-            raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
-        except socket.error, (value, msg):
-            raise xmlrpclib.Fault(value, msg)
-    
-        return ipautil.unwrap_binary_data(result)
-
diff --git a/ipa-python/user.py b/ipa-python/user.py
deleted file mode 100644
index d638cc4a..00000000
--- a/ipa-python/user.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 2007  Red Hat
-# see file 'COPYING' for use and warranty information
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; version 2 only
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-from ipa.entity import Entity
-
-class User(Entity):
-
-    def __init2__(self):
-        pass
-