Add superiorUUID to system schema

diff --git a/servers/slapd/lcup.c b/servers/slapd/lcup.c
index c51e745440bdb0e1cf59d144f59fec1f9f356316..399f7cfb0c276819a27518d3a33f2c5bc3abed86 100644 (file)
--- a/servers/slapd/lcup.c
+++ b/servers/slapd/lcup.c
@@ -21,7 +21,7 @@ AttributeName uuid_attr[2];
 int
 build_uuid_attr()
 {
-        const char* text;
+       const char* text;
 
        uuid_attr[0].an_name.bv_len = 9;
        uuid_attr[0].an_name.bv_val = "entryUUID";

diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index fe9d43c306727b5330bc92d10416cde13baa9005..577d0739760a44795c88f1377ab3d1c4d502aa3c 100644 (file)
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -440,7 +440,7 @@ static struct slap_schema_ad_map {
                offsetof(struct slap_internal_schema, si_ad_collectiveExclusions) },
 
        { "entryUUID", "( 1.3.6.1.4.1.4203.666.1.6 NAME 'entryUUID' "   
-                       "DESC 'LCUP/LDUP: universally unique identifier' "
+                       "DESC 'LCUP/LDUP: UUID of the entry' "
                        "EQUALITY octetStringMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
                        "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
@@ -448,7 +448,7 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryUUID) },
        { "entryCSN", "( 1.3.6.1.4.1.4203.666.1.7 NAME 'entryCSN' "
-                       "DESC 'LCUP/LDUP: change sequence number' "
+                       "DESC 'LCUP/LDUP: change sequence number of the entry' "
                        "EQUALITY octetStringMatch "
                        "ORDERING octetStringOrderingMatch "
                        "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
@@ -457,6 +457,15 @@ static struct slap_schema_ad_map {
                NULL, NULL, NULL, NULL, NULL,
                offsetof(struct slap_internal_schema, si_ad_entryCSN) },
 
+       { "superiorUUID", "( 1.3.6.1.4.1.4203.666.1.11 NAME 'superiorUUID' "   
+                       "DESC 'LCUP/LDUP: UUID of the superior entry' "
+                       "EQUALITY octetStringMatch "
+                       "SYNTAX 1.3.6.1.4.1.1466.115.121.1.40{64} "
+                       "SINGLE-VALUE NO-USER-MODIFICATION USAGE directoryOperation )",
+               NULL, SLAP_AT_HIDE,
+               NULL, NULL, NULL, NULL, NULL,
+               offsetof(struct slap_internal_schema, si_ad_superiorUUID) },
+
        /* root DSE attributes */
        { "altServer", "( 1.3.6.1.4.1.1466.101.120.6 NAME 'altServer' "
                        "DESC 'RFC2252: alternative servers' "

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index bc923d12577591e9b9a56d2f113fbd85550fec40..9fa03c3816d4b76337c0f438fbcbfe917f4b9b39 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -678,6 +678,7 @@ struct slap_internal_schema {
        AttributeDescription *si_ad_collectiveExclusions;
        AttributeDescription *si_ad_entryUUID;
        AttributeDescription *si_ad_entryCSN;
+       AttributeDescription *si_ad_superiorUUID;
 
        /* root DSE attribute descriptions */
        AttributeDescription *si_ad_altServer;