diff options
| -rw-r--r-- | ipalib/plugins/config.py | 8 | ||||
| -rw-r--r-- | ipaserver/plugins/ldap2.py | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ipalib/plugins/config.py b/ipalib/plugins/config.py index cabfd7610..438f66385 100644 --- a/ipalib/plugins/config.py +++ b/ipalib/plugins/config.py @@ -68,8 +68,14 @@ from ipalib import api from ipalib import Bool, Int, Str, IA5Str from ipalib.plugins.baseldap import * from ipalib import _ +from ipalib.errors import ValidationError +def validate_searchtimelimit(ugettext, limit): + if limit == 0: + raise ValidationError(name='ipasearchtimelimit', error=_('searchtimelimit must be -1 or > 1.')) + return None + class config(LDAPObject): """ IPA configuration object @@ -110,7 +116,7 @@ class config(LDAPObject): label=_('Default e-mail domain'), doc=_('Default e-mail domain new users'), ), - Int('ipasearchtimelimit?', + Int('ipasearchtimelimit?', validate_searchtimelimit, cli_name='searchtimelimit', label=_('Search time limit'), doc=_('Max. amount of time (sec.) for a search (-1 is unlimited)'), diff --git a/ipaserver/plugins/ldap2.py b/ipaserver/plugins/ldap2.py index a728199eb..b49a7832f 100644 --- a/ipaserver/plugins/ldap2.py +++ b/ipaserver/plugins/ldap2.py @@ -535,6 +535,8 @@ class ldap2(CrudBackend, Encoder): time_limit = config.get('ipasearchtimelimit', [-1])[0] if size_limit is None: size_limit = config.get('ipasearchrecordslimit', [0])[0] + if time_limit == 0: + time_limit = -1 if not isinstance(size_limit, int): size_limit = int(size_limit) if not isinstance(time_limit, float): |