mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-21 03:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

entryUUID schema to use IANA (newly) assigned OIDs

Browse Source
This commit is contained in:
Kurt Zeilenga 2005-09-26 18:37:50 +00:00
parent 737562a20b
commit d10832b0c8
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
servers/slapd/schema_init.c
View File

@ -3429,8 +3429,8 @@ static slap_syntax_defs_rec syntax_defs[] = {
SLAP_SYNTAX_HIDE, NULL, NULL}, SLAP_SYNTAX_HIDE, NULL, NULL},
#endif #endif
{"( 1.3.6.1.4.1.4203.666.2.6 DESC 'UUID' )", {"( 1.3.6.1.1.16.1 DESC 'UUID' )",
SLAP_SYNTAX_HIDE, UUIDValidate, NULL}, 0, UUIDValidate, NULL},
{"( 1.3.6.1.4.1.4203.666.11.2.1 DESC 'CSN' )", {"( 1.3.6.1.4.1.4203.666.11.2.1 DESC 'CSN' )",
SLAP_SYNTAX_HIDE, csnValidate, NULL}, SLAP_SYNTAX_HIDE, csnValidate, NULL},
@ -3853,16 +3853,16 @@ static slap_mrule_defs_rec mrule_defs[] = {
NULL, NULL, NULL, NULL,
"integerMatch" }, "integerMatch" },
{"( 1.3.6.1.4.1.4203.666.4.6 NAME 'UUIDMatch' " {"( 1.3.6.1.1.16.2 NAME 'UUIDMatch' "
"SYNTAX 1.3.6.1.4.1.4203.666.2.6 )", "SYNTAX 1.3.6.1.1.16.1 )",
SLAP_MR_HIDE | SLAP_MR_EQUALITY, NULL, SLAP_MR_EQUALITY, NULL,
NULL, UUIDNormalize, octetStringMatch, NULL, UUIDNormalize, octetStringMatch,
octetStringIndexer, octetStringFilter, octetStringIndexer, octetStringFilter,
NULL}, NULL},
{"( 1.3.6.1.4.1.4203.666.4.7 NAME 'UUIDOrderingMatch' " {"( 1.3.6.1.1.16.3 NAME 'UUIDOrderingMatch' "
"SYNTAX 1.3.6.1.4.1.4203.666.2.6 )", "SYNTAX 1.3.6.1.1.16.1 )",
SLAP_MR_HIDE | SLAP_MR_ORDERING, NULL, SLAP_MR_ORDERING, NULL,
NULL, UUIDNormalize, octetStringOrderingMatch, NULL, UUIDNormalize, octetStringOrderingMatch,
octetStringIndexer, octetStringFilter, octetStringIndexer, octetStringFilter,
"UUIDMatch"}, "UUIDMatch"},

11
servers/slapd/schema_prep.c
View File

@ -545,13 +545,13 @@ static struct slap_schema_ad_map {
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_entryDN) }, 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' " "DESC 'UUID of the entry' "
"EQUALITY UUIDMatch " "EQUALITY UUIDMatch "
"ORDERING UUIDOrderingMatch " "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 )", "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, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_entryUUID) }, offsetof(struct slap_internal_schema, si_ad_entryUUID) },
@ -579,8 +579,9 @@ static struct slap_schema_ad_map {
#ifdef LDAP_SUPERIOR_UUID #ifdef LDAP_SUPERIOR_UUID
{ "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' " { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "
"DESC 'UUID of the superior entry' " "DESC 'UUID of the superior entry' "
"EQUALITY octetStringMatch " "EQUALITY UUIDMatch "
"SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} " "ORDERING UUIDOrderingMatch "
"SYNTAX 1.3.6.1.1.16.1 "
"SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )", "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
NULL, SLAP_AT_HIDE, NULL, SLAP_AT_HIDE,
NULL, NULL, NULL, NULL,