Backport following commits into IPA 4-1:
  57fba7a56f88c517b3ebb03842f1cc18bc129ebb
  16f47ed4520d4f89db39d1dc58be7a8efb1d8612

Patches attached.


--
Martin Basti

From 3af07555cd8913ca7b503f14dc820800c1f9dd8d Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Thu, 9 Jul 2015 13:21:16 +0200
Subject: [PATCH] Fix indicies ntUserDomainId, ntUniqueId

ntUserDomainId and ntUniqueId  contained "eq,pres" index value,
which is not valid.
---
 install/share/indices.ldif        |  6 ++++--
 install/updates/20-indices.update | 14 ++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/install/share/indices.ldif b/install/share/indices.ldif
index ad678e0b2123d961c957d3071ba48ff70bf27e7a..4a891b567e5485c0ab5705ae7fd82b39d9fcb4e2 100644
--- a/install/share/indices.ldif
+++ b/install/share/indices.ldif
@@ -89,12 +89,14 @@ nsMatchingRule: integerOrderingMatch
 dn: cn=ntUniqueId,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
 changetype: modify
 replace: nsIndexType
-nsIndexType: eq,pres
+nsIndexType: eq
+nsIndexType: pres
 
 dn: cn=ntUserDomainId,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
 changetype: modify
 replace: nsIndexType
-nsIndexType: eq,pres
+nsIndexType: eq
+nsIndexType: pres
 
 dn: cn=fqdn,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
 changetype: add
diff --git a/install/updates/20-indices.update b/install/updates/20-indices.update
index a8a432d9c28a7fb4ca74582e36d4c39fd98df2cf..b4a572b4ce41db6fa865468c8fb36046395d585e 100644
--- a/install/updates/20-indices.update
+++ b/install/updates/20-indices.update
@@ -150,3 +150,17 @@ default:ObjectClass: top
 default:ObjectClass: nsIndex
 default:nsSystemIndex: false
 only:nsIndexType: eq,pres,sub
+
+dn: cn=ntUniqueId,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
+default:cn: ntUniqueId
+default:ObjectClass: top
+default:ObjectClass: nsIndex
+only:nsIndexType: eq
+only:nsIndexType: pres
+
+dn: cn=ntUserDomainId,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
+default:cn: ntUserDomainId
+default:ObjectClass: top
+default:ObjectClass: nsIndex
+only:nsIndexType: eq
+only:nsIndexType: pres
-- 
2.4.3

From 9c7d208154af217210cc84573e8407286c09b43f Mon Sep 17 00:00:00 2001
From: Martin Basti <mba...@redhat.com>
Date: Tue, 5 May 2015 19:47:07 +0200
Subject: [PATCH] Server Upgrade: fix memberUid index

https://fedorahosted.org/freeipa/ticket/5007
---
 install/updates/20-indices.update | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/install/updates/20-indices.update b/install/updates/20-indices.update
index b4a572b4ce41db6fa865468c8fb36046395d585e..cb93f361cd554d36d8ec3c02a152deaa9b5422e3 100644
--- a/install/updates/20-indices.update
+++ b/install/updates/20-indices.update
@@ -10,7 +10,8 @@ default:cn: memberuid
 default:ObjectClass: top
 default:ObjectClass: nsIndex
 default:nsSystemIndex: false
-default:nsIndexType: eq,pres
+only:nsIndexType: eq
+only:nsIndexType: pres
 
 dn: cn=memberHost,cn=index,cn=userRoot,cn=ldbm database,cn=plugins,cn=config
 default:cn: memberHost
-- 
2.4.3

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to