Update void syntax and entry/children pseudo-attribute types

to have publishable OIDs.

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 76ba4a3e31c9b318199385c618a5a89ecd6208ae..67a7e9ba94913406f51edb2cb4728420a262542f 100644 (file)
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -585,16 +585,16 @@ attributetype ( 1.3.6.1.4.1.4203.666.1.2
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.26{32}
        NO-USER-MODIFICATION USAGE dSAOperation )
 
-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 93196fed28a586702e91b6e011af3759536732af..eb0f7033b71aa130c9a20ed650a358ac1d354893 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -2305,13 +2305,10 @@ struct syntax_defs_rec syntax_defs[] = {
                0, IA5StringValidate /* THIS WILL CHANGE FOR NEW ACI SYNTAX */, NULL, NULL},
        {"( 1.3.6.1.4.1.4203.666.2.2 DESC 'OpenLDAP authPassword' )",
                0, NULL, NULL, NULL},
-       {"( 1.3.6.1.4.1.4203.666.2.3 DESC 'OpenLDAP void' " X_HIDE ")" ,
-               SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
-#if 0 /* not needed */
-       {"( 1.3.6.1.4.1.4203.666.2.4 DESC 'OpenLDAP DN' " X_HIDE ")" ,
-               SLAP_SYNTAX_HIDE, inValidate, NULL, NULL},
-#endif
 
+       /* 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}
 };