ObjectClass *oc,
struct berval *ocname );
+static int entry_naming_check(
+ Entry *e,
+ const char** text,
+ char *textbuf, size_t textlen );
/*
* entry_schema_check - check that entry e conforms to the schema required
* by its object class(es).
return LDAP_NO_OBJECT_CLASS_MODS;
}
- { /* naming check */
- LDAPRDN *rdn;
- const char *p;
- ber_len_t cnt;
-
- /*
- * Get attribute type(s) and attribute value(s) of our RDN
- */
- if ( ldap_bv2rdn( &e->e_name, &rdn, (char **)&p,
- LDAP_DN_FORMAT_LDAP ) )
- {
- *text = "unrecongized attribute type(s) in RDN";
- return LDAP_INVALID_DN_SYNTAX;
- }
-
- /* Check that each AVA of the RDN is present in the entry */
- /* FIXME: Should also check that each AVA lists a distinct type */
- for ( cnt = 0; rdn[0][cnt]; cnt++ ) {
- LDAPAVA *ava = rdn[0][cnt];
- AttributeDescription *desc = NULL;
- Attribute *attr;
- const char *errtext;
-
- rc = slap_bv2ad( &ava->la_attr, &desc, &errtext );
- if ( rc != LDAP_SUCCESS ) {
- snprintf( textbuf, textlen, "%s (in RDN)", errtext );
- return rc;
- }
-
- /* find the naming attribute */
- attr = attr_find( e->e_attrs, desc );
- if ( attr == NULL ) {
- snprintf( textbuf, textlen,
- "naming attribute '%s' is not present in entry",
- ava->la_attr );
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
-
- if ( value_find( desc, attr->a_vals, &ava->la_value ) != 0 ) {
- snprintf( textbuf, textlen,
- "value of naming attribute '%s' is not present in entry",
- ava->la_attr );
- return LDAP_NO_SUCH_ATTRIBUTE;
- }
- }
+ /* naming check */
+ rc = entry_naming_check( e, text, textbuf, textlen );
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
}
#ifdef SLAP_EXTENDED_SCHEMA
return structural_class( ocmod->sml_bvalues, sc, NULL,
text, textbuf, textlen );
}
+
+
+static int
+entry_naming_check(
+ Entry *e,
+ const char** text,
+ char *textbuf, size_t textlen )
+{
+ /* naming check */
+ LDAPRDN *rdn = NULL;
+ const char *p = NULL;
+ ber_len_t cnt;
+ int rc = LDAP_SUCCESS;
+
+ /*
+ * Get attribute type(s) and attribute value(s) of our RDN
+ */
+ if ( ldap_bv2rdn( &e->e_name, &rdn, (char **)&p,
+ LDAP_DN_FORMAT_LDAP ) )
+ {
+ *text = "unrecongized attribute type(s) in RDN";
+ return LDAP_INVALID_DN_SYNTAX;
+ }
+
+ /* Check that each AVA of the RDN is present in the entry */
+ /* FIXME: Should also check that each AVA lists a distinct type */
+ for ( cnt = 0; rdn[0][cnt]; cnt++ ) {
+ LDAPAVA *ava = rdn[0][cnt];
+ AttributeDescription *desc = NULL;
+ Attribute *attr;
+ const char *errtext;
+
+ rc = slap_bv2ad( &ava->la_attr, &desc, &errtext );
+ if ( rc != LDAP_SUCCESS ) {
+ snprintf( textbuf, textlen, "%s (in RDN)", errtext );
+ break;
+ }
+
+ /* find the naming attribute */
+ attr = attr_find( e->e_attrs, desc );
+ if ( attr == NULL ) {
+ snprintf( textbuf, textlen,
+ "naming attribute '%s' is not present in entry",
+ ava->la_attr.bv_val );
+ rc = LDAP_NO_SUCH_ATTRIBUTE;
+ break;
+ }
+
+#ifdef SLAP_NVALUES
+ if ( value_find_ex( desc,
+ SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH,
+ attr->a_nvals ? attr->a_nvals : attr->a_vals,
+ &ava->la_value ) != 0 )
+#else
+ if ( value_find( desc, attr->a_vals, &ava->la_value ) != 0 )
+#endif
+ {
+ snprintf( textbuf, textlen,
+ "value of naming attribute '%s' is not present in entry",
+ ava->la_attr.bv_val );
+ rc = LDAP_NO_SUCH_ATTRIBUTE;
+ break;
+ }
+ }
+
+ ldap_rdnfree( rdn );
+ return rc;
+}
+