From 8956fdbf40fab0259f65144678d1ffcc759771d9 Mon Sep 17 00:00:00 2001 From: Ondrej Hamada Date: Fri, 2 Dec 2011 13:51:35 +0100 Subject: Sort password policy by priority 'ipa pwpolicy-find' output is now sorted by priority of the policies. Lower position means lower priority. Global policy is then at the bottom. The changes has also affected LDAPSearch class in baseldap.py: LDAPSearch class sorts the search results by primary key be default (which is usually 'cn'). Therefor a function pointer entries_sortfn was added. If no sorting function exists, default sorting by primary key is used. Sorting function had to be introduced due to the fact that pwpolicy's primary key is also it's 'cn' and global policy is not allowed to have any priority. https://fedorahosted.org/freeipa/ticket/2045 --- ipalib/plugins/baseldap.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'ipalib/plugins/baseldap.py') diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index cda0c497..2fdcd2b7 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -1548,6 +1548,10 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): member_param_incl_doc = _('Search for %s with these %s %s.') member_param_excl_doc = _('Search for %s without these %s %s.') + # pointer to function for entries sorting + # if no function is assigned the entries are sorted by their primary key value + entries_sortfn = None + takes_options = ( Int('timelimit?', label=_('Time Limit'), @@ -1726,9 +1730,12 @@ class LDAPSearch(BaseLDAPCommand, crud.Search): else: callback(self, ldap, entries, truncated, *args, **options) - if self.obj.primary_key: - sortfn=lambda x,y: cmp(x[1][self.obj.primary_key.name][0].lower(), y[1][self.obj.primary_key.name][0].lower()) - entries.sort(sortfn) + if not self.entries_sortfn: + if self.obj.primary_key: + sortfn=lambda x,y: cmp(x[1][self.obj.primary_key.name][0].lower(), y[1][self.obj.primary_key.name][0].lower()) + entries.sort(sortfn) + else: + entries.sort(self.entries_sortfn) if not options.get('raw', False): for e in entries: -- cgit