X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=7958a1ec3987b154c4916f71742ddcd80ab56656;hb=c2a9642850cef813e15f6d8e29799e2b99e52726;hp=d4fc1a78919b40b08ea77ac662d562e1edab6b88;hpb=e2ec62f09faa2a21c9ee8fab4450672cd910b91c;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index d4fc1a7891..7958a1ec39 100644
--- 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-2002 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"
 
@@ -15,7 +24,6 @@
 #include <ac/string.h>
 #include <ac/time.h>
 
-#include "ldap_pvt.h"
 #include "slap.h"
 
 
@@ -49,37 +57,38 @@ struct aindexrec {
 };
 
 static Avlnode	*attr_index = NULL;
-static AttributeType *attr_list = NULL;
+static Avlnode	*attr_cache = NULL;
+static LDAP_SLIST_HEAD(ATList, slap_attribute_type) attr_list
+	= LDAP_SLIST_HEAD_INITIALIZER(&attr_list);
+
+int at_oc_cache;
 
 static int
 attr_index_cmp(
-    struct aindexrec	*air1,
-    struct aindexrec	*air2
-)
+    const void	*v_air1,
+    const void	*v_air2 )
 {
+	const struct aindexrec	*air1 = v_air1;
+	const struct aindexrec	*air2 = v_air2;
 	int i = air1->air_name.bv_len - air2->air_name.bv_len;
-	if (i)
-		return i;
+	if (i) return i;
 	return (strcasecmp( air1->air_name.bv_val, air2->air_name.bv_val ));
 }
 
 static int
 attr_index_name_cmp(
-    struct berval	*type,
-    struct aindexrec	*air
-)
+    const void	*v_type,
+    const void	*v_air )
 {
+    const struct berval    *type = v_type;
+    const struct aindexrec *air  = v_air;
 	int i = type->bv_len - air->air_name.bv_len;
-	if (i)
-		return i;
-	return (strncasecmp( type->bv_val, air->air_name.bv_val,
-		type->bv_len ));
+	if (i) return i;
+	return (strncasecmp( type->bv_val, air->air_name.bv_val, type->bv_len ));
 }
 
 AttributeType *
-at_find(
-    const char		*name
-)
+at_find( const char *name )
 {
 	struct berval bv;
 
@@ -90,14 +99,21 @@ at_find(
 }
 
 AttributeType *
-at_bvfind(
-    struct berval	*name
-)
+at_bvfind( struct berval *name )
 {
 	struct aindexrec *air;
 
-	air = (struct aindexrec *) avl_find( attr_index, name,
-            (AVL_CMP) attr_index_name_cmp );
+	if ( attr_cache ) {
+		air = avl_find( attr_cache, name, attr_index_name_cmp );
+		if ( air ) return air->air_at;
+	}
+
+	air = avl_find( attr_index, name, attr_index_name_cmp );
+
+	if ( air && ( slapMode & SLAP_TOOL_MODE ) && at_oc_cache ) {
+		avl_insert( &attr_cache, (caddr_t) air,
+			attr_index_cmp, avl_dup_error );
+	}
 
 	return air != NULL ? air->air_at : NULL;
 }
@@ -105,8 +121,7 @@ at_bvfind(
 int
 at_append_to_list(
     AttributeType	*sat,
-    AttributeType	***listp
-)
+    AttributeType	***listp )
 {
 	AttributeType	**list;
 	AttributeType	**list1;
@@ -142,8 +157,7 @@ at_append_to_list(
 int
 at_delete_from_list(
     int			pos,
-    AttributeType	***listp
-)
+    AttributeType	***listp )
 {
 	AttributeType	**list;
 	AttributeType	**list1;
@@ -175,8 +189,7 @@ at_delete_from_list(
 int
 at_find_in_list(
     AttributeType	*sat,
-    AttributeType	**list
-)
+    AttributeType	**list )
 {
 	int	i;
 
@@ -194,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
@@ -213,7 +230,7 @@ at_start( AttributeType **at )
 {
 	assert( at );
 
-	*at = attr_list;
+	*at = LDAP_SLIST_FIRST(&attr_list);
 
 	return (*at != NULL);
 }
@@ -225,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;
 			}
@@ -237,7 +254,7 @@ at_next( AttributeType **at )
 	}
 #endif
 
-	*at = (*at)->sat_next;
+	*at = LDAP_SLIST_NEXT(*at,sat_next);
 
 	return (*at != NULL);
 }
@@ -247,18 +264,13 @@ at_next( AttributeType **at )
 static int
 at_insert(
     AttributeType	*sat,
-    const char		**err
-)
+    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 *)
@@ -267,8 +279,7 @@ at_insert(
 		air->air_name.bv_len = strlen(sat->sat_oid);
 		air->air_at = sat;
 		if ( avl_insert( &attr_index, (caddr_t) air,
-				 (AVL_CMP) attr_index_cmp,
-				 (AVL_DUP) avl_dup_error ) ) {
+		                 attr_index_cmp, avl_dup_error ) ) {
 			*err = sat->sat_oid;
 			ldap_memfree(air);
 			return SLAP_SCHERR_ATTR_DUP;
@@ -285,8 +296,7 @@ at_insert(
 			air->air_name.bv_len = strlen(*names);
 			air->air_at = sat;
 			if ( avl_insert( &attr_index, (caddr_t) air,
-					 (AVL_CMP) attr_index_cmp,
-					 (AVL_DUP) avl_dup_error ) ) {
+			                 attr_index_cmp, avl_dup_error ) ) {
 				*err = *names;
 				ldap_memfree(air);
 				return SLAP_SCHERR_ATTR_DUP;
@@ -303,12 +313,12 @@ at_insert(
 int
 at_add(
     LDAPAttributeType	*at,
-    const char		**err
-)
+    const char		**err )
 {
 	AttributeType	*sat;
 	MatchingRule	*mr;
 	Syntax		*syn;
+	int		i;
 	int		code;
 	char	*cname;
 	char	*oid;
@@ -337,7 +347,6 @@ at_add(
 			ldap_memfree( at->at_syntax_oid );
 			at->at_syntax_oid = oid;
 		}
-
 	}
 
 	if ( at->at_names && at->at_names[0] ) {
@@ -389,7 +398,7 @@ at_add(
 	if ( at->at_sup_oid ) {
 		AttributeType *supsat = at_find(at->at_sup_oid);
 
-		if ( (supsat == NULL ) ) {
+		if ( supsat == NULL ) {
 			*err = at->at_sup_oid;
 			return SLAP_SCHERR_ATTR_NOT_FOUND;
 		}
@@ -405,6 +414,11 @@ at_add(
 			return SLAP_SCHERR_ATTR_BAD_USAGE;
 		}
 
+		if ( supsat->sat_obsolete && !sat->sat_obsolete ) {
+			/* subtypes must be obsolete if super is */
+			return SLAP_SCHERR_ATTR_BAD_SUP;
+		}
+
 		if ( sat->sat_flags & SLAP_AT_FINAL ) {
 			/* cannot subtype a "final" attribute type */
 			return SLAP_SCHERR_ATTR_BAD_SUP;
@@ -425,45 +439,143 @@ at_add(
 	}
 
 	if ( at->at_syntax_oid ) {
-		if ( (syn = syn_find(sat->sat_syntax_oid)) ) {
-			sat->sat_syntax = syn;
-		} else {
+		syn = syn_find(sat->sat_syntax_oid);
+		if ( syn == NULL ) {
 			*err = sat->sat_syntax_oid;
 			return SLAP_SCHERR_SYN_NOT_FOUND;
 		}
 
+		if( sat->sat_syntax != NULL && sat->sat_syntax != syn ) {
+			return SLAP_SCHERR_ATTR_BAD_SUP;
+		}
+
+		sat->sat_syntax = syn;
 
 	} else if ( sat->sat_syntax == NULL ) {
 		return SLAP_SCHERR_ATTR_INCOMPLETE;
 	}
 
 	if ( sat->sat_equality_oid ) {
-		if ( (mr = mr_find(sat->sat_equality_oid)) ) {
-			sat->sat_equality = mr;
-			sat->sat_approx = mr->smr_associated;
-		} else {
+		mr = mr_find(sat->sat_equality_oid);
+
+		if( mr == NULL ) {
 			*err = sat->sat_equality_oid;
 			return SLAP_SCHERR_MR_NOT_FOUND;
 		}
 
+		if(( mr->smr_usage & SLAP_MR_EQUALITY ) != SLAP_MR_EQUALITY ) {
+			*err = sat->sat_equality_oid;
+			return SLAP_SCHERR_ATTR_BAD_MR;
+		}
+
+		if( sat->sat_syntax != mr->smr_syntax ) {
+			if( mr->smr_compat_syntaxes == NULL ) {
+				*err = sat->sat_equality_oid;
+				return SLAP_SCHERR_ATTR_BAD_MR;
+			}
+
+			for(i=0; mr->smr_compat_syntaxes[i]; i++) {
+				if( sat->sat_syntax == mr->smr_compat_syntaxes[i] ) {
+					i = -1;
+					break;
+				}
+			}
+
+			if( i >= 0 ) {
+				*err = sat->sat_equality_oid;
+				return SLAP_SCHERR_ATTR_BAD_MR;
+			}
+		}
+
+		sat->sat_equality = mr;
+		sat->sat_approx = mr->smr_associated;
 	}
 
 	if ( sat->sat_ordering_oid ) {
-		if ( (mr = mr_find(sat->sat_ordering_oid)) ) {
-			sat->sat_ordering = mr;
-		} else {
+		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 ) {
 			*err = sat->sat_ordering_oid;
 			return SLAP_SCHERR_MR_NOT_FOUND;
 		}
+
+		if(( mr->smr_usage & SLAP_MR_ORDERING ) != SLAP_MR_ORDERING ) {
+			*err = sat->sat_ordering_oid;
+			return SLAP_SCHERR_ATTR_BAD_MR;
+		}
+
+		if( sat->sat_syntax != mr->smr_syntax ) {
+			if( mr->smr_compat_syntaxes == NULL ) {
+				*err = sat->sat_ordering_oid;
+				return SLAP_SCHERR_ATTR_BAD_MR;
+			}
+
+			for(i=0; mr->smr_compat_syntaxes[i]; i++) {
+				if( sat->sat_syntax == mr->smr_compat_syntaxes[i] ) {
+					i = -1;
+					break;
+				}
+			}
+
+			if( i >= 0 ) {
+				*err = sat->sat_ordering_oid;
+				return SLAP_SCHERR_ATTR_BAD_MR;
+			}
+		}
+
+		sat->sat_ordering = mr;
 	}
 
 	if ( sat->sat_substr_oid ) {
-		if ( (mr = mr_find(sat->sat_substr_oid)) ) {
-			sat->sat_substr = mr;
-		} else {
+		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 ) {
 			*err = sat->sat_substr_oid;
 			return SLAP_SCHERR_MR_NOT_FOUND;
 		}
+
+		if(( mr->smr_usage & SLAP_MR_SUBSTR ) != SLAP_MR_SUBSTR ) {
+			*err = sat->sat_substr_oid;
+			return SLAP_SCHERR_ATTR_BAD_MR;
+		}
+
+		/* due to funky LDAP builtin substring rules,
+		 * we check against the equality rule assertion
+		 * syntax and compat syntaxes instead of those
+		 * associated with the substrings rule.
+		 */
+		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;
+			}
+
+			for(i=0; sat->sat_equality->smr_compat_syntaxes[i]; i++) {
+				if( sat->sat_syntax ==
+					sat->sat_equality->smr_compat_syntaxes[i] )
+				{
+					i = -1;
+					break;
+				}
+			}
+
+			if( i >= 0 ) {
+				*err = sat->sat_substr_oid;
+				return SLAP_SCHERR_ATTR_BAD_MR;
+			}
+		}
+
+		sat->sat_substr = mr;
 	}
 
 	code = at_insert(sat,err);
@@ -472,9 +584,9 @@ at_add(
 
 #ifdef LDAP_DEBUG
 static int
-at_index_printnode( struct aindexrec *air )
+at_index_printnode( void *v_air, void *ignore )
 {
-
+	struct aindexrec *air = v_air;
 	printf("%s = %s\n",
 		air->air_name.bv_val,
 		ldap_attributetype2str(&air->air_at->sat_atype) );
@@ -485,36 +597,33 @@ static void
 at_index_print( void )
 {
 	printf("Printing attribute type index:\n");
-	(void) avl_apply( attr_index, (AVL_APPLY) at_index_printnode,
-		0, -1, AVL_INORDER );
+	(void) avl_apply( attr_index, at_index_printnode, 0, -1, AVL_INORDER );
 }
 #endif
 
-#if defined( SLAPD_SCHEMA_DN )
 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;
+	LDAP_SLIST_FOREACH(at,&attr_list,sat_next) {
+		if( at->sat_flags & SLAP_AT_HIDE ) continue;
 
-	for ( at = attr_list; at; at = at->sat_next ) {
-		if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
+		if ( ldap_attributetype2bv( &at->sat_atype, &val ) == NULL ) {
 			return -1;
 		}
 
-		if( at->sat_flags & SLAP_AT_HIDE ) continue;
+		nval.bv_val = at->sat_oid;
+		nval.bv_len = strlen(at->sat_oid);
 
-#if 0
-		Debug( LDAP_DEBUG_TRACE, "Merging at [%ld] %s\n",
-		       (long) vals[0].bv_len, vals[0].bv_val, 0 );
-#endif
-		attr_merge( e, ad_attributeTypes, vals );
-		ldap_memfree( vals[0].bv_val );
+		if( attr_merge_one( e, ad_attributeTypes, &val, &nval ) )
+		{
+			return -1;
+		}
+		ldap_memfree( val.bv_val );
 	}
 	return 0;
 }
-#endif