diff options
author | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
---|---|---|
committer | Simo Sorce <ssorce@redhat.com> | 2007-09-20 16:58:54 -0400 |
commit | fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8 (patch) | |
tree | c7ef1ebd964eb6c5fc42e681c5527b514338ae60 /ipa-python/ipaclient.py | |
parent | b85668579ec3fc69c2ed709533f8bd8d00e0e7e9 (diff) | |
parent | 4e79c37c604f0e51dab19fc28063b3186df0c6d9 (diff) | |
download | freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.gz freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.tar.xz freeipa-fbfefe6b0e5723b79b0f9a3a96f93e9336017fd8.zip |
Merge conflicts between rob and kevin patches
Diffstat (limited to 'ipa-python/ipaclient.py')
-rw-r--r-- | ipa-python/ipaclient.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py index 7095aac10..880b47852 100644 --- a/ipa-python/ipaclient.py +++ b/ipa-python/ipaclient.py @@ -71,6 +71,8 @@ class IPAClient: def add_user(self,user,user_container=None): """Add a user. user is a ipa.user.User object""" + realm = config.config.get_realm() + user_dict = user.toDict() # dn is set on the server-side @@ -97,11 +99,11 @@ class IPAClient: result = self.transport.get_add_schema() return result - def find_users(self, criteria, sattrs=None): + def find_users(self, criteria, sattrs=None, searchlimit=0): """Return a list: counter followed by a User object for each user that matches the criteria. If the results are truncated, counter will be set to -1""" - result = self.transport.find_users(criteria, sattrs) + result = self.transport.find_users(criteria, sattrs, searchlimit) counter = result[0] users = [counter] @@ -114,12 +116,16 @@ class IPAClient: def update_user(self,user): """Update a user entry.""" + realm = config.config.get_realm() + result = self.transport.update_user(user.origDataDict(), user.toDict()) return result def delete_user(self,uid): """Delete a user entry.""" + realm = config.config.get_realm() + result = self.transport.delete_user(uid) return result @@ -133,6 +139,8 @@ class IPAClient: def mark_user_deleted(self,uid): """Set a user as inactive by uid.""" + realm = config.config.get_realm() + result = self.transport.mark_user_deleted(uid) return result @@ -155,6 +163,8 @@ class IPAClient: def add_group(self,group,group_container=None): """Add a group. group is a ipa.group.Group object""" + realm = config.config.get_realm() + group_dict = group.toDict() # dn is set on the server-side @@ -164,13 +174,14 @@ class IPAClient: result = self.transport.add_group(group_dict, group_container) return result - def find_groups(self, criteria, sattrs=None): + def find_groups(self, criteria, sattrs=None, searchlimit=0): """Find groups whose cn matches the criteria. Wildcards are acceptable. Returns a list of Group objects.""" - result = self.transport.find_groups(criteria, sattrs) + result = self.transport.find_groups(criteria, sattrs, searchlimit) + counter = result[0] - groups = [] - for attrs in result: + groups = [counter] + for attrs in result[1:]: if attrs is not None: groups.append(group.Group(attrs)) |