From: Pierangelo Masarati <ando@openldap.org>
Date: Fri, 29 Apr 2005 20:29:29 +0000 (+0000)
Subject: hardcode "description" and "seeAlso"
X-Git-Tag: OPENLDAP_AC_BP~763
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=8d41d6d92773a73ad163986b74a54b47877f1b33;p=openldap

hardcode "description" and "seeAlso"
---

diff --git a/servers/slapd/schema/core.schema b/servers/slapd/schema/core.schema
index 9a23e7b255..a06aefa5d6 100644
--- a/servers/slapd/schema/core.schema
+++ b/servers/slapd/schema/core.schema
@@ -121,11 +121,12 @@ attributetype ( 2.5.4.12 NAME 'title'
 	DESC 'RFC2256: title associated with the entity'
 	SUP name )
 
-attributetype ( 2.5.4.13 NAME 'description'
-	DESC 'RFC2256: descriptive information'
-	EQUALITY caseIgnoreMatch
-	SUBSTR caseIgnoreSubstringsMatch
-	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
+# system schema
+#attributetype ( 2.5.4.13 NAME 'description'
+#	DESC 'RFC2256: descriptive information'
+#	EQUALITY caseIgnoreMatch
+#	SUBSTR caseIgnoreSubstringsMatch
+#	SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )
 
 # Deprecated by enhancedSearchGuide
 attributetype ( 2.5.4.14 NAME 'searchGuide'
@@ -231,9 +232,10 @@ attributetype ( 2.5.4.33 NAME 'roleOccupant'
 	DESC 'RFC2256: occupant of role'
 	SUP distinguishedName )
 
-attributetype ( 2.5.4.34 NAME 'seeAlso'
-	DESC 'RFC2256: DN of related object'
-	SUP distinguishedName )
+# system schema
+#attributetype ( 2.5.4.34 NAME 'seeAlso'
+#	DESC 'RFC2256: DN of related object'
+#	SUP distinguishedName )
 
 # system schema
 #attributetype ( 2.5.4.35 NAME 'userPassword'
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index e05f5d63c5..be956ce1a3 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -941,7 +941,7 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_userPassword) },
 
-	{ "labeledURI", "(  1.3.6.1.4.1.250.1.57 NAME 'labeledURI' "
+	{ "labeledURI", "( 1.3.6.1.4.1.250.1.57 NAME 'labeledURI' "
 			"DESC 'RFC2079: Uniform Resource Identifier with optional label' "
 			"EQUALITY caseExactMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )",
@@ -983,6 +983,25 @@ static struct slap_schema_ad_map {
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_krbName) },
 #endif
+
+	{ "description", "( 2.5.4.13 NAME 'description' "
+			"DESC 'RFC2256: descriptive information' "
+			"EQUALITY caseIgnoreMatch "
+			"SUBSTR caseIgnoreSubstringsMatch "
+			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{1024} )",
+		NULL, 0,
+		NULL, NULL,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_description) },
+
+	{ "seeAlso", "( 2.5.4.34 NAME 'seeAlso' "
+			"DESC 'RFC2256: DN of related object' "
+			"SUP distinguishedName )",
+		NULL, 0,
+		NULL, NULL,
+		NULL, NULL, NULL, NULL, NULL,
+		offsetof(struct slap_internal_schema, si_ad_seeAlso) },
+
 	{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0 }
 };
 
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 5c085fdd25..237306ebcf 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -892,6 +892,8 @@ struct slap_internal_schema {
 #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND
 	AttributeDescription *si_ad_krbName;
 #endif
+	AttributeDescription *si_ad_description;
+	AttributeDescription *si_ad_seeAlso;
         
 	/* Undefined Attribute Type */
 	AttributeType	*si_at_undefined;