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/NameFormSyntaxImpl.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
index 7b395b2..2eb90ae 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/schema/NameFormSyntaxImpl.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.forgerock.opendj.ldap.schema;
@@ -119,7 +120,8 @@
reader.skipWhitespaces();
// The next set of characters must be the OID.
- SchemaUtils.readOID(reader);
+ SchemaUtils.readOID(reader,
+ schema.allowMalformedNamesAndOptions());
String structuralClass = null;
Set<String> requiredAttributes = null;
@@ -143,7 +145,8 @@
}
else if (tokenName.equalsIgnoreCase("name"))
{
- SchemaUtils.readNameDescriptors(reader);
+ SchemaUtils.readNameDescriptors(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.equalsIgnoreCase("desc"))
{
@@ -160,15 +163,18 @@
}
else if (tokenName.equalsIgnoreCase("oc"))
{
- structuralClass = SchemaUtils.readOID(reader);
+ structuralClass = SchemaUtils.readOID(reader,
+ schema.allowMalformedNamesAndOptions());
}
else if (tokenName.equalsIgnoreCase("must"))
{
- requiredAttributes = SchemaUtils.readOIDs(reader);
+ requiredAttributes = 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