Import ITS#4158 fixes from HEAD

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 5333e376dc76803ba4e0b95fc9620e474a54ce8c..fe603c9aed9e554ff68edaed55fb35099637e161 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -1,9 +1,18 @@
+/* at.c - routines for dealing with attribute types */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/* at.c - routines for dealing with attribute types */
 
 #include "portable.h"
 
@@ -485,6 +494,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 +534,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 +556,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 +606,26 @@ 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;
+       struct berval   nval;
 
        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 */ ) )
-#else
-               if( attr_merge( e, ad_attributeTypes, vals ) )
-#endif
+               nval.bv_val = at->sat_oid;
+               nval.bv_len = strlen(at->sat_oid);
+
+               if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
                {
                        return -1;
                }
-               ldap_memfree( vals[0].bv_val );
+               ldap_memfree( val.bv_val );
        }
        return 0;
 }