Import ITS#4158 fixes from HEAD

[openldap] / servers / slapd / at.c

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index c262dd6b21e3285c7907622f89a98ffbabb291c6..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"
 
@@ -49,7 +58,8 @@ struct aindexrec {
 };
 
 static Avlnode *attr_index = NULL;
-static AttributeType *attr_list = NULL;
+static LDAP_SLIST_HEAD(ATList, slap_attribute_type) attr_list
+       = LDAP_SLIST_HEAD_INITIALIZER(&attr_list);
 
 static int
 attr_index_cmp(
@@ -197,18 +207,22 @@ at_find_in_list(
 void
 at_destroy( void )
 {
-       AttributeType *a, *n;
+       AttributeType *a;
        avl_free(attr_index, ldap_memfree);
 
-       for (a=attr_list; a; a=n) {
-               n = a->sat_next;
+       while( !LDAP_SLIST_EMPTY(&attr_list) ) {
+               a = LDAP_SLIST_FIRST(&attr_list);
+               LDAP_SLIST_REMOVE_HEAD(&attr_list, sat_next);
+
                if (a->sat_subtypes) ldap_memfree(a->sat_subtypes);
                ad_destroy(a->sat_ad);
                ldap_pvt_thread_mutex_destroy(&a->sat_ad_mutex);
                ldap_attributetype_free((LDAPAttributeType *)a);
        }
-       if ( slap_schema.si_at_undefined )
+
+       if ( slap_schema.si_at_undefined ) {
                ad_destroy(slap_schema.si_at_undefined->sat_ad);
+       }
 }
 
 int
@@ -216,7 +230,7 @@ at_start( AttributeType **at )
 {
        assert( at );
 
-       *at = attr_list;
+       *at = LDAP_SLIST_FIRST(&attr_list);
 
        return (*at != NULL);
 }
@@ -228,9 +242,9 @@ at_next( AttributeType **at )
 
 #if 1  /* pedantic check */
        {
-               AttributeType *tmp;
+               AttributeType *tmp = NULL;
 
-               for ( tmp = attr_list; tmp; tmp = tmp->sat_next ) {
+               LDAP_SLIST_FOREACH(tmp,&attr_list,sat_next) {
                        if ( tmp == *at ) {
                                break;
                        }
@@ -240,7 +254,7 @@ at_next( AttributeType **at )
        }
 #endif
 
-       *at = (*at)->sat_next;
+       *at = LDAP_SLIST_NEXT(*at,sat_next);
 
        return (*at != NULL);
 }
@@ -253,15 +267,11 @@ at_insert(
     const char         **err
 )
 {
-       AttributeType           **atp;
        struct aindexrec        *air;
        char                    **names;
 
-       atp = &attr_list;
-       while ( *atp != NULL ) {
-               atp = &(*atp)->sat_next;
-       }
-       *atp = sat;
+       LDAP_SLIST_NEXT( sat, sat_next ) = NULL;
+       LDAP_SLIST_INSERT_HEAD( &attr_list, sat, sat_next );
 
        if ( sat->sat_oid ) {
                air = (struct aindexrec *)
@@ -484,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 ) {
@@ -519,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 ) {
@@ -536,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;
@@ -588,23 +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;
+       AttributeType   *at;
+       struct berval   val;
+       struct berval   nval;
 
-       vals[1].bv_val = NULL;
-
-       for ( at = attr_list; at; at = at->sat_next ) {
+       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;
                }
 
-               if( attr_merge( e, ad_attributeTypes, vals ) )
+               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;
 }