Fix the client-side search size limit.

I've changed the variable name searchlimit to sizelimit to match the
name in python-ldap (and hopefully therefore be more readable).

The big change was changing the default value from 0 to -1. As 0 we were
never using the value from cn=ipaconfig

python-ldap expects this to be an int type

In the UI sizelimit was hardcoded at 0 for users

439880

2 files changed, 20 insertions, 20 deletions

diff --git a/ipa-python/ipaclient.py b/ipa-python/ipaclient.py
index 1cd541c3f..6f31dd8f0 100644
--- a/ipa-python/ipaclient.py
+++ b/ipa-python/ipaclient.py
@@ -136,11 +136,11 @@ class IPAClient:
         result = self.transport.set_custom_fields(schema)
         return result
 
-    def find_users(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    def find_users(self, criteria, sattrs=None, sizelimit=-1, 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, timelimit)
+        result = self.transport.find_users(criteria, sattrs, sizelimit, timelimit)
         counter = result[0]
 
         users = [counter]
@@ -204,10 +204,10 @@ class IPAClient:
         result = self.transport.add_group(group_dict, group_container)
         return result
 
-    def find_groups(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    def find_groups(self, criteria, sattrs=None, sizelimit=-1, 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, timelimit)
+        result = self.transport.find_groups(criteria, sattrs, sizelimit, timelimit)
         counter = result[0]
 
         groups = [counter]
@@ -387,11 +387,11 @@ class IPAClient:
     def delete_service_principal(self, principal_dn):
         return self.transport.delete_service_principal(principal_dn)
 
-    def find_service_principal(self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    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"""
-        result = self.transport.find_service_principal(criteria, sattrs, searchlimit, timelimit)
+        result = self.transport.find_service_principal(criteria, sattrs, sizelimit, timelimit)
         counter = result[0]
 
         hosts = [counter]
@@ -426,8 +426,8 @@ class IPAClient:
     def delete_radius_client(self, ip_addr, container=None):
         return self.transport.delete_radius_client(ip_addr, container)
 
-    def find_radius_clients(self, criteria, container=None, sattrs=None, searchlimit=0, timelimit=-1):
-        result = self.transport.find_radius_clients(criteria, container, sattrs, searchlimit, timelimit)
+    def find_radius_clients(self, criteria, container=None, sattrs=None, sizelimit=-1, timelimit=-1):
+        result = self.transport.find_radius_clients(criteria, container, sattrs, sizelimit, timelimit)
         counter = result[0]
 
         users = [counter]
@@ -458,8 +458,8 @@ class IPAClient:
     def delete_radius_profile(self, ip_addr, user_profile=None):
         return self.transport.delete_radius_profile(ip_addr, user_profile)
 
-    def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, searchlimit=0, timelimit=-1):
-        result = self.transport.find_radius_profiles(criteria, user_profile, sattrs, searchlimit, timelimit)
+    def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, sizelimit=-1, timelimit=-1):
+        result = self.transport.find_radius_profiles(criteria, user_profile, sattrs, sizelimit, timelimit)
         counter = result[0]
 
         users = [counter]
diff --git a/ipa-python/rpcclient.py b/ipa-python/rpcclient.py
index aaaa5bbc7..ecd42b99d 100644
--- a/ipa-python/rpcclient.py
+++ b/ipa-python/rpcclient.py
@@ -257,7 +257,7 @@ class RPCClient:
     
         return ipautil.unwrap_binary_data(result)
 
-    def find_users (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    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"""
@@ -267,7 +267,7 @@ class RPCClient:
             # None values are not allowed in XML-RPC
             if sattrs is None:
                 sattrs = "__NONE__"
-            result = server.find_users(criteria, sattrs, searchlimit, timelimit)
+            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):
@@ -383,7 +383,7 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
-    def find_groups (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    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."""
     
@@ -392,7 +392,7 @@ class RPCClient:
             # None values are not allowed in XML-RPC
             if sattrs is None:
                 sattrs = "__NONE__"
-            result = server.find_groups(criteria, sattrs, searchlimit, timelimit)
+            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):
@@ -732,7 +732,7 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
-    def find_service_principal (self, criteria, sattrs=None, searchlimit=0, timelimit=-1):
+    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"""
@@ -742,7 +742,7 @@ class RPCClient:
             # None values are not allowed in XML-RPC
             if sattrs is None:
                 sattrs = "__NONE__"
-            result = server.find_service_principal(criteria, sattrs, searchlimit, timelimit)
+            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):
@@ -818,14 +818,14 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
-    def find_radius_clients(self, criteria, container=None, sattrs=None, searchlimit=0, timelimit=-1):
+    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, searchlimit, timelimit)
+            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):
@@ -887,14 +887,14 @@ class RPCClient:
 
         return ipautil.unwrap_binary_data(result)
 
-    def find_radius_profiles(self, criteria, user_profile=None, sattrs=None, searchlimit=0, timelimit=-1):
+    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, searchlimit, timelimit)
+            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):