From 8795305804a15c13b3f59f5f3f3e90477e3eb1a2 Mon Sep 17 00:00:00 2001
From: Yannick Lecaillez <yannick.lecaillez@forgerock.com>
Date: Mon, 20 Jun 2016 13:04:34 +0000
Subject: [PATCH] Fix Http Authz/OAuth2 OID conflict with IDM.
---
opendj-server-legacy/resource/schema/02-config.ldif | 46 +++++++++++++++++++++++-----------------------
1 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/opendj-server-legacy/resource/schema/02-config.ldif b/opendj-server-legacy/resource/schema/02-config.ldif
index 751c939..805ce6a 100644
--- a/opendj-server-legacy/resource/schema/02-config.ldif
+++ b/opendj-server-legacy/resource/schema/02-config.ldif
@@ -3849,89 +3849,89 @@
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.162
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.169
NAME 'ds-cfg-http-authorization-mechanism'
EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.163
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.170
NAME 'ds-cfg-http-basic-alt-authentication-enabled'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.164
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.171
NAME 'ds-cfg-http-basic-alt-username-header'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.165
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.172
NAME 'ds-cfg-http-basic-alt-password-header'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.166
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.173
NAME 'ds-cfg-bind-user-dn'
EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.167
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.174
NAME 'ds-cfg-oauth2-authzid-json-pointer'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.168
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.175
NAME 'ds-cfg-oauth2-required-scope'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.169
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.176
NAME 'ds-cfg-oauth2-access-token-cache-enabled'
EQUALITY booleanMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.7
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.170
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.177
NAME 'ds-cfg-oauth2-access-token-cache-expiration'
EQUALITY caseIgnoreMatch
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.36733.2.1.1.171
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.178
NAME 'ds-cfg-openam-token-info-url'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.172
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.179
NAME 'ds-cfg-oauth2-token-introspection-url'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.173
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.180
NAME 'ds-cfg-oauth2-token-introspection-client-id'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.174
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.181
NAME 'ds-cfg-oauth2-token-introspection-client-secret'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.175
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.182
NAME 'ds-cfg-cts-base-dn'
EQUALITY distinguishedNameMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.12
SINGLE-VALUE
X-ORIGIN 'OpenDJ Directory Server' )
-attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.176
+attributeTypes: ( 1.3.6.1.4.1.36733.2.1.1.183
NAME 'ds-cfg-oauth2-access-token-directory'
EQUALITY caseIgnoreMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
@@ -5999,7 +5999,7 @@
STRUCTURAL
MUST ( ds-cfg-config-url )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.35
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.36
NAME 'ds-cfg-http-authorization-mechanism'
SUP top
STRUCTURAL
@@ -6007,13 +6007,13 @@
ds-cfg-java-class $
ds-cfg-enabled )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.36
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.37
NAME 'ds-cfg-http-anonymous-authorization-mechanism'
SUP ds-cfg-http-authorization-mechanism
STRUCTURAL
MAY ( ds-cfg-bind-user-dn )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.37
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.38
NAME 'ds-cfg-http-basic-authorization-mechanism'
SUP ds-cfg-http-authorization-mechanism
STRUCTURAL
@@ -6022,7 +6022,7 @@
MAY ( ds-cfg-http-basic-alt-username-header $
ds-cfg-http-basic-alt-password-header )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.38
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.39
NAME 'ds-cfg-http-oauth2-authorization-mechanism'
SUP ds-cfg-http-authorization-mechanism
STRUCTURAL
@@ -6032,7 +6032,7 @@
ds-cfg-oauth2-access-token-cache-enabled )
MAY ( ds-cfg-oauth2-access-token-cache-expiration )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.39
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.40
NAME 'ds-cfg-http-oauth2-openam-authorization-mechanism'
SUP ds-cfg-http-oauth2-authorization-mechanism
STRUCTURAL
@@ -6040,7 +6040,7 @@
MAY ( ds-cfg-trust-manager-provider $
ds-cfg-key-manager-provider )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.40
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.41
NAME 'ds-cfg-http-oauth2-token-introspection-authorization-mechanism'
SUP ds-cfg-http-oauth2-authorization-mechanism
STRUCTURAL
@@ -6050,13 +6050,13 @@
MAY ( ds-cfg-trust-manager-provider $
ds-cfg-key-manager-provider )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.41
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.42
NAME 'ds-cfg-http-oauth2-cts-authorization-mechanism'
SUP ds-cfg-http-oauth2-authorization-mechanism
STRUCTURAL
MUST ( ds-cfg-cts-base-dn )
X-ORIGIN 'OpenDJ Directory Server' )
-objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.42
+objectClasses: ( 1.3.6.1.4.1.36733.2.1.2.43
NAME 'ds-cfg-http-oauth2-file-authorization-mechanism'
SUP ds-cfg-http-oauth2-authorization-mechanism
STRUCTURAL
--
Gitblit v1.10.0