From 7e7a1559e6d835db9dc861d891fa2070c21972dc Mon Sep 17 00:00:00 2001
From: Chris Ridd <chris.ridd@forgerock.com>
Date: Tue, 14 May 2013 16:05:08 +0000
Subject: [PATCH] CR-1688 Fix OPENDJ-905 X-SCHEMA-FILE should not allow directory path separators

---
 opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
index 96dde40..76a2092 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -23,7 +23,7 @@
  *
  *
  *      Copyright 2006-2009 Sun Microsystems, Inc.
- *      Portions Copyright 2011-2012 ForgeRock AS
+ *      Portions Copyright 2011-2013 ForgeRock AS
  */
 package org.opends.server.schema;
 
@@ -54,6 +54,7 @@
 import org.opends.server.config.ConfigException;
 import org.opends.server.types.ByteSequence;
 import org.opends.server.types.ByteString;
+import org.opends.server.types.CommonSchemaElements;
 import org.opends.server.types.DirectoryException;
 
 import static org.opends.server.schema.SchemaConstants.*;
@@ -583,6 +584,9 @@
       // Schema backend.
       syntax = new LDAPSyntaxDescriptionSyntax();
     }
+
+    CommonSchemaElements.checkSafeProperties(extraProperties);
+
     //Since we reached here it means everything is OK.
     return new LDAPSyntaxDescription(valueStr,syntax,
                                      description,extraProperties);

--
Gitblit v1.10.0