diff options
-rw-r--r-- | freeipa.spec.in | 10 | ||||
-rw-r--r-- | tests/test_xmlrpc/test_permission_plugin.py | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/freeipa.spec.in b/freeipa.spec.in index 64abcc9f9..7cda33c5f 100644 --- a/freeipa.spec.in +++ b/freeipa.spec.in @@ -96,7 +96,11 @@ Requires: %{name}-python = %{version}-%{release} Requires: %{name}-client = %{version}-%{release} Requires: %{name}-admintools = %{version}-%{release} Requires: %{name}-server-selinux = %{version}-%{release} -Requires(pre): 389-ds-base >= 1.2.10.4-2 +%if 0%{?fedora} >= 17 +Requires(pre): 389-ds-base >= 1.2.11.5-1 +%else +Requires(pre): 389-ds-base >= 1.2.10.10-1 +%endif Requires: openldap-clients Requires: nss Requires: nss-tools @@ -713,6 +717,10 @@ fi %ghost %attr(0644,root,apache) %config(noreplace) %{_sysconfdir}/ipa/ca.crt %changelog +* Wed Jun 20 2012 Ondrej Hamada <ohamada@redhat.com> - 2.99.0-33 +- Set min for 389-ds-base to 1.2.11.5-1 on F17 to fix installation issue +- Set min for 389-ds-base to 1.2.10.10-1 on F16 (and lower) to fix CN case persistence + * Fri Jun 8 2012 Martin Kosek <mkosek@redhat.com> - 2.99.0-32 - Add directory /var/lib/ipa/sysupgrade for package upgrade metadata - Set min for bind-dyndb-ldap to 1.1.0-0.12.rc1 to pick up persistent search diff --git a/tests/test_xmlrpc/test_permission_plugin.py b/tests/test_xmlrpc/test_permission_plugin.py index 2e20b4f97..847b03e58 100644 --- a/tests/test_xmlrpc/test_permission_plugin.py +++ b/tests/test_xmlrpc/test_permission_plugin.py @@ -37,7 +37,7 @@ permission1_renamed_dn = DN(('cn',permission1_renamed), api.env.container_permission,api.env.basedn) permission1_renamed_ucase = u'Testperm_RN' -permission1_renamed_ucase_dn = DN(('cn',permission1_renamed_ucase.lower()), +permission1_renamed_ucase_dn = DN(('cn',permission1_renamed_ucase), api.env.container_permission,api.env.basedn) @@ -592,7 +592,7 @@ class test_permission(Declarative): summary=u'Modified permission "%s"' % permission1_renamed, result={ 'dn': lambda x: DN(x) == permission1_renamed_ucase_dn, - 'cn': [permission1_renamed_ucase.lower()], + 'cn': [permission1_renamed_ucase], 'member_privilege': [privilege1], 'type': u'user', 'permissions': [u'write'], @@ -612,7 +612,7 @@ class test_permission(Declarative): summary=u'Modified permission "%s"' % permission1_renamed_ucase, result=dict( dn=lambda x: DN(x) == permission1_renamed_ucase_dn, - cn=[permission1_renamed_ucase.lower()], + cn=[permission1_renamed_ucase], member_privilege=[privilege1], subtree=u'ldap:///cn=*,cn=test,cn=accounts,%s' % api.env.basedn, permissions=[u'write'], @@ -632,7 +632,7 @@ class test_permission(Declarative): result=[ { 'dn':lambda x: DN(x) == permission1_renamed_ucase_dn, - 'cn':[permission1_renamed_ucase.lower()], + 'cn':[permission1_renamed_ucase], 'member_privilege':[privilege1], 'subtree':u'ldap:///cn=*,cn=test,cn=accounts,%s' % api.env.basedn, 'permissions':[u'write'], |