From 61be60eef8694b2c28386faf6dd2d7c4e842addd Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 16 Jun 2011 18:00:52 +0000
Subject: [PATCH] Fix OPENDJ-198: RFC 4512 compliance for ldap-toolkit
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
index 7cd287b..15409e1 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/EnhancedGuideSyntaxImpl.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.forgerock.opendj.ldap.schema;
@@ -123,7 +124,8 @@
try
{
- SchemaUtils.readOID(new SubstringReader(ocName.substring(ocLength)));
+ SchemaUtils.readOID(new SubstringReader(ocName.substring(ocLength)),
+ schema.allowMalformedNamesAndOptions());
}
catch (final DecodeException de)
{
@@ -176,6 +178,7 @@
return false;
}
- return GuideSyntaxImpl.criteriaIsValid(criteria, valueStr, invalidReason);
+ return GuideSyntaxImpl.criteriaIsValid(schema, criteria,
+ valueStr, invalidReason);
}
}
--
Gitblit v1.10.0