From a052caad0008ede711b0c43d9955eccc3bb858ba Mon Sep 17 00:00:00 2001
From: matthew_swift <matthew_swift@localhost>
Date: Wed, 26 Sep 2007 12:21:02 +0000
Subject: [PATCH] Merge branches/temp-admin@3208 onto trunk@3208.

---
 opendj-sdk/opends/resource/schema/02-config.ldif |  721 +++++++++++++++++++-----------------------------------
 1 files changed, 259 insertions(+), 462 deletions(-)

diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index b71882a..3150f3b 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -31,16 +31,10 @@
 objectClass: ldapSubentry
 objectClass: subschema
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.1
-  NAME 'ds-cfg-acl-handler-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-java-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.2
-  NAME 'ds-cfg-acl-handler-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.3
-  NAME 'ds-cfg-alert-handler-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.4
-  NAME 'ds-cfg-alert-handler-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.5
   NAME 'ds-cfg-allow-attribute-name-exceptions'
@@ -49,7 +43,7 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.6 NAME 'ds-cfg-allowed-client'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.7
-  NAME 'ds-cfg-allow-ldapv2' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
+  NAME 'ds-cfg-allow-ldap-v2' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.8
   NAME 'ds-cfg-allow-start-tls' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
@@ -57,26 +51,20 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.9
   NAME 'ds-cfg-allow-tcp-reuse-address' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.10 NAME 'ds-cfg-backend-base-dn'
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.10 NAME 'ds-cfg-base-dn'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.11 NAME 'ds-cfg-backend-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.12
-  NAME 'ds-cfg-backend-directory' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.13
-  NAME 'ds-cfg-backend-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-db-directory' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.14 NAME 'ds-cfg-backend-id'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.15
-  NAME 'ds-cfg-backend-index-entry-limit'
+  NAME 'ds-cfg-index-entry-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.16
-  NAME 'ds-cfg-backend-subtree-delete-size-limit'
+  NAME 'ds-cfg-subtree-delete-size-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.17 NAME 'ds-cfg-alternate-bind-dn'
@@ -84,43 +72,31 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.18
   NAME 'ds-cfg-certificate-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.19
-  NAME 'ds-cfg-certificate-mapper-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.20
-  NAME 'ds-cfg-certificate-mapper-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.21 NAME 'ds-cfg-check-schema'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.22
-  NAME 'ds-cfg-client-certificate-validation-policy'
+  NAME 'ds-cfg-certificate-validation-policy'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.23
-  NAME 'ds-cfg-connection-handler-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.24
-  NAME 'ds-cfg-connection-handler-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.25
-  NAME 'ds-cfg-database-cache-percent' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  NAME 'ds-cfg-db-cache-percent' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.26
-  NAME 'ds-cfg-database-cleaner-min-utilization'
+  NAME 'ds-cfg-db-cleaner-min-utilization'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.27
-  NAME 'ds-cfg-database-cache-size' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-db-cache-size' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.28
-  NAME 'ds-cfg-database-run-cleaner' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-db-run-cleaner' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.29
-  NAME 'ds-cfg-database-txn-no-sync' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-db-txn-no-sync' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.30
-  NAME 'ds-cfg-database-txn-write-no-sync' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-db-txn-write-no-sync' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.31
   NAME 'ds-cfg-default-severity' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -131,20 +107,6 @@
   NAME 'ds-cfg-enable-profiling-on-startup'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.34
-  NAME 'ds-cfg-entry-cache-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.35
-  NAME 'ds-cfg-entry-cache-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.36
-  NAME 'ds-cfg-extended-operation-handler-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.37
-  NAME 'ds-cfg-extended-operation-handler-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.38 NAME 'ds-cfg-exclude-filter'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.39
@@ -153,10 +115,7 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.320  NAME 'ds-cfg-global-aci'
   SYNTAX 1.3.6.1.4.1.26027.1.3.4 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.40
-  NAME 'ds-cfg-index-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.41
-  NAME 'ds-cfg-index-entry-limit' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  NAME 'ds-cfg-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.42 NAME 'ds-cfg-index-type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
@@ -175,13 +134,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.47 NAME 'ds-cfg-keep-stats'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.48
-  NAME 'ds-cfg-key-manager-provider-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.49
-  NAME 'ds-cfg-key-manager-provider-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.50 NAME 'ds-cfg-key-store-file'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
@@ -212,18 +164,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.59 NAME 'ds-cfg-log-file'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.60 NAME 'ds-cfg-logger-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.61
-  NAME 'ds-cfg-logger-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.62
-  NAME 'ds-cfg-matching-rule-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.63
-  NAME 'ds-cfg-matching-rule-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.64
   NAME 'ds-cfg-max-allowed-client-connections'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
@@ -241,12 +181,6 @@
   NAME 'ds-cfg-max-work-queue-capacity'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.69
-  NAME 'ds-cfg-monitor-provider-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.70
-  NAME 'ds-cfg-monitor-provider-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.71
   NAME 'ds-cfg-notify-abandoned-operations'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
@@ -262,28 +196,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.74
   NAME 'ds-cfg-override-severity' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.75
-  NAME 'ds-cfg-password-storage-scheme-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.76
-  NAME 'ds-cfg-password-storage-scheme-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.77
-  NAME 'ds-cfg-password-validator-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.78
-  NAME 'ds-cfg-password-validator-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.79 NAME 'ds-cfg-plugin-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.80 NAME 'ds-cfg-plugin-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.81 NAME 'ds-cfg-plugin-type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.82 NAME 'ds-cfg-profile-action'
@@ -312,10 +224,10 @@
   NAME 'ds-cfg-rotation-action' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.90
-  NAME 'ds-cfg-rotation-policy-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-rotation-policy' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.91
-  NAME 'ds-cfg-retention-policy-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-retention-policy' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.92 NAME 'ds-cfg-number-of-files'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 X-ORIGIN 'OpenDS Directory Server' )
@@ -367,18 +279,10 @@
   NAME 'ds-task-state' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.109
-  NAME 'ds-cfg-thread-time-interval' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-time-interval' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.110 NAME 'ds-cfg-buffer-size'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.111
-  NAME 'ds-cfg-sasl-mechanism-handler-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.112
-  NAME 'ds-cfg-sasl-mechanism-handler-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.113
   NAME 'ds-cfg-schema-entry-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
@@ -405,7 +309,7 @@
   NAME 'ds-cfg-ssl-cert-nickname' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.121
-  NAME 'ds-cfg-strict-telephone-number-format'
+  NAME 'ds-cfg-strict-format'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.122
@@ -419,23 +323,9 @@
   NAME 'ds-cfg-suppress-synchronization-operations'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.124 NAME 'ds-cfg-syntax-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.125 NAME 'ds-cfg-syntax-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.126 NAME 'ds-cfg-time-of-day'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.36
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.127
-  NAME 'ds-cfg-trust-manager-provider-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.128
-  NAME 'ds-cfg-trust-manager-provider-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.129
   NAME 'ds-cfg-trust-store-file' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
@@ -456,7 +346,7 @@
   NAME 'ds-cfg-trust-store-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.135 NAME 'ds-cfg-user-base-dn'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.136
   NAME 'ds-cfg-user-name-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -465,10 +355,10 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.138
-  NAME 'ds-cfg-use-tcp-keepalive' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-use-tcp-keep-alive' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.139
-  NAME 'ds-cfg-use-tcp-nodelay' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+  NAME 'ds-cfg-use-tcp-no-delay' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.140
   NAME 'ds-cfg-allow-zero-length-values' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
@@ -482,12 +372,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.143
   NAME 'ds-cfg-server-error-result-code' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.144
-  NAME 'ds-cfg-identity-mapper-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.145
-  NAME 'ds-cfg-identity-mapper-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.146
   NAME 'ds-cfg-match-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
   X-ORIGIN 'OpenDS Directory Server' )
@@ -495,10 +379,10 @@
   NAME 'ds-cfg-match-base-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.148
-  NAME 'ds-cfg-identity-mapper-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-identity-mapper' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.149
-  NAME 'ds-cfg-proxied-authorization-identity-mapper-dn'
+  NAME 'ds-cfg-proxied-authorization-identity-mapper'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.150 NAME 'ds-cfg-time-limit'
@@ -513,14 +397,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.153
   NAME 'ds-cfg-accept-backlog' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.154
-  NAME 'ds-cfg-synchronization-provider-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.155
-  NAME 'ds-cfg-synchronization-provider-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.156 NAME 'ds-sync-hist'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 ORDERING historicalCsnOrderingMatch
   USAGE directoryOperation X-ORIGIN 'OpenDS Directory Server' )
@@ -529,11 +405,11 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.158
-  NAME ( 'ds-cfg-replication-server-port' 'ds-cfg-changelog-port' )
+  NAME ( 'ds-cfg-replication-port' 'ds-cfg-changelog-port' )
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.290
-  NAME ( 'ds-cfg-replication-max-queue-size' 'ds-cfg-changelog-max-queue-size' )
+  NAME ( 'ds-cfg-queue-size' 'ds-cfg-changelog-max-queue-size' )
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.278
@@ -541,7 +417,7 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.279
-  NAME 'ds-cfg-directory-server-id'
+  NAME 'ds-cfg-server-id'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.160
@@ -551,9 +427,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.161
   NAME 'ds-cfg-writability-mode' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.162
-  NAME 'ds-cfg-backend-writability-mode' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.163
   NAME 'ds-cfg-bind-with-dn-requires-password'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
@@ -579,10 +452,10 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.168
-  NAME 'ds-cfg-maximum-password-length' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  NAME 'ds-cfg-max-password-length' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.169
-  NAME 'ds-cfg-minimum-password-length' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  NAME 'ds-cfg-min-password-length' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.170
   NAME 'ds-cfg-password-character-set' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -590,14 +463,8 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.171
   NAME 'ds-cfg-password-format' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.172
-  NAME 'ds-cfg-password-generator-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.173
-  NAME 'ds-cfg-password-generator-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.174
-  NAME 'ds-cfg-account-status-notification-handler-dn'
+  NAME 'ds-cfg-account-status-notification-handler'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.175
   NAME 'ds-cfg-allow-expired-password-changes'
@@ -610,10 +477,10 @@
   NAME 'ds-cfg-allow-user-password-changes' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.178
-  NAME 'ds-cfg-default-password-storage-scheme-dn'
+  NAME 'ds-cfg-default-password-storage-scheme'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.179
-  NAME 'ds-cfg-deprecated-password-storage-scheme-dn'
+  NAME 'ds-cfg-deprecated-password-storage-scheme'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.180
   NAME 'ds-cfg-expire-passwords-without-warning'
@@ -645,13 +512,13 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.189
-  NAME 'ds-cfg-maximum-password-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-max-password-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.190
-  NAME 'ds-cfg-maximum-password-reset-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-max-password-reset-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.191
-  NAME 'ds-cfg-minimum-password-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-min-password-age' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.192
   NAME 'ds-cfg-password-attribute' SYNTAX 1.3.6.1.4.1.1466.115.121.1.38
@@ -661,10 +528,10 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.194
-  NAME 'ds-cfg-password-generator-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-password-generator' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.195
-  NAME 'ds-cfg-password-validator-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-password-validator' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.196
   NAME 'ds-cfg-previous-last-login-time-format'
@@ -777,10 +644,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.225
   NAME 'ds-task-restart-server' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.226
-  NAME ( 'ds-cfg-replication-dn' 'ds-cfg-synchronization-dn' )
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.227 NAME 'ds-sync-state'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE directoryOperation
   X-ORIGIN 'OpenDS Directory Server' )
@@ -907,87 +770,76 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.261
-  NAME 'ds-cfg-backend-preload-time-limit'
+  NAME 'ds-cfg-preload-time-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.262
-  NAME 'ds-cfg-backend-import-temp-directory'
+  NAME 'ds-cfg-import-temp-directory'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.263
-  NAME 'ds-cfg-backend-import-buffer-size'
+  NAME 'ds-cfg-import-buffer-size'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.264
-  NAME 'ds-cfg-backend-import-queue-size'
+  NAME 'ds-cfg-import-queue-size'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.265
-  NAME 'ds-cfg-backend-import-thread-count'
+  NAME 'ds-cfg-import-thread-count'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.266
-  NAME 'ds-cfg-backend-entries-compressed'
+  NAME 'ds-cfg-entries-compressed'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.267
-  NAME 'ds-cfg-backend-deadlock-retry-limit'
+  NAME 'ds-cfg-deadlock-retry-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.268
-  NAME 'ds-cfg-database-evictor-lru-only'
+  NAME 'ds-cfg-db-evictor-lru-only'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.269
-  NAME 'ds-cfg-database-evictor-nodes-per-scan'
+  NAME 'ds-cfg-db-evictor-nodes-per-scan'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.270
-  NAME 'ds-cfg-database-log-file-max'
+  NAME 'ds-cfg-db-log-file-max'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.271
-  NAME 'ds-cfg-database-logging-file-handler-on'
+  NAME 'ds-cfg-db-logging-file-handler-on'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.272
-  NAME 'ds-cfg-database-logging-level'
+  NAME 'ds-cfg-db-logging-level'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.273
-  NAME 'ds-cfg-database-checkpointer-bytes-interval'
+  NAME 'ds-cfg-db-checkpointer-bytes-interval'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.274
-  NAME 'ds-cfg-database-checkpointer-wakeup-interval'
+  NAME 'ds-cfg-db-checkpointer-wakeup-interval'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.275
-  NAME 'ds-cfg-database-lock-num-lock-tables'
+  NAME 'ds-cfg-db-num-lock-tables'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.276
-  NAME 'ds-cfg-work-queue-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.277
-  NAME 'ds-cfg-backend-import-pass-size' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
+  NAME 'ds-cfg-import-pass-size' SYNTAX 1.3.6.1.4.1.1466.115.121.1.27
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.280
   NAME 'ds-pwp-account-expiration-time' SYNTAX 1.3.6.1.4.1.1466.115.121.1.24
   SINGLE-VALUE USAGE directoryOperation X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.281
-  NAME 'ds-cfg-account-status-notification-handler-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.282
-  NAME 'ds-cfg-account-status-notification-handler-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.283
   NAME 'ds-cfg-account-status-notification-type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.284
-  NAME 'ds-cfg-database-cleaner-num-threads'
+  NAME 'ds-cfg-db-num-cleaner-threads'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.285
@@ -997,7 +849,7 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.286 NAME 'ds-rlim-lookthrough-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE USAGE directoryOperation
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.287 NAME 'ds-cfg-backend-mode'
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.287 NAME 'ds-cfg-db-directory-permissions'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.289 NAME 'ds-pwp-password-policy-dn'
@@ -1038,13 +890,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.302
   NAME 'ds-task-schema-file-name' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.303
-  NAME 'ds-cfg-group-implementation-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.304
-  NAME 'ds-cfg-group-implementation-enabled'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.305
   NAME 'ds-cfg-heartbeat-interval'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
@@ -1060,36 +905,33 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.308
   NAME 'ds-cfg-default-root-privilege-name'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.309 NAME 'ds-cfg-certificate-mapper-dn'
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.309 NAME 'ds-cfg-certificate-mapper'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.310
-  NAME 'ds-cfg-key-manager-provider-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-key-manager-provider' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.311
-  NAME 'ds-cfg-trust-manager-provider-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-trust-manager-provider' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.312
-  NAME 'ds-cfg-certificate-subject-attribute-type'
+  NAME 'ds-cfg-subject-attribute'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.313
-  NAME 'ds-cfg-certificate-user-base-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.314
   NAME 'ds-certificate-subject-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.315
-  NAME 'ds-cfg-certificate-subject-attribute-mapping'
+  NAME 'ds-cfg-subject-attribute-mapping'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.316 NAME 'ds-certificate-fingerprint'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.317
-  NAME 'ds-cfg-certificate-fingerprint-attribute-type'
+  NAME 'ds-cfg-fingerprint-attribute'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.318
-  NAME 'ds-cfg-certificate-fingerprint-algorithm'
+  NAME 'ds-cfg-fingerprint-algorithm'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.319
@@ -1097,41 +939,32 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.321
-  NAME 'ds-cfg-minimum-password-difference'
+  NAME 'ds-cfg-min-password-difference'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.322
-  NAME 'ds-cfg-minimum-unique-characters'
+  NAME 'ds-cfg-min-unique-characters'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.323
-  NAME 'ds-cfg-maximum-consecutive-length'
+  NAME 'ds-cfg-max-consecutive-length'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.324
   NAME 'ds-cfg-case-sensitive-validation'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.325
-  NAME 'ds-cfg-virtual-attribute-class' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.326
-  NAME 'ds-cfg-virtual-attribute-enabled' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.327
-  NAME 'ds-cfg-virtual-attribute-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.328
-  NAME 'ds-cfg-virtual-attribute-base-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-attribute-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.329
-  NAME 'ds-cfg-virtual-attribute-group-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-group-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.330
-  NAME 'ds-cfg-virtual-attribute-filter' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-filter' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.331
-  NAME 'ds-cfg-virtual-attribute-conflict-behavior'
+  NAME 'ds-cfg-conflict-behavior'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.332
@@ -1179,7 +1012,7 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.344
-  NAME 'ds-cfg-virtual-attribute-value' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  NAME 'ds-cfg-value' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.345
   NAME 'ds-cfg-default-debug-level'
@@ -1234,19 +1067,19 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.358
-  NAME 'ds-cfg-asynchronous-writes'
+  NAME 'ds-cfg-asynchronous'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.359
-  NAME 'ds-cfg-log-file-mode'
+  NAME 'ds-cfg-log-file-permissions'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.360
-  NAME 'ds-cfg-writer-auto-flush'
+  NAME 'ds-cfg-auto-flush'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.361
-  NAME 'ds-cfg-writer-append'
+  NAME 'ds-cfg-append'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.362
@@ -1264,18 +1097,6 @@
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.375
   NAME 'ds-cfg-allow-retrieving-membership' SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
   SINGLE-VALUE X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.376
-  NAME 'ds-cfg-rotation-policy-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.377
-  NAME 'ds-cfg-retention-policy-class'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.378
-  NAME 'ds-cfg-log-queue-size'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.379
   NAME 'ds-cfg-file-size-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
@@ -1284,11 +1105,11 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   USAGE directoryOperation X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.381
-  NAME 'ds-cfg-backend-subtree-delete-batch-size'
+  NAME 'ds-cfg-subtree-delete-batch-size'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.382
-  NAME 'ds-cfg-index-substring-length'
+  NAME 'ds-cfg-substring-length'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.384 NAME 'ds-cfg-plugin-order-startup'
@@ -1466,32 +1287,26 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.429
-  NAME 'ds-cfg-default-user-password-storage-scheme-dn'
+  NAME 'ds-cfg-default-user-password-storage-scheme'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.430
-  NAME 'ds-cfg-default-auth-password-storage-scheme-dn'
+  NAME 'ds-cfg-default-auth-password-storage-scheme'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.435
-  NAME 'ds-cfg-strip-syntax-minimum-upper-bound'
+  NAME 'ds-cfg-strip-syntax-min-upper-bound'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.437
-  NAME 'ds-cfg-vlv-je-index-base-dn'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.12 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.438
-  NAME 'ds-cfg-vlv-je-index-scope'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.439
-  NAME 'ds-cfg-vlv-je-index-filter'
+  NAME 'ds-cfg-scope'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.440
-  NAME 'ds-cfg-vlv-je-index-sort-order'
+  NAME 'ds-cfg-sort-order'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.441
-  NAME 'ds-cfg-vlv-je-index-name'
+  NAME 'ds-cfg-name'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.442
-  NAME 'ds-cfg-vlv-je-index-maximum-block-size'
+  NAME 'ds-cfg-max-block-size'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.27 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.443
   NAME 'ds-cfg-state-update-failure-policy'
@@ -1578,13 +1393,10 @@
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.467
-  NAME 'ds-cfg-unique-attribute-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.468
-  NAME 'ds-cfg-unique-attribute-base-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
+  NAME 'ds-cfg-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.471
-  NAME 'ds-cfg-backend-compact-encoding'
+  NAME 'ds-cfg-compact-encoding'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.481
@@ -1616,7 +1428,7 @@
   NAME 'ds-cfg-email-address-attribute-type'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.477
-  NAME 'ds-cfg-send-notification-without-end-user-address'
+  NAME 'ds-cfg-send-message-without-end-user-address'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.478
@@ -1626,38 +1438,23 @@
   NAME 'ds-cfg-save-config-on-successful-startup'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.474
-  NAME 'ds-cfg-referential-integrity-log-file'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.475
-  NAME 'ds-cfg-referential-integrity-update-interval'
+  NAME 'ds-cfg-update-interval'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.472
-  NAME 'ds-cfg-referential-integrity-attribute-type'
-  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.473
-   NAME 'ds-cfg-referential-integrity-base-dn'
-   SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.486
   NAME 'ds-cfg-max-blocked-write-time-limit'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.487
-  NAME 'ds-cfg-7-bit-clean-attribute-type' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
-  X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.26027.1.1.488
-  NAME 'ds-cfg-7-bit-clean-base-dn' SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
-  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.489 NAME 'ds-cfg-ldif-directory'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.490 NAME 'ds-cfg-poll-interval'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
   X-ORIGIN 'OpenDS Directory Server' )
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.999.999 NAME 'ds-cfg-isolation-policy'
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
+  X-ORIGIN 'OpenDS Directory Server' )
 attributeTypes: ( 1.3.6.1.4.1.26027.1.1.491
   NAME 'ds-cfg-plugin-order-post-synchronization-add'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE
@@ -1686,56 +1483,56 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.1
   NAME 'ds-cfg-access-control-handler' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-acl-handler-class $ ds-cfg-acl-handler-enabled )
+  MUST ( cn $ ds-cfg-java-class $ ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.87
-  NAME 'ds-cfg-dseecompat-access-control-handler'
+  NAME 'ds-cfg-dsee-compat-access-control-handler'
   SUP ds-cfg-access-control-handler
   STRUCTURAL MAY ds-cfg-global-aci
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.2
   NAME 'ds-cfg-alert-handler' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-alert-handler-class $ ds-cfg-alert-handler-enabled )
+  MUST ( cn $ ds-cfg-java-class $ ds-cfg-enabled )
   MAY ( ds-cfg-enabled-alert-type $ ds-cfg-disabled-alert-type )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.3 NAME 'ds-cfg-attribute-syntax'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-syntax-class $ ds-cfg-syntax-enabled )
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-java-class $ ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.116
   NAME 'ds-cfg-attribute-type-description-attribute-syntax'
   SUP ds-cfg-attribute-syntax  STRUCTURAL
-  MAY ( ds-cfg-strip-syntax-minimum-upper-bound )
+  MAY ( ds-cfg-strip-syntax-min-upper-bound )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.4
   NAME 'ds-cfg-telephone-number-attribute-syntax'
   SUP ds-cfg-attribute-syntax STRUCTURAL
-  MAY ds-cfg-strict-telephone-number-format X-ORIGIN 'OpenDS Directory Server' )
+  MAY ds-cfg-strict-format X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.5 NAME 'ds-cfg-backend'
-  SUP top STRUCTURAL MUST ( ds-cfg-backend-id $ ds-cfg-backend-base-dn $
-  ds-cfg-backend-class $ ds-cfg-backend-enabled $
-  ds-cfg-backend-writability-mode ) X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.6 NAME 'ds-cfg-je-backend'
-  SUP ds-cfg-backend STRUCTURAL MUST ds-cfg-backend-directory
-  MAY ( ds-cfg-backend-index-entry-limit $
-  ds-cfg-backend-subtree-delete-size-limit $ ds-cfg-backend-preload-time-limit $
-  ds-cfg-backend-import-temp-directory $ ds-cfg-backend-import-buffer-size $
-  ds-cfg-backend-import-queue-size $ ds-cfg-backend-import-thread-count $
-  ds-cfg-backend-entries-compressed $ ds-cfg-backend-deadlock-retry-limit $
-  ds-cfg-backend-import-pass-size $ ds-cfg-backend-mode $
-  ds-cfg-database-cache-percent $ ds-cfg-backend-subtree-delete-batch-size $
-  ds-cfg-database-cache-size $ ds-cfg-database-txn-no-sync $
-  ds-cfg-database-txn-write-no-sync $ ds-cfg-database-run-cleaner $
-  ds-cfg-database-cleaner-min-utilization $ ds-cfg-database-evictor-lru-only $
-  ds-cfg-database-evictor-nodes-per-scan $ ds-cfg-database-log-file-max $
-  ds-cfg-database-logging-file-handler-on $ ds-cfg-database-logging-level $
-  ds-cfg-database-checkpointer-bytes-interval $
-  ds-cfg-database-checkpointer-wakeup-interval $
-  ds-cfg-database-lock-num-lock-tables $ ds-cfg-database-cleaner-num-threads $
-  ds-cfg-backend-compact-encoding $ ds-cfg-je-property )
+  SUP top STRUCTURAL MUST ( ds-cfg-backend-id $ ds-cfg-base-dn $
+  ds-cfg-java-class $ ds-cfg-enabled $
+  ds-cfg-writability-mode ) X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.6 NAME 'ds-cfg-local-db-backend'
+  SUP ds-cfg-backend STRUCTURAL MUST ds-cfg-db-directory
+  MAY ( ds-cfg-index-entry-limit $
+  ds-cfg-subtree-delete-size-limit $ ds-cfg-preload-time-limit $
+  ds-cfg-import-temp-directory $ ds-cfg-import-buffer-size $
+  ds-cfg-import-queue-size $ ds-cfg-import-thread-count $
+  ds-cfg-entries-compressed $ ds-cfg-deadlock-retry-limit $
+  ds-cfg-import-pass-size $ ds-cfg-db-directory-permissions $
+  ds-cfg-db-cache-percent $ ds-cfg-subtree-delete-batch-size $
+  ds-cfg-db-cache-size $ ds-cfg-db-txn-no-sync $
+  ds-cfg-db-txn-write-no-sync $ ds-cfg-db-run-cleaner $
+  ds-cfg-db-cleaner-min-utilization $ ds-cfg-db-evictor-lru-only $
+  ds-cfg-db-evictor-nodes-per-scan $ ds-cfg-db-log-file-max $
+  ds-cfg-db-logging-file-handler-on $ ds-cfg-db-logging-level $
+  ds-cfg-db-checkpointer-bytes-interval $
+  ds-cfg-db-checkpointer-wakeup-interval $
+  ds-cfg-db-num-lock-tables $ ds-cfg-db-num-cleaner-threads $
+  ds-cfg-compact-encoding $ ds-cfg-je-property )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.8 NAME 'ds-cfg-je-index' SUP top
-  STRUCTURAL MUST ( ds-cfg-index-attribute $ ds-cfg-index-type )
-  MAY ( ds-cfg-index-entry-limit $ ds-cfg-index-substring-length )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.8 NAME 'ds-cfg-local-db-index' SUP top
+  STRUCTURAL MUST ( ds-cfg-attribute $ ds-cfg-index-type )
+  MAY ( ds-cfg-index-entry-limit $ ds-cfg-substring-length )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.9 NAME 'ds-cfg-schema-backend'
   SUP ds-cfg-backend STRUCTURAL
@@ -1749,28 +1546,28 @@
   SUP top STRUCTURAL MUST cn X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.12
   NAME 'ds-cfg-certificate-mapper' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-certificate-mapper-class $
-  ds-cfg-certificate-mapper-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.13
   NAME 'ds-cfg-connection-handler' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-connection-handler-class $
-  ds-cfg-connection-handler-enabled ) MAY ( ds-cfg-allowed-client $
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) MAY ( ds-cfg-allowed-client $
   ds-cfg-denied-client ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.14
   NAME 'ds-cfg-ldap-connection-handler' SUP ds-cfg-connection-handler
   STRUCTURAL MUST ds-cfg-listen-port MAY ( ds-cfg-listen-address $
-  ds-cfg-allow-ldapv2 $ ds-cfg-keep-stats $ ds-cfg-use-tcp-keepalive $
-  ds-cfg-use-tcp-nodelay $ ds-cfg-allow-tcp-reuse-address $
+  ds-cfg-allow-ldap-v2 $ ds-cfg-keep-stats $ ds-cfg-use-tcp-keep-alive $
+  ds-cfg-use-tcp-no-delay $ ds-cfg-allow-tcp-reuse-address $
   ds-cfg-send-rejection-notice $ ds-cfg-max-request-size $
   ds-cfg-num-request-handlers $ ds-cfg-allow-start-tls $ ds-cfg-use-ssl $
   ds-cfg-ssl-client-auth-policy $ ds-cfg-ssl-cert-nickname $
-  ds-cfg-accept-backlog $ ds-cfg-key-manager-provider-dn $
-  ds-cfg-trust-manager-provider-dn $ ds-cfg-ssl-protocol $
+  ds-cfg-accept-backlog $ ds-cfg-key-manager-provider $
+  ds-cfg-trust-manager-provider $ ds-cfg-ssl-protocol $
   ds-cfg-ssl-cipher-suite $ ds-cfg-max-blocked-write-time-limit )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.15 NAME 'ds-cfg-entry-cache'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-entry-cache-class $
-  ds-cfg-entry-cache-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.16 NAME 'ds-cfg-fifo-entry-cache'
   SUP ds-cfg-entry-cache STRUCTURAL MAY ( ds-cfg-max-entries $
   ds-cfg-max-memory-percent $ ds-cfg-lock-timeout $
@@ -1782,13 +1579,13 @@
   ds-cfg-include-filter ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.18
   NAME 'ds-cfg-extended-operation-handler' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-extended-operation-handler-class $
-  ds-cfg-extended-operation-handler-enabled )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.19
   NAME 'ds-cfg-key-manager-provider' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-key-manager-provider-class $
-  ds-cfg-key-manager-provider-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.20
   NAME 'ds-cfg-file-based-key-manager-provider' SUP ds-cfg-key-manager-provider
   STRUCTURAL MUST ds-cfg-key-store-file MAY ( ds-cfg-key-store-type $
@@ -1800,53 +1597,53 @@
   MAY ( ds-cfg-key-store-pin $ ds-cfg-key-store-pin-property $
   ds-cfg-key-store-pin-environment-variable $ ds-cfg-key-store-pin-file )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.22 NAME 'ds-cfg-logger'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-logger-enabled $ ds-cfg-logger-class )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.22 NAME 'ds-cfg-log-publisher'
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-enabled $ ds-cfg-java-class )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.23 NAME 'ds-cfg-access-logger'
-  SUP ds-cfg-logger
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.23 NAME 'ds-cfg-access-log-publisher'
+  SUP ds-cfg-log-publisher
   STRUCTURAL MAY ( ds-cfg-suppress-internal-operations $
   ds-cfg-suppress-synchronization-operations )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.24 NAME 'ds-cfg-error-logger'
-  SUP ds-cfg-logger
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.24 NAME 'ds-cfg-error-log-publisher'
+  SUP ds-cfg-log-publisher
   STRUCTURAL MAY ( ds-cfg-default-severity $ ds-cfg-override-severity )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.25 NAME 'ds-cfg-debug-logger'
-  SUP ds-cfg-logger STRUCTURAL MUST ( ds-cfg-default-debug-level )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.25 NAME 'ds-cfg-debug-log-publisher'
+  SUP ds-cfg-log-publisher STRUCTURAL MUST ( ds-cfg-default-debug-level )
   MAY ( ds-cfg-default-debug-category $
   ds-cfg-default-omit-method-entry-arguments $
   ds-cfg-default-omit-method-return-value $
   ds-cfg-default-include-throwable-cause $
-  ds-cfg-throwable-stack-frames )
+  ds-cfg-default-throwable-stack-frames )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.26
-  NAME 'ds-cfg-file-based-access-logger' SUP ds-cfg-access-logger STRUCTURAL
-  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous-writes $ ds-cfg-log-file-mode )
-  MAY ( ds-cfg-rotation-policy-dn $
-  ds-cfg-rotation-action $ ds-cfg-retention-policy-dn $
-  ds-cfg-thread-time-interval $ ds-cfg-buffer-size $ ds-cfg-writer-auto-flush $
-  ds-cfg-writer-append $ ds-cfg-log-queue-size )
+  NAME 'ds-cfg-file-based-access-log-publisher' SUP ds-cfg-access-log-publisher STRUCTURAL
+  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous $ ds-cfg-log-file-permissions )
+  MAY ( ds-cfg-rotation-policy $
+  ds-cfg-rotation-action $ ds-cfg-retention-policy $
+  ds-cfg-time-interval $ ds-cfg-buffer-size $ ds-cfg-auto-flush $
+  ds-cfg-append $ ds-cfg-queue-size )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.27
-  NAME 'ds-cfg-file-based-debug-logger' SUP ds-cfg-debug-logger STRUCTURAL
-  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous-writes $ ds-cfg-log-file-mode )
-  MAY ( ds-cfg-rotation-policy-dn $
-  ds-cfg-rotation-action $ ds-cfg-retention-policy-dn $
-  ds-cfg-thread-time-interval $ ds-cfg-buffer-size $ ds-cfg-writer-auto-flush $
-  ds-cfg-writer-append $ ds-cfg-log-queue-size )
+  NAME 'ds-cfg-file-based-debug-log-publisher' SUP ds-cfg-debug-log-publisher STRUCTURAL
+  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous $ ds-cfg-log-file-permissions )
+  MAY ( ds-cfg-rotation-policy $
+  ds-cfg-rotation-action $ ds-cfg-retention-policy $
+  ds-cfg-time-interval $ ds-cfg-buffer-size $ ds-cfg-auto-flush $
+  ds-cfg-append $ ds-cfg-queue-size )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.28
-  NAME 'ds-cfg-file-based-error-logger' SUP ds-cfg-error-logger STRUCTURAL
-  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous-writes $ ds-cfg-log-file-mode )
-  MAY ( ds-cfg-rotation-policy-dn $
-  ds-cfg-rotation-action $ ds-cfg-retention-policy-dn $
-  ds-cfg-thread-time-interval $ ds-cfg-buffer-size $ ds-cfg-writer-auto-flush $
-  ds-cfg-writer-append $ ds-cfg-log-queue-size )
+  NAME 'ds-cfg-file-based-error-log-publisher' SUP ds-cfg-error-log-publisher STRUCTURAL
+  MUST ( ds-cfg-log-file $ ds-cfg-asynchronous $ ds-cfg-log-file-permissions )
+  MAY ( ds-cfg-rotation-policy $
+  ds-cfg-rotation-action $ ds-cfg-retention-policy $
+  ds-cfg-time-interval $ ds-cfg-buffer-size $ ds-cfg-auto-flush $
+  ds-cfg-append $ ds-cfg-queue-size )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.29 NAME 'ds-cfg-matching-rule'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-matching-rule-class $
-  ds-cfg-matching-rule-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.30
   NAME 'ds-cfg-approximate-matching-rule' SUP ds-cfg-matching-rule
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
@@ -1861,18 +1658,18 @@
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.34
   NAME 'ds-cfg-monitor-provider' SUP top STRUCTURAL MUST ( cn $
-  ds-cfg-monitor-provider-class $ ds-cfg-monitor-provider-enabled )
+  ds-cfg-java-class $ ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.35
   NAME 'ds-cfg-password-storage-scheme' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-password-storage-scheme-class $
-  ds-cfg-password-storage-scheme-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.36
   NAME 'ds-cfg-password-validator' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-password-validator-class $
-  ds-cfg-password-validator-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.37 NAME 'ds-cfg-plugin' SUP top
-  STRUCTURAL MUST ( cn $ ds-cfg-plugin-class $ ds-cfg-plugin-enabled $
+  STRUCTURAL MUST ( cn $ ds-cfg-java-class $ ds-cfg-enabled $
   ds-cfg-plugin-type ) MAY ds-cfg-invoke-for-internal-operations
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.38 NAME 'ds-cfg-profiler-plugin'
@@ -1890,43 +1687,43 @@
   ds-cfg-invalid-attribute-syntax-behavior $ ds-cfg-server-error-result-code $
   ds-cfg-single-structural-objectclass-behavior $
   ds-cfg-notify-abandoned-operations $ ds-cfg-size-limit $ ds-cfg-time-limit $
-  ds-cfg-proxied-authorization-identity-mapper-dn $ ds-cfg-writability-mode $
+  ds-cfg-proxied-authorization-identity-mapper $ ds-cfg-writability-mode $
   ds-cfg-reject-unauthenticated-requests  $
   ds-cfg-bind-with-dn-requires-password $ ds-cfg-lookthrough-limit $
   ds-cfg-smtp-server $ ds-cfg-allowed-task $ ds-cfg-disabled-privilege $
   ds-cfg-return-bind-error-messages $ ds-cfg-idle-time-limit $
   ds-cfg-save-config-on-successful-startup )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.41 NAME 'ds-cfg-root-dn' SUP top
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.41 NAME 'ds-cfg-root-dn-user' SUP top
   AUXILIARY MAY ds-cfg-alternate-bind-dn X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.42 NAME 'ds-cfg-root-dse'
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.42 NAME 'ds-cfg-root-dse-backend'
   SUP top STRUCTURAL MUST cn MAY ( ds-cfg-subordinate-base-dn $
   ds-cfg-show-all-attributes ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.43
   NAME 'ds-cfg-sasl-mechanism-handler' SUP top STRUCTURAL MUST ( cn $
-  ds-cfg-sasl-mechanism-handler-class $
-  ds-cfg-sasl-mechanism-handler-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.44
   NAME 'ds-cfg-external-sasl-mechanism-handler'
-  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-certificate-mapper-dn
+  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-certificate-mapper
   MAY ( ds-cfg-certificate-attribute $
-  ds-cfg-client-certificate-validation-policy )
+  ds-cfg-certificate-validation-policy )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.45
   NAME 'ds-cfg-plain-sasl-mechanism-handler' SUP ds-cfg-sasl-mechanism-handler
-  MUST ds-cfg-identity-mapper-dn X-ORIGIN 'OpenDS Directory Server' )
+  MUST ds-cfg-identity-mapper X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.46
   NAME 'ds-cfg-cram-md5-sasl-mechanism-handler'
-  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-identity-mapper-dn
+  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-identity-mapper
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.47
   NAME 'ds-cfg-digest-md5-sasl-mechanism-handler'
-  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-identity-mapper-dn
+  SUP ds-cfg-sasl-mechanism-handler MUST ds-cfg-identity-mapper
   MAY ( ds-cfg-realm $ ds-cfg-server-fqdn )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.48
   NAME 'ds-cfg-gssapi-sasl-mechanism-handler'
-  SUP ds-cfg-sasl-mechanism-handler MAY ( ds-cfg-identity-mapper-dn $
+  SUP ds-cfg-sasl-mechanism-handler MAY ( ds-cfg-identity-mapper $
   ds-cfg-realm $ ds-cfg-kdc-address $ ds-cfg-keytab $ ds-cfg-server-fqdn )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.49 NAME 'ds-task' SUP top
@@ -1941,8 +1738,8 @@
   ds-task-restart-server ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.51
   NAME 'ds-cfg-trust-manager-provider' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-trust-manager-provider-class $
-  ds-cfg-trust-manager-provider-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.52
   NAME 'ds-cfg-file-based-trust-manager-provider'
   SUP ds-cfg-trust-manager-provider STRUCTURAL MUST ds-cfg-trust-store-file
@@ -1958,7 +1755,7 @@
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.55
   NAME 'ds-cfg-identity-mapper' SUP top STRUCTURAL MUST ( cn $
-  ds-cfg-identity-mapper-class $ ds-cfg-identity-mapper-enabled )
+  ds-cfg-java-class $ ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.56
   NAME 'ds-cfg-exact-match-identity-mapper' SUP ds-cfg-identity-mapper
@@ -1966,48 +1763,48 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.57
   NAME 'ds-cfg-synchronization-provider' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-synchronization-provider-class $
-  ds-cfg-synchronization-provider-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.58 NAME
-  ( 'ds-cfg-replication-domain-config'
+  ( 'ds-cfg-replication-domain'
     'ds-cfg-synchronization-provider-config' ) SUP top
-  STRUCTURAL MUST ( ds-cfg-replication-server $ ds-cfg-directory-server-id
-  $ ds-cfg-replication-dn )
+  STRUCTURAL MUST ( ds-cfg-replication-server $ ds-cfg-server-id
+  $ ds-cfg-base-dn )
   MAY ( cn $ ds-cfg-receive-status $ ds-cfg-max-receive-queue $
   ds-cfg-max-receive-delay $ ds-cfg-max-send-queue $ ds-cfg-max-send-delay $
-  ds-cfg-window-size $ ds-cfg-heartbeat-interval )
+  ds-cfg-window-size $ ds-cfg-heartbeat-interval $ ds-cfg-isolation-policy )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.59
   NAME 'ds-cfg-length-based-password-validator' SUP ds-cfg-password-validator
-  STRUCTURAL MAY ( ds-cfg-maximum-password-length $
-  ds-cfg-minimum-password-length ) X-ORIGIN 'OpenDS Directory Server' )
+  STRUCTURAL MAY ( ds-cfg-max-password-length $
+  ds-cfg-min-password-length ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.60
   NAME 'ds-cfg-password-generator' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-password-generator-class $
-  ds-cfg-password-generator-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.61
   NAME 'ds-cfg-random-password-generator' SUP ds-cfg-password-generator
   STRUCTURAL MUST ( ds-cfg-password-character-set $ ds-cfg-password-format )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.62 NAME 'ds-cfg-password-policy'
   SUP top STRUCTURAL MUST ( cn $ ds-cfg-password-attribute $
-  ds-cfg-default-password-storage-scheme-dn )
-  MAY ( ds-cfg-account-status-notification-handler-dn $
+  ds-cfg-default-password-storage-scheme )
+  MAY ( ds-cfg-account-status-notification-handler $
   ds-cfg-allow-expired-password-changes $
   ds-cfg-allow-multiple-password-values $ ds-cfg-allow-pre-encoded-passwords $
   ds-cfg-allow-user-password-changes $
-  ds-cfg-deprecated-password-storage-scheme-dn $
+  ds-cfg-deprecated-password-storage-scheme $
   ds-cfg-expire-passwords-without-warning $ ds-cfg-force-change-on-add $
   ds-cfg-force-change-on-reset $ ds-cfg-grace-login-count $
   ds-cfg-idle-lockout-interval $ ds-cfg-last-login-time-attribute $
   ds-cfg-last-login-time-format $ ds-cfg-lockout-duration $
   ds-cfg-lockout-failure-count $
   ds-cfg-lockout-failure-expiration-interval $
-  ds-cfg-maximum-password-age $ ds-cfg-maximum-password-reset-age $
-  ds-cfg-minimum-password-age $
+  ds-cfg-max-password-age $ ds-cfg-max-password-reset-age $
+  ds-cfg-min-password-age $
   ds-cfg-password-change-requires-current-password $
-  ds-cfg-password-expiration-warning-interval $ ds-cfg-password-generator-dn $
-  ds-cfg-password-validator-dn $ ds-cfg-previous-last-login-time-format $
+  ds-cfg-password-expiration-warning-interval $ ds-cfg-password-generator $
+  ds-cfg-password-validator $ ds-cfg-previous-last-login-time-format $
   ds-cfg-require-change-by-time $ ds-cfg-require-secure-authentication $
   ds-cfg-require-secure-password-changes $
   ds-cfg-skip-validation-for-administrators $
@@ -2015,8 +1812,8 @@
   ds-cfg-password-history-duration ) X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.63 NAME
   'ds-cfg-jmx-connection-handler' SUP ds-cfg-connection-handler
-  STRUCTURAL MUST ( ds-cfg-listen-port $ ds-cfg-ssl-cert-nickname $
-  ds-cfg-use-ssl )
+  STRUCTURAL MUST ( ds-cfg-listen-port ) MAY ( ds-cfg-ssl-cert-nickname $
+  ds-cfg-use-ssl $ ds-cfg-key-manager-provider )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.64
   NAME 'ds-task-import' SUP ds-task
@@ -2031,11 +1828,11 @@
   ds-task-import-clear-backend )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.65 NAME
-  ( 'ds-cfg-replication-server-config'
+  ( 'ds-cfg-replication-server'
     'ds-cfg-synchronization-changelog-server-config' ) SUP top STRUCTURAL
-    MUST (ds-cfg-replication-server-id $ ds-cfg-replication-server-port )
+    MUST (ds-cfg-replication-server-id $ ds-cfg-replication-port )
     MAY ( ds-cfg-replication-server $ cn $ ds-cfg-window-size $
-          ds-cfg-replication-max-queue-size $ ds-cfg-replication-db-directory $
+          ds-cfg-queue-size $ ds-cfg-replication-db-directory $
           ds-cfg-replication-purge-delay )
     X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.66 NAME 'ds-backup-directory'
@@ -2073,19 +1870,19 @@
   MAY ( ds-backup-id $ ds-task-restore-verify-only )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.72 NAME 'ds-cfg-work-queue' SUP top
-  STRUCTURAL MUST ( cn $ ds-cfg-work-queue-class )
+  STRUCTURAL MUST ( cn $ ds-cfg-java-class )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.73 NAME 'ds-cfg-traditional-work-queue'
   SUP ds-cfg-work-queue MUST ds-cfg-num-worker-threads
   MAY ds-cfg-max-work-queue-capacity X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.74
   NAME 'ds-cfg-password-modify-extended-operation-handler'
-  SUP ds-cfg-extended-operation-handler MUST ds-cfg-identity-mapper-dn
+  SUP ds-cfg-extended-operation-handler MUST ds-cfg-identity-mapper
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.75
   NAME 'ds-cfg-account-status-notification-handler' SUP top STRUCTURAL
-  MUST ( cn $ ds-cfg-account-status-notification-handler-class $
-  ds-cfg-account-status-notification-handler-enabled )
+  MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.76
   NAME 'ds-cfg-error-log-account-status-notification-handler'
@@ -2107,9 +1904,9 @@
   SUP ds-task MUST ds-task-schema-file-name
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.81 NAME 'ds-cfg-group-implementation'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-group-implementation-class $
-  ds-cfg-group-implementation-enabled ) X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.82 NAME 'ds-cfg-root-dn-base' SUP top
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled ) X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.82 NAME 'ds-cfg-root-dn' SUP top
   STRUCTURAL MUST cn MAY ds-cfg-default-root-privilege-name
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.83 NAME 'ds-certificate-user' SUP top
@@ -2118,37 +1915,37 @@
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.84
   NAME 'ds-cfg-subject-dn-to-user-attribute-certificate-mapper'
   SUP ds-cfg-certificate-mapper STRUCTURAL
-  MUST ds-cfg-certificate-subject-attribute-type
-  MAY ds-cfg-certificate-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
+  MUST ds-cfg-subject-attribute
+  MAY ds-cfg-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.85
   NAME 'ds-cfg-subject-attribute-to-user-attribute-certificate-mapper'
   SUP ds-cfg-certificate-mapper STRUCTURAL
-  MUST ds-cfg-certificate-subject-attribute-mapping
-  MAY ds-cfg-certificate-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
+  MUST ds-cfg-subject-attribute-mapping
+  MAY ds-cfg-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.86
   NAME 'ds-cfg-fingerprint-certificate-mapper' SUP ds-cfg-certificate-mapper
-  STRUCTURAL MUST ( ds-cfg-certificate-fingerprint-attribute-type $
-  ds-cfg-certificate-fingerprint-algorithm )
-  MAY ds-cfg-certificate-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
+  STRUCTURAL MUST ( ds-cfg-fingerprint-attribute $
+  ds-cfg-fingerprint-algorithm )
+  MAY ds-cfg-user-base-dn X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.88
   NAME 'ds-cfg-similarity-based-password-validator'
   SUP ds-cfg-password-validator STRUCTURAL
-  MUST ds-cfg-minimum-password-difference X-ORIGIN 'OpenDS Directory Server' )
+  MUST ds-cfg-min-password-difference X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.89
   NAME 'ds-cfg-unique-characters-password-validator'
   SUP ds-cfg-password-validator STRUCTURAL
-  MUST ( ds-cfg-minimum-unique-characters $ ds-cfg-case-sensitive-validation )
+  MUST ( ds-cfg-min-unique-characters $ ds-cfg-case-sensitive-validation )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.90
   NAME 'ds-cfg-repeated-characters-password-validator'
   SUP ds-cfg-password-validator STRUCTURAL
-  MUST ( ds-cfg-maximum-consecutive-length $ ds-cfg-case-sensitive-validation )
+  MUST ( ds-cfg-max-consecutive-length $ ds-cfg-case-sensitive-validation )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.91 NAME 'ds-cfg-virtual-attribute'
-  SUP top STRUCTURAL MUST ( cn $ ds-cfg-virtual-attribute-class $
-  ds-cfg-virtual-attribute-enabled $ ds-cfg-virtual-attribute-type )
-  MAY ( ds-cfg-virtual-attribute-base-dn $ ds-cfg-virtual-attribute-group-dn $
-  ds-cfg-virtual-attribute-filter $ ds-cfg-virtual-attribute-conflict-behavior )
+  SUP top STRUCTURAL MUST ( cn $ ds-cfg-java-class $
+  ds-cfg-enabled $ ds-cfg-attribute-type )
+  MAY ( ds-cfg-base-dn $ ds-cfg-group-dn $
+  ds-cfg-filter $ ds-cfg-conflict-behavior )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.92
   NAME 'ds-task-initialize-from-remote-replica' SUP ds-task
@@ -2161,7 +1958,7 @@
   MAY ( ds-task-processed-entry-count $ ds-task-unprocessed-entry-count )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.94
-  NAME 'ds-cfg-multimaster-synchronization-provider'
+  NAME 'ds-cfg-replication-synchronization-provider'
   SUP ds-cfg-synchronization-provider STRUCTURAL
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.95
@@ -2186,7 +1983,7 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.100
   NAME 'ds-cfg-user-defined-virtual-attribute' SUP ds-cfg-virtual-attribute
-  STRUCTURAL MUST ds-cfg-virtual-attribute-value
+  STRUCTURAL MUST ds-cfg-value
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.101
   NAME 'ds-cfg-debug-target'
@@ -2197,7 +1994,7 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.102
   NAME 'ds-cfg-log-retention-policy'
-  STRUCTURAL MUST ( cn $ ds-cfg-retention-policy-class  )
+  STRUCTURAL MUST ( cn $ ds-cfg-java-class  )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.103
   NAME 'ds-cfg-file-count-log-retention-policy' SUP ds-cfg-log-retention-policy
@@ -2214,7 +2011,7 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.106
   NAME 'ds-cfg-log-rotation-policy'
-  STRUCTURAL MUST ( cn $ ds-cfg-rotation-policy-class  )
+  STRUCTURAL MUST ( cn $ ds-cfg-java-class  )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.107
   NAME 'ds-cfg-size-limit-log-rotation-policy'
@@ -2239,8 +2036,8 @@
   SUP ds-cfg-entry-cache STRUCTURAL MAY ( ds-cfg-max-entries $
   ds-cfg-max-memory-size $ ds-cfg-lock-timeout $ ds-cfg-exclude-filter $
   ds-cfg-include-filter $ ds-cfg-cache-directory $ ds-cfg-cache-type $
-  ds-cfg-persistent-cache $ ds-cfg-backend-compact-encoding $
-  ds-cfg-database-cache-percent $ ds-cfg-database-cache-size $
+  ds-cfg-persistent-cache $ ds-cfg-compact-encoding $
+  ds-cfg-db-cache-percent $ ds-cfg-db-cache-size $
   ds-cfg-je-property )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.114 NAME 'ds-cfg-plugin-root'
@@ -2292,15 +2089,15 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.115
   NAME 'ds-cfg-password-policy-import-plugin' SUP ds-cfg-plugin STRUCTURAL
-  MAY ( ds-cfg-default-user-password-storage-scheme-dn $
-  ds-cfg-default-auth-password-storage-scheme-dn )
+  MAY ( ds-cfg-default-user-password-storage-scheme $
+  ds-cfg-default-auth-password-storage-scheme )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.117
-  NAME 'ds-cfg-vlv-je-index' SUP top STRUCTURAL
-  MUST ( ds-cfg-vlv-je-index-base-dn $ ds-cfg-vlv-je-index-scope $
-         ds-cfg-vlv-je-index-filter $ ds-cfg-vlv-je-index-sort-order $
-         ds-cfg-vlv-je-index-name )
-  MAY  ( ds-cfg-vlv-je-index-maximum-block-size )
+  NAME 'ds-cfg-local-db-vlv-index' SUP top STRUCTURAL
+  MUST ( ds-cfg-base-dn $ ds-cfg-scope $
+         ds-cfg-filter $ ds-cfg-sort-order $
+         ds-cfg-name )
+  MAY  ( ds-cfg-max-block-size )
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.118
   NAME 'ds-cfg-smtp-alert-handler' SUP ds-cfg-alert-handler STRUCTURAL
@@ -2323,14 +2120,14 @@
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.120
   NAME 'ds-cfg-unique-attribute-plugin' SUP ds-cfg-plugin
-  STRUCTURAL MUST ds-cfg-unique-attribute-type
-  MAY ds-cfg-unique-attribute-base-dn
+  STRUCTURAL MUST ds-cfg-type
+  MAY ds-cfg-base-dn
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.123
   NAME 'ds-cfg-smtp-account-status-notification-handler'
   SUP ds-cfg-account-status-notification-handler
   MUST ( ds-cfg-sender-address $
-  ds-cfg-send-notification-without-end-user-address $
+  ds-cfg-send-message-without-end-user-address $
   ds-cfg-message-template-file ) MAY ( ds-cfg-email-address-attribute-type $
   ds-cfg-recipient-address $ ds-cfg-message-subject )
   X-ORIGIN 'OpenDS Directory Server' )
@@ -2361,11 +2158,11 @@
   STRUCTURAL
   MUST ( ds-cfg-key-id )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.125 NAME 'ds-cfg-entryuuid-plugin'
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.125 NAME 'ds-cfg-entry-uuid-plugin'
   SUP ds-cfg-plugin STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.126 NAME 'ds-cfg-lastmod-plugin'
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.126 NAME 'ds-cfg-last-mod-plugin'
   SUP ds-cfg-plugin STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.127 NAME 'ds-cfg-ldap-ad-list-plugin'
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.127 NAME 'ds-cfg-ldap-attribute-description-list-plugin'
   SUP ds-cfg-plugin STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.128 NAME 'ds-cfg-jmx-alert-handler'
   SUP ds-cfg-alert-handler STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
@@ -2386,7 +2183,7 @@
   SUP ds-cfg-extended-operation-handler STRUCTURAL
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.134
-  NAME 'ds-cfg-starttls-extended-operation-handler'
+  NAME 'ds-cfg-start-tls-extended-operation-handler'
   SUP ds-cfg-extended-operation-handler STRUCTURAL
   X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.135
@@ -2461,22 +2258,22 @@
   NAME 'ds-cfg-blind-trust-manager-provider' SUP ds-cfg-trust-manager-provider
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.155
-  NAME 'ds-cfg-entrydn-virtual-attribute' SUP ds-cfg-virtual-attribute
+  NAME 'ds-cfg-entry-dn-virtual-attribute' SUP ds-cfg-virtual-attribute
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.156
-  NAME 'ds-cfg-entryuuid-virtual-attribute' SUP ds-cfg-virtual-attribute
+  NAME 'ds-cfg-entry-uuid-virtual-attribute' SUP ds-cfg-virtual-attribute
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.157
-  NAME 'ds-cfg-hassubordinates-virtual-attribute' SUP ds-cfg-virtual-attribute
+  NAME 'ds-cfg-has-subordinates-virtual-attribute' SUP ds-cfg-virtual-attribute
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.158
-  NAME 'ds-cfg-numsubordinates-virtual-attribute' SUP ds-cfg-virtual-attribute
+  NAME 'ds-cfg-num-subordinates-virtual-attribute' SUP ds-cfg-virtual-attribute
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.159
-  NAME 'ds-cfg-ismemberof-virtual-attribute' SUP ds-cfg-virtual-attribute
+  NAME 'ds-cfg-is-member-of-virtual-attribute' SUP ds-cfg-virtual-attribute
   STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.160
-  NAME 'ds-cfg-subschemasubentry-virtual-attribute'
+  NAME 'ds-cfg-subschema-subentry-virtual-attribute'
   SUP ds-cfg-virtual-attribute STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.161
   NAME 'ds-cfg-config-file-handler-backend' SUP ds-cfg-backend STRUCTURAL
@@ -2486,14 +2283,14 @@
   SUP ds-cfg-certificate-mapper STRUCTURAL X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.122
   NAME 'ds-cfg-referential-integrity-plugin' SUP ds-cfg-plugin
-  STRUCTURAL MUST ds-cfg-referential-integrity-attribute-type
-  MAY ( ds-cfg-referential-integrity-base-dn
-  $ ds-cfg-referential-integrity-update-interval
-  $ ds-cfg-referential-integrity-log-file )
+  STRUCTURAL MUST ds-cfg-attribute-type
+  MAY ( ds-cfg-base-dn
+  $ ds-cfg-update-interval
+  $ ds-cfg-log-file )
   X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.26027.1.2.167 NAME 'ds-cfg-7-bit-clean-plugin'
-  SUP ds-cfg-plugin STRUCTURAL MUST ds-cfg-7-bit-clean-attribute-type
-  MAY ds-cfg-7-bit-clean-base-dn X-ORIGIN 'OpenDS Directory Server' )
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.167 NAME 'ds-cfg-seven-bit-clean-plugin'
+  SUP ds-cfg-plugin STRUCTURAL MUST ds-cfg-attribute-type
+  MAY ds-cfg-base-dn X-ORIGIN 'OpenDS Directory Server' )
 objectClasses: ( 1.3.6.1.4.1.26027.1.2.168
   NAME 'ds-cfg-ldif-connection-handler' SUP ds-cfg-connection-handler
   MUST ( ds-cfg-ldif-directory $ ds-cfg-poll-interval )

--
Gitblit v1.10.0