entryUUID schema to use IANA (newly) assigned OIDs

diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c
index 789c7f001aba99ad81d6520cd3b4bd0143a07cd2..42f03d8f260a5d828e2939a3c4d0b52208d8aba6 100644 (file)
--- a/servers/slapd/schema_init.c
+++ b/servers/slapd/schema_init.c
@@ -3429,8 +3429,8 @@ static slap_syntax_defs_rec syntax_defs[] = {
                SLAP_SYNTAX_HIDE, NULL, NULL},
 #endif
 
-       {"( 1.3.6.1.4.1.4203.666.2.6 DESC 'UUID' )",
-               SLAP_SYNTAX_HIDE, UUIDValidate, NULL},
+       {"( 1.3.6.1.1.16.1 DESC 'UUID' )",
+               0, UUIDValidate, NULL},
 
        {"( 1.3.6.1.4.1.4203.666.11.2.1 DESC 'CSN' )",
                SLAP_SYNTAX_HIDE, csnValidate, NULL},
@@ -3853,16 +3853,16 @@ static slap_mrule_defs_rec mrule_defs[] = {
                NULL, NULL,
                "integerMatch" },
 
-       {"( 1.3.6.1.4.1.4203.666.4.6 NAME 'UUIDMatch' "
-               "SYNTAX 1.3.6.1.4.1.4203.666.2.6 )",
-               SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL,
+       {"( 1.3.6.1.1.16.2 NAME 'UUIDMatch' "
+               "SYNTAX 1.3.6.1.1.16.1 )",
+               SLAP_MR_EQUALITY, NULL,
                NULL, UUIDNormalize, octetStringMatch,
                octetStringIndexer, octetStringFilter,
                NULL},
 
-       {"( 1.3.6.1.4.1.4203.666.4.7 NAME 'UUIDOrderingMatch' "
-               "SYNTAX 1.3.6.1.4.1.4203.666.2.6 )",
-               SLAP_MR_HIDE | SLAP_MR_ORDERING, NULL,
+       {"( 1.3.6.1.1.16.3 NAME 'UUIDOrderingMatch' "
+               "SYNTAX 1.3.6.1.1.16.1 )",
+               SLAP_MR_ORDERING, NULL,
                NULL, UUIDNormalize, octetStringOrderingMatch,
                octetStringIndexer, octetStringFilter,
                "UUIDMatch"},

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 9463c5c7e9a07adf6936a00d39bd28dd3aa7ee58..7349628240966aa320d006b4b1e63dae89822060 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -545,13 +545,13 @@ static struct slap_schema_ad_map {
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryDN) },
-       { "entryUUID", "( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID' "   
+       { "entryUUID", "( 1.3.6.1.1.16.4 NAME 'entryUUID' "   
                        "DESC 'UUID of the entry' "
                        "EQUALITY UUIDMatch "
                        "ORDERING UUIDOrderingMatch "
-                       "SYNTAX 1.3.6.1.4.1.4203.666.2.6 "
+                       "SYNTAX 1.3.6.1.1.16.1 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
-               NULL, SLAP_AT_HIDE|SLAP_AT_MANAGEABLE,
+               NULL, SLAP_AT_MANAGEABLE,
                NULL, NULL,
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryUUID) },
@@ -579,8 +579,9 @@ static struct slap_schema_ad_map {
 #ifdef LDAP_SUPERIOR_UUID
        { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
                        "DESC 'UUID of the superior entry' "
-                       "EQUALITY octetStringMatch "
-                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+                       "EQUALITY UUIDMatch "
+                       "ORDERING UUIDOrderingMatch "
+                       "SYNTAX 1.3.6.1.1.16.1 "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
                NULL, SLAP_AT_HIDE,
                NULL, NULL,