From a997a5af5785ee040a9ef2bca66904c7624c0b60 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 29 Feb 2016 12:57:49 +0000
Subject: [PATCH] OPENDJ-2688 Upgrade: Error in matching rule when starting server after upgrade
---
opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java | 47 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 47 insertions(+), 0 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
index 9089f82..7a332cf 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/upgrade/Upgrade.java
@@ -580,6 +580,53 @@
"ds-cfg-java-class: org.opends.server.extensions.BcryptPasswordStorageScheme",
"ds-cfg-enabled: true"));
+ /** See OPENDJ-2683 */
+ register("4.0.0",
+ deleteConfigEntry(INFO_UPGRADE_TASK_REMOVE_MATCHING_RULES.get(),
+ "cn=Auth Password Exact Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Bit String Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Boolean Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Exact Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Exact Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Exact Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Exact IA5 Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Exact IA5 Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore IA5 Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore IA5 Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore List Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Case Ignore List Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Certificate Exact Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Directory String First Component Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Distinguished Name Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Double Metaphone Approximate Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Generalized Time Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Generalized Time Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Integer Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Integer Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Integer First Component Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Keyword Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Numeric String Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Numeric String Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Numeric String Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Object Identifier Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Object Identifier First Component Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Octet String Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Octet String Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Octet String Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Presentation Address Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Protocol Information Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Telephone Number Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Telephone Number Substring Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Time Based Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Unique Member Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=User Password Exact Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=UUID Equality Matching Rule,cn=Matching Rules,cn=config",
+ "cn=UUID Ordering Matching Rule,cn=Matching Rules,cn=config",
+ "cn=Word Equality Matching Rule,cn=Matching Rules,cn=config"));
+
/**
* All upgrades will refresh the server configuration schema and generate a new upgrade folder.
*/
--
Gitblit v1.10.0