summaryrefslogtreecommitdiffstats
path: root/ipa-python
diff options
context:
space:
mode:
authorKevin McCarthy <kmccarth@redhat.com>2007-09-27 15:51:26 -0700
committerKevin McCarthy <kmccarth@redhat.com>2007-09-27 15:51:26 -0700
commit572b3e9fddfb2eecf1334099d4c73cfe4c0b3a56 (patch)
treeadbfc03b8a4095814691e36240f094029c86d6f3 /ipa-python
parentd95b47232de2e94e5523337e0f6b744e49061857 (diff)
downloadfreeipa-572b3e9fddfb2eecf1334099d4c73cfe4c0b3a56.tar.gz
freeipa-572b3e9fddfb2eecf1334099d4c73cfe4c0b3a56.tar.xz
freeipa-572b3e9fddfb2eecf1334099d4c73cfe4c0b3a56.zip
Make timelimit a parameter to the find methods.
Diffstat (limited to 'ipa-python')
-rw-r--r--ipa-python/ipaclient.py8
-rw-r--r--ipa-python/rpcclient.py8
2 files changed, 8 insertions, 8 deletions
diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index c653e0fa1..d047f7717 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -109,11 +109,11 @@ class IPAClient:
result = self.transport.get_add_schema()
return result
- def find_users(self, criteria, sattrs=None, searchlimit=0):
+ def find_users(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""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, searchlimit)
+ result = self.transport.find_users(criteria, sattrs, searchlimit, timelimit)
counter = result[0]
users = [counter]
@@ -193,10 +193,10 @@ class IPAClient:
result = self.transport.add_group(group_dict, group_container)
return result
- def find_groups(self, criteria, sattrs=None, searchlimit=0):
+ def find_groups(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Find groups whose cn matches the criteria. Wildcards are
acceptable. Returns a list of Group objects."""
- result = self.transport.find_groups(criteria, sattrs, searchlimit)
+ result = self.transport.find_groups(criteria, sattrs, searchlimit, timelimit)
counter = result[0]
groups = [counter]
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index f292098ac..cfeb3d20c 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -167,7 +167,7 @@ class RPCClient:
return ipautil.unwrap_binary_data(result)
- def find_users (self, criteria, sattrs=None, searchlimit=0):
+ def find_users (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""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"""
@@ -177,7 +177,7 @@ class RPCClient:
# None values are not allowed in XML-RPC
if sattrs is None:
sattrs = "__NONE__"
- result = server.find_users(criteria, sattrs, searchlimit)
+ result = server.find_users(criteria, sattrs, searchlimit, timelimit)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):
@@ -309,7 +309,7 @@ class RPCClient:
except socket.error, (value, msg):
raise xmlrpclib.Fault(value, msg)
- def find_groups (self, criteria, sattrs=None, searchlimit=0):
+ def find_groups (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
"""Return a list containing a Group object for each group that matches
the criteria."""
@@ -318,7 +318,7 @@ class RPCClient:
# None values are not allowed in XML-RPC
if sattrs is None:
sattrs = "__NONE__"
- result = server.find_groups(criteria, sattrs, searchlimit)
+ result = server.find_groups(criteria, sattrs, searchlimit, timelimit)
except xmlrpclib.Fault, fault:
raise ipaerror.gen_exception(fault.faultCode, fault.faultString)
except socket.error, (value, msg):