From d10832b0c8ff642d6a1594cd1a0ad2a881fe253e Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 26 Sep 2005 18:37:50 +0000 Subject: [PATCH] entryUUID schema to use IANA (newly) assigned OIDs --- servers/slapd/schema_init.c | 16 ++++++++-------- servers/slapd/schema_prep.c | 11 ++++++----- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/servers/slapd/schema_init.c b/servers/slapd/schema_init.c index 789c7f001a..42f03d8f26 100644 --- 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 9463c5c7e9..7349628240 100644 --- 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, -- 2.39.5