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/ObjectClassSyntaxImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
index 79d81a6..2121648 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/ObjectClassSyntaxImpl.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.forgerock.opendj.ldap.schema;
@@ -116,7 +117,8 @@
reader.skipWhitespaces();
// The next set of characters must be the OID.
- SchemaUtils.readOID(reader);
+ SchemaUtils.readOID(reader,
+ schema.allowMalformedNamesAndOptions());
// At this point, we should have a pretty specific syntax that
// describes what may come next, but some of the components are
@@ -137,7 +139,8 @@
}
else if (tokenName.equalsIgnoreCase("name"))
{
- SchemaUtils.readNameDescriptors(reader);
+ SchemaUtils.readNameDescriptors(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.equalsIgnoreCase("desc"))
{
@@ -154,7 +157,8 @@
}
else if (tokenName.equalsIgnoreCase("sup"))
{
- SchemaUtils.readOIDs(reader);
+ SchemaUtils.readOIDs(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.equalsIgnoreCase("abstract"))
{
@@ -175,11 +179,13 @@
}
else if (tokenName.equalsIgnoreCase("must"))
{
- SchemaUtils.readOIDs(reader);
+ SchemaUtils.readOIDs(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.equalsIgnoreCase("may"))
{
- SchemaUtils.readOIDs(reader);
+ SchemaUtils.readOIDs(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.matches("^X-[A-Za-z_-]+$"))
{
--
Gitblit v1.10.0