From: Kurt Zeilenga <kurt@openldap.org>
Date: Sat, 31 Aug 2002 18:41:21 +0000 (+0000)
Subject: Don't hide matchingRuleUse's description (now implemented)
X-Git-Tag: NO_SLAP_OP_BLOCKS~1057
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6c7104c82b3cb2d66d321a134e97832e25a771d6;p=openldap

Don't hide matchingRuleUse's description (now implemented)
Use attribute's cname not oid in matching rule uses
---

diff --git a/servers/slapd/mr.c b/servers/slapd/mr.c
index 605dbe8f84..eeddc5fe4c 100644
--- a/servers/slapd/mr.c
+++ b/servers/slapd/mr.c
@@ -398,7 +398,7 @@ matching_rule_use_init( void )
 								at->sat_cname.bv_val, 0 );
 #endif
 						ldap_charray_add( &applies_oids,
-								at->sat_oid );
+								at->sat_cname.bv_val );
 					}
 				}
 			}
@@ -427,7 +427,7 @@ matching_rule_use_init( void )
 							at->sat_cname.bv_val, 0 );
 #endif
 					ldap_charray_add( &applies_oids,
-							at->sat_oid );
+							at->sat_cname.bv_val );
 				}
 			}
 			break;
@@ -455,7 +455,7 @@ matching_rule_use_init( void )
 							at->sat_cname.bv_val, 0 );
 #endif
 					ldap_charray_add( &applies_oids,
-							at->sat_oid );
+							at->sat_cname.bv_val );
 				}
 			}
 			break;
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index 8cc09e5218..85fc05ddf3 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -600,7 +600,7 @@ static struct slap_schema_ad_map {
 			"DESC 'RFC2252: matching rule uses' "
 			"EQUALITY objectIdentifierFirstComponentMatch "
 			"SYNTAX 1.3.6.1.4.1.1466.115.121.1.31 USAGE directoryOperation )",
-		subentryAttribute, SLAP_AT_HIDE,
+		subentryAttribute, 0,
 		NULL, NULL, NULL, NULL, NULL,
 		offsetof(struct slap_internal_schema, si_ad_matchingRuleUse) },