diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2012-05-23 11:00:24 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2012-05-30 08:46:21 +0200 |
| commit | 8d00d7c13038abc152afbd46c96108753506fb77 (patch) | |
| tree | 8d5242dee69fce097b05f961c2b104f82275213b /ipalib/plugins/user.py | |
| parent | d62b2d9be5a1162f5fdb255aa4f361ce048722fa (diff) | |
| download | freeipa-8d00d7c13038abc152afbd46c96108753506fb77.tar.gz freeipa-8d00d7c13038abc152afbd46c96108753506fb77.tar.xz freeipa-8d00d7c13038abc152afbd46c96108753506fb77.zip | |
Enforce sizelimit in permission-find, post_callback returns truncated
We actually perform two searches in permission-find. The first looks
for matches within the permission object itself. The second looks at
matches in the underlying aci.
We need to break out in two places. The first is if we find enough
matches in the permission itself. The second when we are appending
matches from acis.
The post_callback() definition needed to be modified to return
the truncated value so a plugin author can modify that value.
https://fedorahosted.org/freeipa/ticket/2322
Diffstat (limited to 'ipalib/plugins/user.py')
| -rw-r--r-- | ipalib/plugins/user.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ipalib/plugins/user.py b/ipalib/plugins/user.py index 2e069bde3..b48e68022 100644 --- a/ipalib/plugins/user.py +++ b/ipalib/plugins/user.py @@ -625,13 +625,14 @@ class user_find(LDAPSearch): def post_callback(self, ldap, entries, truncated, *args, **options): if options.get('pkey_only', False): - return + return truncated for entry in entries: (dn, attrs) = entry self.obj._convert_manager(attrs, **options) self.obj.get_password_attributes(ldap, dn, attrs) convert_nsaccountlock(attrs) output_sshpubkey(ldap, dn, attrs) + return truncated msg_summary = ngettext( '%(count)d user matched', '%(count)d users matched', 0 |