--- servers/slapd/schema_check.c	2007/02/13 20:22:21	1.103.2.1
+++ servers/slapd/schema_check.c	2007/09/29 09:55:21	1.103.2.3
@@ -1,5 +1,5 @@
 /* schema_check.c - routines to enforce schema definitions */
-/* $OpenLDAP: pkg/ldap/servers/slapd/schema_check.c,v 1.107 2007/02/11 13:37:21 hyc Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/schema_check.c,v 1.103.2.2 2007/08/31 23:14:00 quanah Exp $ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
  * Copyright 1998-2007 The OpenLDAP Foundation.
@@ -172,7 +172,7 @@ entry_schema_check(
 			e->e_dn, textbuf, 0 );
 
 		rc = LDAP_OBJECT_CLASS_VIOLATION;
-		goto leave;
+		goto done;
 	}
 
 	if( sc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
@@ -185,7 +185,7 @@ entry_schema_check(
 			e->e_dn, textbuf, 0 );
 
 		rc = LDAP_OTHER;
-		goto leave;
+		goto done;
 	}
 
 got_soc:
@@ -199,7 +199,7 @@ got_soc:
 			e->e_dn, textbuf, 0 );
 
 		rc = LDAP_OBJECT_CLASS_VIOLATION;
-		goto leave;
+		goto done;
 	}
 
 	*text = textbuf;
@@ -209,7 +209,7 @@ got_soc:
 			"unrecognized objectClass '%s'",
 			aoc->a_vals[0].bv_val );
 		rc = LDAP_OBJECT_CLASS_VIOLATION;
-		goto leave;
+		goto done;
 
 	} else if ( sc != slap_schema.si_oc_glue && sc != oc ) {
 		snprintf( textbuf, textlen, 
@@ -217,7 +217,7 @@ got_soc:
 			"from '%s' to '%s' not allowed",
 			asc->a_vals[0].bv_val, oc->soc_cname.bv_val );
 		rc = LDAP_NO_OBJECT_CLASS_MODS;
-		goto leave;
+		goto done;
 	} else if ( sc == slap_schema.si_oc_glue ) {
 		sc = oc;
 	}
@@ -226,7 +226,7 @@ got_soc:
 	if ( !is_entry_glue ( e ) ) {
 		rc = entry_naming_check( e, manage, text, textbuf, textlen );
 		if( rc != LDAP_SUCCESS ) {
-			goto leave;
+			goto done;
 		}
 	} else {
 		/* Glue Entry */
@@ -250,7 +250,7 @@ got_soc:
 				e->e_dn, textbuf, 0 );
 
 			rc = LDAP_OBJECT_CLASS_VIOLATION;
-			goto leave;
+			goto done;
 		}
 
 		if( cr->scr_required ) for( i=0; cr->scr_required[i]; i++ ) {
@@ -274,7 +274,7 @@ got_soc:
 					e->e_dn, textbuf, 0 );
 
 				rc = LDAP_OBJECT_CLASS_VIOLATION;
-				goto leave;
+				goto done;
 			}
 		}
 
@@ -299,7 +299,7 @@ got_soc:
 					e->e_dn, textbuf, 0 );
 
 				rc = LDAP_OBJECT_CLASS_VIOLATION;
-				goto leave;
+				goto done;
 			}
 		}
 	}
@@ -318,14 +318,14 @@ got_soc:
 				e->e_dn, textbuf, 0 );
 
 			rc = LDAP_OBJECT_CLASS_VIOLATION;
-			goto leave;
+			goto done;
 		}
 
 		if ( oc->soc_check ) {
 			rc = (oc->soc_check)( op->o_bd, e, oc,
 				text, textbuf, textlen );
 			if( rc != LDAP_SUCCESS ) {
-				goto leave;
+				goto done;
 			}
 		}
 
@@ -365,7 +365,7 @@ got_soc:
 						e->e_dn, textbuf, 0 );
 
 					rc = LDAP_OBJECT_CLASS_VIOLATION;
-					goto leave;
+					goto done;
 				}
 			}
 
@@ -408,7 +408,7 @@ got_soc:
 						e->e_dn, textbuf, 0 );
 
 					rc = LDAP_OBJECT_CLASS_VIOLATION;
-					goto leave;
+					goto done;
 				}
 			}
 
@@ -423,7 +423,7 @@ got_soc:
 					e->e_dn, textbuf, 0 );
 
 				rc = LDAP_OBJECT_CLASS_VIOLATION;
-				goto leave;
+				goto done;
 			}
 
 			if( oc == slap_schema.si_oc_extensibleObject ) {
@@ -435,7 +435,7 @@ got_soc:
 	if( extensible ) {
 		*text = NULL;
 		rc = LDAP_SUCCESS;
-		goto leave;
+		goto done;
 	}
 
 	/* check that each attr in the entry is allowed by some oc */
@@ -476,12 +476,12 @@ got_soc:
 			    "Entry (%s), %s\n",
 			    e->e_dn, textbuf, 0 );
 
-			goto leave;
+			goto done;
 		}
 	}
 
 	*text = NULL;
-leave:
+done:
 	slap_sl_free( socs, op->o_tmpmemctx );
 	return rc;
 }
@@ -572,6 +572,10 @@ int oc_check_allowed(
 	for ( i = 0; socs[i]; i++ ) {
 		/* if we know about the oc */
 		ObjectClass	*oc = socs[i];
+		/* extensibleObject allows all */
+		if ( oc == slap_schema.si_oc_extensibleObject ) {
+			return LDAP_SUCCESS;
+		}
 		if ( oc != NULL && oc->soc_kind != LDAP_SCHEMA_ABSTRACT &&
 			( sc == NULL || oc->soc_kind == LDAP_SCHEMA_AUXILIARY ))
 		{
@@ -852,9 +856,9 @@ entry_naming_check(
 			break;
 		}
 
-		rc = value_find_ex( desc, SLAP_MR_VALUE_OF_ASSERTION_SYNTAX|
+		rc = attr_valfind( attr, SLAP_MR_VALUE_OF_ASSERTION_SYNTAX|
 			SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
-			attr->a_nvals, &ava->la_value, NULL );
+			&ava->la_value, NULL, NULL );
 
 		if( rc != 0 ) {
 			switch( rc ) {