X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=45aaae32da567d5fa833315fcbe3c29876f6580c;hb=4325d05ebc5ca096ee4a0d0177e7651c028c7449;hp=5333e376dc76803ba4e0b95fc9620e474a54ce8c;hpb=dd66e6e9292c1a250a89865d691f836003d08517;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 5333e376dc..45aaae32da 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -485,6 +485,11 @@ at_add(
 	}
 
 	if ( sat->sat_ordering_oid ) {
+		if( !sat->sat_equality ) {
+			*err = sat->sat_ordering_oid;
+			return SLAP_SCHERR_ATTR_BAD_MR;
+		}
+
 		mr = mr_find(sat->sat_ordering_oid);
 
 		if( mr == NULL ) {
@@ -520,6 +525,11 @@ at_add(
 	}
 
 	if ( sat->sat_substr_oid ) {
+		if( !sat->sat_equality ) {
+			*err = sat->sat_substr_oid;
+			return SLAP_SCHERR_ATTR_BAD_MR;
+		}
+
 		mr = mr_find(sat->sat_substr_oid);
 
 		if( mr == NULL ) {
@@ -537,9 +547,7 @@ at_add(
 		 * syntax and compat syntaxes instead of those
 		 * associated with the substrings rule.
 		 */
-		if( sat->sat_equality &&
-			sat->sat_syntax != sat->sat_equality->smr_syntax )
-		{
+		if( sat->sat_syntax != sat->sat_equality->smr_syntax ) {
 			if( sat->sat_equality->smr_compat_syntaxes == NULL ) {
 				*err = sat->sat_substr_oid;
 				return SLAP_SCHERR_ATTR_BAD_MR;
@@ -589,29 +597,32 @@ at_index_print( void )
 int
 at_schema_info( Entry *e )
 {
-	struct berval	vals[2];
-	AttributeType	*at;
-
 	AttributeDescription *ad_attributeTypes = slap_schema.si_ad_attributeTypes;
-
-	vals[1].bv_val = NULL;
+	AttributeType	*at;
+	struct berval	val;
+#ifdef SLAP_NVALUES
+	struct berval	nval;
+#endif
 
 	LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
 		if( at->sat_flags & SLAP_AT_HIDE ) continue;
 
-		if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
+		if ( ldap_attributetype2bv( &at->sat_atype, &val ) == NULL ) {
 			return -1;
 		}
 
 #ifdef SLAP_NVALUES
-		if( attr_merge( e, ad_attributeTypes, vals, NULL /* FIXME */ ) )
+		nval.bv_val = at->sat_oid;
+		nval.bv_len = strlen(at->sat_oid);
+
+		if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
 #else
-		if( attr_merge( e, ad_attributeTypes, vals ) )
+		if( attr_merge_one( e, ad_attributeTypes, &val ) )
 #endif
 		{
 			return -1;
 		}
-		ldap_memfree( vals[0].bv_val );
+		ldap_memfree( val.bv_val );
 	}
 	return 0;
 }