X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fat.c;h=59bdb98142a23cf8882be565ef94941c41e9198a;hb=86bd3651e1bc6129cf2bd4ba271f33207843aaff;hp=e4030aec05cc6a7f1e85d0b46c32ad75a570847b;hpb=3f357270d4cbc812211d69fda6cf685c5963036b;p=openldap

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index e4030aec05..59bdb98142 100644
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -214,7 +214,31 @@ at_destroy( void )
 		a = LDAP_STAILQ_FIRST(&attr_list);
 		LDAP_STAILQ_REMOVE_HEAD(&attr_list, sat_next);
 
-		if (a->sat_subtypes) ldap_memfree(a->sat_subtypes);
+		if ( a->sat_equality ) {
+			MatchingRule	*mr;
+
+			mr = mr_find( a->sat_equality->smr_oid );
+			assert( mr != NULL );
+			if ( mr != a->sat_equality ) {
+				ch_free( a->sat_equality );
+				a->sat_equality = NULL;
+			}
+		}
+
+		assert( a->sat_syntax != NULL );
+		if ( a->sat_syntax != NULL ) {
+			Syntax		*syn;
+
+			syn = syn_find( a->sat_syntax->ssyn_oid );
+			assert( syn != NULL );
+			if ( syn != a->sat_syntax ) {
+				ch_free( a->sat_syntax );
+				a->sat_syntax = NULL;
+			}
+		}
+
+		if ( a->sat_oidmacro ) ldap_memfree( a->sat_oidmacro );
+		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);
@@ -223,12 +247,16 @@ at_destroy( void )
 	if ( slap_schema.si_at_undefined ) {
 		ad_destroy(slap_schema.si_at_undefined->sat_ad);
 	}
+
+	if ( slap_schema.si_at_proxied ) {
+		ad_destroy(slap_schema.si_at_proxied->sat_ad);
+	}
 }
 
 int
 at_start( AttributeType **at )
 {
-	assert( at );
+	assert( at != NULL );
 
 	*at = LDAP_STAILQ_FIRST(&attr_list);
 
@@ -238,7 +266,7 @@ at_start( AttributeType **at )
 int
 at_next( AttributeType **at )
 {
-	assert( at );
+	assert( at != NULL );
 
 #if 1	/* pedantic check */
 	{
@@ -250,7 +278,7 @@ at_next( AttributeType **at )
 			}
 		}
 
-		assert( tmp );
+		assert( tmp != NULL );
 	}
 #endif
 
@@ -258,7 +286,57 @@ at_next( AttributeType **at )
 
 	return (*at != NULL);
 }
-	
+
+/*
+ * check whether the two attributeTypes actually __are__ identical,
+ * or rather inconsistent
+ */
+static int
+at_check_dup(
+	AttributeType		*sat,
+	AttributeType		*new_sat )
+{
+	if ( new_sat->sat_oid != NULL ) {
+		if ( sat->sat_oid == NULL ) {
+			return SLAP_SCHERR_ATTR_INCONSISTENT;
+		}
+
+		if ( strcmp( sat->sat_oid, new_sat->sat_oid ) != 0 ) {
+			return SLAP_SCHERR_ATTR_INCONSISTENT;
+		}
+
+	} else {
+		if ( sat->sat_oid != NULL ) {
+			return SLAP_SCHERR_ATTR_INCONSISTENT;
+		}
+	}
+
+	if ( new_sat->sat_names ) {
+		int	i;
+
+		if ( sat->sat_names == NULL ) {
+			return SLAP_SCHERR_ATTR_INCONSISTENT;
+		}
+
+		for ( i = 0; new_sat->sat_names[ i ]; i++ ) {
+			if ( sat->sat_names[ i ] == NULL ) {
+				return SLAP_SCHERR_ATTR_INCONSISTENT;
+			}
+			
+			if ( strcasecmp( sat->sat_names[ i ],
+					new_sat->sat_names[ i ] ) != 0 )
+			{
+				return SLAP_SCHERR_ATTR_INCONSISTENT;
+			}
+		}
+	} else {
+		if ( sat->sat_names != NULL ) {
+			return SLAP_SCHERR_ATTR_INCONSISTENT;
+		}
+	}
+
+	return SLAP_SCHERR_ATTR_DUP;
+}
 
 
 static int
@@ -269,6 +347,7 @@ at_insert(
 	struct aindexrec	*air;
 	char			**names;
 
+
 	if ( sat->sat_oid ) {
 		air = (struct aindexrec *)
 			ch_calloc( 1, sizeof(struct aindexrec) );
@@ -276,16 +355,27 @@ at_insert(
 		air->air_name.bv_len = strlen(sat->sat_oid);
 		air->air_at = sat;
 		if ( avl_insert( &attr_index, (caddr_t) air,
-		                 attr_index_cmp, avl_dup_error ) ) {
+		                 attr_index_cmp, avl_dup_error ) )
+		{
+			AttributeType	*old_sat;
+			int		rc;
+
 			*err = sat->sat_oid;
-			ldap_memfree(air);
-			return SLAP_SCHERR_ATTR_DUP;
+
+			old_sat = at_bvfind( &air->air_name );
+			assert( old_sat != NULL );
+			rc = at_check_dup( old_sat, sat );
+
+			ldap_memfree( air );
+
+			return rc;
 		}
 		/* FIX: temporal consistency check */
-		at_bvfind(&air->air_name);
+		at_bvfind( &air->air_name );
 	}
 
-	if ( (names = sat->sat_names) ) {
+	names = sat->sat_names;
+	if ( names ) {
 		while ( *names ) {
 			air = (struct aindexrec *)
 				ch_calloc( 1, sizeof(struct aindexrec) );
@@ -293,10 +383,20 @@ at_insert(
 			air->air_name.bv_len = strlen(*names);
 			air->air_at = sat;
 			if ( avl_insert( &attr_index, (caddr_t) air,
-			                 attr_index_cmp, avl_dup_error ) ) {
+			                 attr_index_cmp, avl_dup_error ) )
+			{
+				AttributeType	*old_sat;
+				int		rc;
+
 				*err = *names;
+
+				old_sat = at_bvfind( &air->air_name );
+				assert( old_sat != NULL );
+				rc = at_check_dup( old_sat, sat );
+
 				ldap_memfree(air);
-				return SLAP_SCHERR_ATTR_DUP;
+
+				return rc;
 			}
 			/* FIX: temporal consistency check */
 			at_bvfind(&air->air_name);
@@ -304,6 +404,18 @@ at_insert(
 		}
 	}
 
+	if ( sat->sat_oid ) {
+		slap_ad_undef_promote( sat->sat_oid, sat );
+	}
+
+	names = sat->sat_names;
+	if ( names ) {
+		while ( *names ) {
+			slap_ad_undef_promote( *names, sat );
+			names++;
+		}
+	}
+
 	LDAP_STAILQ_INSERT_TAIL( &attr_list, sat, sat_next );
 
 	return 0;
@@ -311,10 +423,10 @@ at_insert(
 
 int
 at_add(
-    LDAPAttributeType	*at,
-	int				user,
-	AttributeType	**rsat,
-    const char		**err )
+	LDAPAttributeType	*at,
+	int			user,
+	AttributeType		**rsat,
+	const char		**err )
 {
 	AttributeType	*sat;
 	MatchingRule	*mr;
@@ -323,6 +435,7 @@ at_add(
 	int		code;
 	char	*cname;
 	char	*oid;
+	char	*oidm = NULL;
 
 	if ( !OID_LEADCHAR( at->at_oid[0] )) {
 		/* Expand OID macros */
@@ -332,7 +445,7 @@ at_add(
 			return SLAP_SCHERR_OIDM;
 		}
 		if ( oid != at->at_oid ) {
-			ldap_memfree( at->at_oid );
+			oidm = at->at_oid;
 			at->at_oid = oid;
 		}
 	}
@@ -394,6 +507,7 @@ at_add(
 
 	sat->sat_cname.bv_val = cname;
 	sat->sat_cname.bv_len = strlen( cname );
+	sat->sat_oidmacro = oidm;
 	ldap_pvt_thread_mutex_init(&sat->sat_ad_mutex);
 
 	if ( at->at_sup_oid ) {
@@ -401,28 +515,33 @@ at_add(
 
 		if ( supsat == NULL ) {
 			*err = at->at_sup_oid;
-			return SLAP_SCHERR_ATTR_NOT_FOUND;
+			code = SLAP_SCHERR_ATTR_NOT_FOUND;
+			goto error_return;
 		}
 
 		sat->sat_sup = supsat;
 
 		if ( at_append_to_list(sat, &supsat->sat_subtypes) ) {
-			return SLAP_SCHERR_OUTOFMEM;
+			code = SLAP_SCHERR_OUTOFMEM;
+			goto error_return;
 		}
 
 		if ( sat->sat_usage != supsat->sat_usage ) {
 			/* subtypes must have same usage as their SUP */
-			return SLAP_SCHERR_ATTR_BAD_USAGE;
+			code = SLAP_SCHERR_ATTR_BAD_USAGE;
+			goto error_return;
 		}
 
 		if ( supsat->sat_obsolete && !sat->sat_obsolete ) {
 			/* subtypes must be obsolete if super is */
-			return SLAP_SCHERR_ATTR_BAD_SUP;
+			code = SLAP_SCHERR_ATTR_BAD_SUP;
+			goto error_return;
 		}
 
 		if ( sat->sat_flags & SLAP_AT_FINAL ) {
 			/* cannot subtype a "final" attribute type */
-			return SLAP_SCHERR_ATTR_BAD_SUP;
+			code = SLAP_SCHERR_ATTR_BAD_SUP;
+			goto error_return;
 		}
 	}
 
@@ -445,9 +564,16 @@ at_add(
 	if ( sat->sat_extensions ) {
 		for (i=0; sat->sat_extensions[i]; i++) {
 			if (!strcasecmp( sat->sat_extensions[i]->lsei_name,
-				"X-ORDERED" )) {
-				sat->sat_flags |= SLAP_AT_ORDERED;
-				break;
+				"X-ORDERED" ) && sat->sat_extensions[i]->lsei_values ) {
+				if ( !strcasecmp( sat->sat_extensions[i]->lsei_values[0],
+					"VALUES" )) {
+					sat->sat_flags |= SLAP_AT_ORDERED_VAL;
+					break;
+				} else if ( !strcasecmp( sat->sat_extensions[i]->lsei_values[0],
+					"SIBLINGS" )) {
+					sat->sat_flags |= SLAP_AT_ORDERED_SIB;
+					break;
+				}
 			}
 		}
 	}
@@ -459,17 +585,20 @@ at_add(
 		syn = syn_find(sat->sat_syntax_oid);
 		if ( syn == NULL ) {
 			*err = sat->sat_syntax_oid;
-			return SLAP_SCHERR_SYN_NOT_FOUND;
+			code = SLAP_SCHERR_SYN_NOT_FOUND;
+			goto error_return;
 		}
 
 		if( sat->sat_syntax != NULL && sat->sat_syntax != syn ) {
-			return SLAP_SCHERR_ATTR_BAD_SUP;
+			code = SLAP_SCHERR_ATTR_BAD_SUP;
+			goto error_return;
 		}
 
 		sat->sat_syntax = syn;
 
 	} else if ( sat->sat_syntax == NULL ) {
-		return SLAP_SCHERR_ATTR_INCOMPLETE;
+		code = SLAP_SCHERR_ATTR_INCOMPLETE;
+		goto error_return;
 	}
 
 	if ( sat->sat_equality_oid ) {
@@ -477,18 +606,21 @@ at_add(
 
 		if( mr == NULL ) {
 			*err = sat->sat_equality_oid;
-			return SLAP_SCHERR_MR_NOT_FOUND;
+			code = SLAP_SCHERR_MR_NOT_FOUND;
+			goto error_return;
 		}
 
 		if(( mr->smr_usage & SLAP_MR_EQUALITY ) != SLAP_MR_EQUALITY ) {
 			*err = sat->sat_equality_oid;
-			return SLAP_SCHERR_ATTR_BAD_MR;
+			code = SLAP_SCHERR_ATTR_BAD_MR;
+			goto error_return;
 		}
 
 		if( sat->sat_syntax != mr->smr_syntax ) {
 			if( mr->smr_compat_syntaxes == NULL ) {
 				*err = sat->sat_equality_oid;
-				return SLAP_SCHERR_ATTR_BAD_MR;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 
 			for(i=0; mr->smr_compat_syntaxes[i]; i++) {
@@ -500,7 +632,8 @@ at_add(
 
 			if( i >= 0 ) {
 				*err = sat->sat_equality_oid;
-				return SLAP_SCHERR_ATTR_BAD_MR;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 		}
 
@@ -511,25 +644,29 @@ at_add(
 	if ( sat->sat_ordering_oid ) {
 		if( !sat->sat_equality ) {
 			*err = sat->sat_ordering_oid;
-			return SLAP_SCHERR_ATTR_BAD_MR;
+			code = SLAP_SCHERR_ATTR_BAD_MR;
+			goto error_return;
 		}
 
 		mr = mr_find(sat->sat_ordering_oid);
 
 		if( mr == NULL ) {
 			*err = sat->sat_ordering_oid;
-			return SLAP_SCHERR_MR_NOT_FOUND;
+			code = SLAP_SCHERR_MR_NOT_FOUND;
+			goto error_return;
 		}
 
 		if(( mr->smr_usage & SLAP_MR_ORDERING ) != SLAP_MR_ORDERING ) {
 			*err = sat->sat_ordering_oid;
-			return SLAP_SCHERR_ATTR_BAD_MR;
+			code = SLAP_SCHERR_ATTR_BAD_MR;
+			goto error_return;
 		}
 
 		if( sat->sat_syntax != mr->smr_syntax ) {
 			if( mr->smr_compat_syntaxes == NULL ) {
 				*err = sat->sat_ordering_oid;
-				return SLAP_SCHERR_ATTR_BAD_MR;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 
 			for(i=0; mr->smr_compat_syntaxes[i]; i++) {
@@ -541,7 +678,8 @@ at_add(
 
 			if( i >= 0 ) {
 				*err = sat->sat_ordering_oid;
-				return SLAP_SCHERR_ATTR_BAD_MR;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 		}
 
@@ -551,19 +689,22 @@ at_add(
 	if ( sat->sat_substr_oid ) {
 		if( !sat->sat_equality ) {
 			*err = sat->sat_substr_oid;
-			return SLAP_SCHERR_ATTR_BAD_MR;
+			code = SLAP_SCHERR_ATTR_BAD_MR;
+			goto error_return;
 		}
 
 		mr = mr_find(sat->sat_substr_oid);
 
 		if( mr == NULL ) {
 			*err = sat->sat_substr_oid;
-			return SLAP_SCHERR_MR_NOT_FOUND;
+			code = SLAP_SCHERR_MR_NOT_FOUND;
+			goto error_return;
 		}
 
 		if(( mr->smr_usage & SLAP_MR_SUBSTR ) != SLAP_MR_SUBSTR ) {
 			*err = sat->sat_substr_oid;
-			return SLAP_SCHERR_ATTR_BAD_MR;
+			code = SLAP_SCHERR_ATTR_BAD_MR;
+			goto error_return;
 		}
 
 		/* due to funky LDAP builtin substring rules,
@@ -574,7 +715,8 @@ at_add(
 		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;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 
 			for(i=0; sat->sat_equality->smr_compat_syntaxes[i]; i++) {
@@ -588,16 +730,31 @@ at_add(
 
 			if( i >= 0 ) {
 				*err = sat->sat_substr_oid;
-				return SLAP_SCHERR_ATTR_BAD_MR;
+				code = SLAP_SCHERR_ATTR_BAD_MR;
+				goto error_return;
 			}
 		}
 
 		sat->sat_substr = mr;
 	}
 
-	code = at_insert(sat,err);
-	if ( code == 0 && rsat )
+	code = at_insert( sat, err );
+	if ( code != 0 ) {
+error_return:;
+		if ( sat ) {
+			ldap_pvt_thread_mutex_destroy( &sat->sat_ad_mutex );
+			ch_free( sat );
+		}
+
+		if ( oidm ) {
+			SLAP_FREE( at->at_oid );
+			at->at_oid = oidm;
+		}
+
+	} else if ( rsat ) {
 		*rsat = sat;
+	}
+
 	return code;
 }
 
@@ -626,7 +783,7 @@ at_unparse( BerVarray *res, AttributeType *start, AttributeType *end, int sys )
 	AttributeType *at;
 	int i, num;
 	struct berval bv, *bva = NULL, idx;
-	char ibuf[32], *ptr;
+	char ibuf[32];
 
 	if ( !start )
 		start = LDAP_STAILQ_FIRST( &attr_list );
@@ -650,12 +807,20 @@ at_unparse( BerVarray *res, AttributeType *start, AttributeType *end, int sys )
 	}
 	i = 0;
 	for ( at=start; at; at=LDAP_STAILQ_NEXT(at, sat_next)) {
+		LDAPAttributeType lat, *latp;
 		if ( sys && !(at->sat_flags & SLAP_AT_HARDCODE)) continue;
-		if ( ldap_attributetype2bv( &at->sat_atype, &bv ) == NULL ) {
+		if ( at->sat_oidmacro ) {
+			lat = at->sat_atype;
+			lat.at_oid = at->sat_oidmacro;
+			latp = ⪫
+		} else {
+			latp = &at->sat_atype;
+		}
+		if ( ldap_attributetype2bv( latp, &bv ) == NULL ) {
 			ber_bvarray_free( bva );
 		}
 		if ( !sys ) {
-			idx.bv_len = sprintf(idx.bv_val, "{%02d}", i);
+			idx.bv_len = sprintf(idx.bv_val, "{%d}", i);
 		}
 		bva[i].bv_len = idx.bv_len + bv.bv_len;
 		bva[i].bv_val = ch_malloc( bva[i].bv_len + 1 );