Import void/entry/children OID update from devel

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 885aff7fe51a91471ef216ef8253d44114878108..7c637f923095ed8d84ace9387b383aa7694e46f7 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -572,16 +572,16 @@ attributetype ( 1.3.6.1.4.1.250.1.32
 #
 # OpenLDAP specific schema items
 #
-attributetype ( 1.3.6.1.4.1.4203.666.1.3
+attributetype ( 1.3.6.1.4.1.4203.1.3.1
        NAME 'entry'
-       DESC 'OpenLDAP ACL entry pseudo attribute'
-       SYNTAX 1.3.6.1.4.1.4203.666.2.3
+       DESC 'OpenLDAP ACL entry pseudo-attribute'
+       SYNTAX 1.3.6.1.4.1.4203.1.1.1
        SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
 
-attributetype ( 1.3.6.1.4.1.4203.666.1.4
+attributetype ( 1.3.6.1.4.1.4203.1.3.2
        NAME 'children'
-       DESC 'OpenLDAP ACL children pseudo attribute'
-       SYNTAX 1.3.6.1.4.1.4203.666.2.3
+       DESC 'OpenLDAP ACL children pseudo-attribute'
+       SYNTAX 1.3.6.1.4.1.4203.1.1.1
        SINGLE-VALUE NO-USER-MODIFICATION USAGE dSAOperation )
 
 attributetype ( 1.3.6.1.4.1.4203.666.1.5

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 907adc0ab7928a1e072c957dbafe9c6d40d22a76..d3bcb00bdf31a63813564346863c974eb51f8361 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2297,9 +2297,10 @@ struct syntax_defs_rec syntax_defs[] = {
        {"( 1.3.6.1.4.1.4203.666.2.1 DESC 'OpenLDAP Experimental ACI' )",
                0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */,
                NULL, NULL},
-       {"( 1.3.6.1.4.1.4203.666.2.3 DESC 'OpenLDAP void' " X_HIDE ")" ,
-               SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
 
+       /* OpenLDAP Void Syntax */
+       {"( 1.3.6.1.4.1.4203.1.1.1 DESC 'OpenLDAP void' " X_HIDE ")" ,
+               SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
        {NULL, 0, NULL, NULL, NULL}
 };