From c362f2786b0afa894b6ea1b766e1222b1e7559ff Mon Sep 17 00:00:00 2001
From: david_page <david_page@localhost>
Date: Sat, 01 Sep 2007 03:02:26 +0000
Subject: [PATCH] Issue 466 partial
---
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml | 4 ++--
opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml | 2 +-
opendj-sdk/opends/resource/schema/02-config.ldif | 20 +++++++++++---------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/opendj-sdk/opends/resource/schema/02-config.ldif b/opendj-sdk/opends/resource/schema/02-config.ldif
index 445a47e..1a90fba 100644
--- a/opendj-sdk/opends/resource/schema/02-config.ldif
+++ b/opendj-sdk/opends/resource/schema/02-config.ldif
@@ -1576,22 +1576,24 @@
NAME 'ds-cfg-backend-compact-encoding'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( ds-cfg-ssl-encryption-oid NAME 'ds-cfg-ssl-encryption'
- SYNTAX 1.3.6.1.4.1.1466.115.121.1.7 SINGLE-VALUE
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.481
+ NAME 'ds-cfg-ssl-encryption'
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
+ SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( ds-cfg-public-key-certificate-OID
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.482
NAME 'ds-cfg-public-key-certificate'
DESC 'cryptographic public-key certificate'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.8
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( ds-cfg-key-id-OID
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.483
NAME 'ds-cfg-key-id'
DESC 'cryptographic cipher-key unique identifier'
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDS Directory Server' )
-attributeTypes: ( ds-cfg-key-compromised-time-OID
+attributeTypes: ( 1.3.6.1.4.1.26027.1.1.484
NAME 'ds-cfg-key-compromised-time'
DESC 'The time a cryptographic cipher key was suspected to be compromised'
EQUALITY generalizedTimeMatch
@@ -2258,28 +2260,28 @@
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' )
-objectClasses: ( ds-cfg-trust-store-backend-oid
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.164
NAME 'ds-cfg-trust-store-backend'
SUP ds-cfg-backend STRUCTURAL
MAY ( ds-cfg-trust-store-type $ ds-cfg-trust-store-file $
ds-cfg-trust-store-pin $ ds-cfg-trust-store-pin-property $
ds-cfg-trust-store-pin-environment-variable $ ds-cfg-trust-store-pin-file )
X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( ds-cfg-crypto-manager-oid
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.163
NAME 'ds-cfg-crypto-manager'
SUP top
STRUCTURAL
MAY ( cn $ ds-cfg-ssl-protocol $ ds-cfg-ssl-cipher-suite $
ds-cfg-ssl-cert-nickname $ ds-cfg-ssl-encryption )
X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( ds-cfg-instance-key-OID
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.165
NAME 'ds-cfg-instance-key'
SUP top
STRUCTURAL
MUST ( ds-cfg-key-id $ ds-cfg-public-key-certificate )
MAY ds-cfg-key-compromised-time
X-ORIGIN 'OpenDS Directory Server' )
-objectClasses: ( ds-cfg-self-signed-cert-request-OID
+objectClasses: ( 1.3.6.1.4.1.26027.1.2.166
NAME 'ds-cfg-self-signed-cert-request'
SUP top
STRUCTURAL
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
index 41a6af2..d6ed320 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/CryptoManagerConfiguration.xml
@@ -40,7 +40,7 @@
<adm:tag name="security"/>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>ds-cfg-crypto-manager-oid</ldap:oid>
+ <ldap:oid>1.3.6.1.4.1.26027.1.2.163</ldap:oid>
<ldap:name>ds-cfg-crypto-manager</ldap:name>
<ldap:superior>top</ldap:superior>
</ldap:object-class>
@@ -135,7 +135,7 @@
</adm:syntax>
<adm:profile name="ldap">
<ldap:attribute>
- <ldap:oid>ds-cfg-ssl-encryption-oid</ldap:oid>
+ <ldap:oid>1.3.6.1.4.1.26027.1.1.481</ldap:oid>
<ldap:name>ds-cfg-ssl-encryption</ldap:name>
</ldap:attribute>
</adm:profile>
diff --git a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
index e436def..38c31c1 100644
--- a/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
+++ b/opendj-sdk/opends/src/admin/defn/org/opends/server/admin/std/TrustStoreBackendConfiguration.xml
@@ -40,7 +40,7 @@
</adm:synopsis>
<adm:profile name="ldap">
<ldap:object-class>
- <ldap:oid>ds-cfg-trust-store-backend-oid</ldap:oid>
+ <ldap:oid>1.3.6.1.4.1.26027.1.2.164</ldap:oid>
<ldap:name>ds-cfg-trust-store-backend</ldap:name>
<ldap:superior>ds-cfg-backend</ldap:superior>
</ldap:object-class>
--
Gitblit v1.10.0