X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=27facafff50b885212e29f62ec22abf0c11f39a5;hb=014ba5ac80497d02b83514f30dabe3824e9facdc;hp=90c58551c25d1ad3bf6e0cd2ccb99c69ded1a1e1;hpb=587d36e18b923f47b4b56288df2b26821c2a7750;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 90c58551c2..27facafff5 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -208,6 +208,42 @@ at_destroy( void )
 		ad_destroy(slap_schema.si_at_undefined->sat_ad);
 }
 
+int
+at_start( AttributeType **at )
+{
+	assert( at );
+
+	*at = attr_list;
+
+	return (*at != NULL);
+}
+
+int
+at_next( AttributeType **at )
+{
+	assert( at );
+
+#if 1	/* pedantic check */
+	{
+		AttributeType *tmp;
+
+		for ( tmp = attr_list; tmp; tmp = tmp->sat_next ) {
+			if ( tmp == *at ) {
+				break;
+			}
+		}
+
+		assert( tmp );
+	}
+#endif
+
+	*at = (*at)->sat_next;
+
+	return (*at != NULL);
+}
+	
+
+
 static int
 at_insert(
     AttributeType	*sat,
@@ -235,7 +271,7 @@ at_insert(
 				 (AVL_DUP) avl_dup_error ) ) {
 			*err = sat->sat_oid;
 			ldap_memfree(air);
-			return SLAP_SCHERR_DUP_ATTR;
+			return SLAP_SCHERR_ATTR_DUP;
 		}
 		/* FIX: temporal consistency check */
 		at_bvfind(&air->air_name);
@@ -253,7 +289,7 @@ at_insert(
 					 (AVL_DUP) avl_dup_error ) ) {
 				*err = *names;
 				ldap_memfree(air);
-				return SLAP_SCHERR_DUP_ATTR;
+				return SLAP_SCHERR_ATTR_DUP;
 			}
 			/* FIX: temporal consistency check */
 			at_bvfind(&air->air_name);
@@ -273,8 +309,36 @@ at_add(
 	AttributeType	*sat;
 	MatchingRule	*mr;
 	Syntax		*syn;
+	int		i;
 	int		code;
-	char			*cname;
+	char	*cname;
+	char	*oid;
+
+	if ( !OID_LEADCHAR( at->at_oid[0] )) {
+		/* Expand OID macros */
+		oid = oidm_find( at->at_oid );
+		if ( !oid ) {
+			*err = at->at_oid;
+			return SLAP_SCHERR_OIDM;
+		}
+		if ( oid != at->at_oid ) {
+			ldap_memfree( at->at_oid );
+			at->at_oid = oid;
+		}
+	}
+
+	if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) {
+		/* Expand OID macros */
+		oid = oidm_find( at->at_syntax_oid );
+		if ( !oid ) {
+			*err = at->at_syntax_oid;
+			return SLAP_SCHERR_OIDM;
+		}
+		if ( oid != at->at_syntax_oid ) {
+			ldap_memfree( at->at_syntax_oid );
+			at->at_syntax_oid = oid;
+		}
+	}
 
 	if ( at->at_names && at->at_names[0] ) {
 		int i;
@@ -304,18 +368,15 @@ at_add(
 	}
 
 	if ( at->at_collective ) {
-#ifdef SLAP_COLLECTIVE
 		if( at->at_usage ) {
 			/* collective attributes cannot be operational */
-			return SLAP_SCHERR_NOT_SUPPORTED;
+			return SLAP_SCHERR_ATTR_BAD_USAGE;
 		}
+
 		if( at->at_single_value ) {
 			/* collective attributes cannot be single-valued */
-			return SLAP_SCHERR_NOT_SUPPORTED;
+			return SLAP_SCHERR_ATTR_BAD_USAGE;
 		}
-#else
-		return SLAP_SCHERR_NOT_SUPPORTED;
-#endif
 	}
 
 	sat = (AttributeType *) ch_calloc( 1, sizeof(AttributeType) );
@@ -328,7 +389,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;
 		}
@@ -343,6 +404,16 @@ at_add(
 			/* subtypes must have same usage as their SUP */
 			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;
+		}
 	}
 
 	/*
@@ -359,45 +430,135 @@ 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 {
+		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 {
+		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
+		 * we check against the equality rule assertion
+		 * 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_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);
@@ -424,7 +585,6 @@ at_index_print( void )
 }
 #endif
 
-#if defined( SLAPD_SCHEMA_DN )
 int
 at_schema_info( Entry *e )
 {
@@ -436,16 +596,15 @@ at_schema_info( Entry *e )
 	vals[1].bv_val = NULL;
 
 	for ( at = attr_list; at; at = at->sat_next ) {
+		if( at->sat_flags & SLAP_AT_HIDE ) continue;
+
 		if ( ldap_attributetype2bv( &at->sat_atype, vals ) == NULL ) {
 			return -1;
 		}
-#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 );
+
+		if( attr_merge( e, ad_attributeTypes, vals ) )
+			return -1;
 		ldap_memfree( vals[0].bv_val );
 	}
 	return 0;
 }
-#endif