|
 |
7c7f29 |
From f6f3f89e723d26cdad16e0d70d21e2361b9ac8bb Mon Sep 17 00:00:00 2001
|
|
|
7c7f29 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
7c7f29 |
Date: Thu, 28 Jul 2016 22:23:20 -0700
|
|
|
7c7f29 |
Subject: [PATCH 26/29] Ticket #48936 - Duplicate collation entries
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Description: In the fix for "Ticket #53 - Need to update supported locales",
|
|
|
7c7f29 |
some locales were not set country and variant codes correctly, which caused
|
|
|
7c7f29 |
the duplicate matchintRules. Also, ig-NG was mapped to a wrong locale.
|
|
|
7c7f29 |
|
|
|
7c7f29 |
An example of the broken matchingRules.
|
|
|
7c7f29 |
Before the fix>
|
|
|
7c7f29 |
matchingRules: ( 2.16.840.1.113730.3.3.2.42.1 NAME 'caseIgnoreOrderingMatch-sk' DESC 'sk' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
|
|
|
7c7f29 |
matchingRules: ( 2.16.840.1.113730.3.3.2.211.1 NAME 'caseIgnoreOrderingMatch-sk' DESC 'sk' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
|
|
|
7c7f29 |
After the fix>
|
|
|
7c7f29 |
matchingRules: ( 2.16.840.1.113730.3.3.2.42.1 NAME 'caseIgnoreOrderingMatch-sk' DESC 'sk' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
|
|
|
7c7f29 |
matchingRules: ( 2.16.840.1.113730.3.3.2.211.1 NAME 'caseIgnoreOrderingMatch-sk-SK' DESC 'sk-SK' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )
|
|
|
7c7f29 |
|
|
|
7c7f29 |
https://fedorahosted.org/389/ticket/48936
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Reviewed by rmeggins@redhat.com (Thank you, Rich!!)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
(cherry picked from commit 3e3dff89c29afdf52a32e4d44f01bddedd60bcd3)
|
|
|
7c7f29 |
---
|
|
|
7c7f29 |
ldap/schema/slapd-collations.conf | 12 ++++++------
|
|
|
7c7f29 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
diff --git a/ldap/schema/slapd-collations.conf b/ldap/schema/slapd-collations.conf
|
|
|
7c7f29 |
index 9f653e4..31fa477 100644
|
|
|
7c7f29 |
--- a/ldap/schema/slapd-collations.conf
|
|
|
7c7f29 |
+++ b/ldap/schema/slapd-collations.conf
|
|
|
7c7f29 |
@@ -88,7 +88,7 @@ collation as "" "" 1 3 2.16.840.1.113730.3.3.2.71.1 as
|
|
|
7c7f29 |
collation as IN "" 1 3 2.16.840.1.113730.3.3.2.72.1 as-IN
|
|
|
7c7f29 |
collation az "" "" 1 3 2.16.840.1.113730.3.3.2.73.1 az
|
|
|
7c7f29 |
collation az Latn "" 1 3 2.16.840.1.113730.3.3.2.74.1 az-Latn
|
|
|
7c7f29 |
-collation az Latn_AZ "" 1 3 2.16.840.1.113730.3.3.2.75.1 az-Latn-AZ
|
|
|
7c7f29 |
+collation az Latn AZ 1 3 2.16.840.1.113730.3.3.2.75.1 az-Latn-AZ
|
|
|
7c7f29 |
collation bn "" "" 1 3 2.16.840.1.113730.3.3.2.76.1 bn
|
|
|
7c7f29 |
collation bn BD "" 1 3 2.16.840.1.113730.3.3.2.77.1 bn-BD
|
|
|
7c7f29 |
collation bn IN "" 1 3 2.16.840.1.113730.3.3.2.78.1 bn-IN
|
|
|
7c7f29 |
@@ -189,8 +189,8 @@ collation ha Latn NG 1 3 2.16.840.1.113730.3.3.2.172.1 ha-Latn-NG
|
|
|
7c7f29 |
collation he "" "" 1 3 2.16.840.1.113730.3.3.2.173.1 he he-IL
|
|
|
7c7f29 |
collation hi "" "" 1 3 2.16.840.1.113730.3.3.2.174.1 hi hi-IN
|
|
|
7c7f29 |
collation hy "" "" 1 3 2.16.840.1.113730.3.3.2.175.1 hy hy-AM
|
|
|
7c7f29 |
-collation id "" "" 1 3 2.16.840.1.113730.3.3.2.176.1 id-ID
|
|
|
7c7f29 |
-collation id ID "" 1 3 2.16.840.1.113730.3.3.2.177.1 ig-NG
|
|
|
7c7f29 |
+collation id "" "" 1 3 2.16.840.1.113730.3.3.2.176.1 id id-ID
|
|
|
7c7f29 |
+collation ig "" "" 1 3 2.16.840.1.113730.3.3.2.177.1 ig ig-NG
|
|
|
7c7f29 |
collation it IT "" 1 3 2.16.840.1.113730.3.3.2.178.1 it-IT
|
|
|
7c7f29 |
collation ka "" "" 1 3 2.16.840.1.113730.3.3.2.179.1 ka
|
|
|
7c7f29 |
collation ka GE "" 1 3 2.16.840.1.113730.3.3.2.180.1 ka-GE
|
|
|
7c7f29 |
@@ -224,9 +224,9 @@ collation ru MD "" 1 3 2.16.840.1.113730.3.3.2.207.1 ru-MD
|
|
|
7c7f29 |
collation ru RU "" 1 3 2.16.840.1.113730.3.3.2.208.1 ru-RU
|
|
|
7c7f29 |
collation ru UA "" 1 3 2.16.840.1.113730.3.3.2.209.1 ru-UA
|
|
|
7c7f29 |
collation si "" "" 1 3 2.16.840.1.113730.3.3.2.210.1 si si-LK
|
|
|
7c7f29 |
-collation sk "" "" 1 3 2.16.840.1.113730.3.3.2.211.1 sk sk-SK
|
|
|
7c7f29 |
-collation sl "" "" 1 3 2.16.840.1.113730.3.3.2.212.1 sl sl-SI
|
|
|
7c7f29 |
-collation sq "" "" 1 3 2.16.840.1.113730.3.3.2.213.1 sq sq-AL
|
|
|
7c7f29 |
+collation sk SK "" 1 3 2.16.840.1.113730.3.3.2.211.1 sk-SK
|
|
|
7c7f29 |
+collation sl SI "" 1 3 2.16.840.1.113730.3.3.2.212.1 sl-SI
|
|
|
7c7f29 |
+collation sq AL "" 1 3 2.16.840.1.113730.3.3.2.213.1 sq-AL
|
|
|
7c7f29 |
collation sr Cyrl "" 1 3 2.16.840.1.113730.3.3.2.214.1 sr-Cyrl
|
|
|
7c7f29 |
collation sr Cyrl BA 1 3 2.16.840.1.113730.3.3.2.215.1 sr-Cyrl-BA
|
|
|
7c7f29 |
collation sr Cyrl ME 1 3 2.16.840.1.113730.3.3.2.216.1 sr-Cyrl-ME
|
|
|
7c7f29 |
--
|
|
|
7c7f29 |
2.4.11
|
|
|
7c7f29 |
|