Import single-value check

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 7e3c90890c3fb438090d32bf24a8008de7531c9c..cd5d318169f73e02bf7efed40e1f7d1cc29757fe 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -423,7 +423,7 @@ int slap_modlist2mods(
                                        "%s: multiple value provided",
                                        ml->ml_type );
                                *text = textbuf;
-                               return LDAP_INVALID_SYNTAX;
+                               return LDAP_CONSTRAINT_VIOLATION;
                        }
                }
 

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index bc43608b812c73d631b1a436ec7be84e2fbffb36..b74e7b644a1c14dfb8af989f5651b5d2336fe552 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -33,10 +33,33 @@ entry_schema_check(
        Attribute       *a, *aoc;
        ObjectClass *oc;
        int             i;
-       int             ret;
        AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
        int extensible = 0;
 
+       /* check single-valued attrs for multiple values */
+       for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
+               /* there should be at least one value */
+               assert( a->a_vals );
+               assert( a->a_vals[0] != NULL ); 
+
+               /* if single value type, check for multiple values */
+               if( is_at_single_value( a->a_desc->ad_type ) &&
+                       a->a_vals[1] != NULL )
+               {
+                       char *type = a->a_desc->ad_cname->bv_val;
+
+                       snprintf( textbuf, textlen, 
+                               "attribute '%s' cannot have multiple values",
+                               type );
+
+                       Debug( LDAP_DEBUG_ANY,
+                           "Entry (%s), %s\n",
+                           e->e_dn, textbuf, 0 );
+
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+       }
+
        if( !global_schemacheck ) return LDAP_SUCCESS;
 
        *text = textbuf;
@@ -88,13 +111,10 @@ entry_schema_check(
                return LDAP_SUCCESS;
        }
 
-       /* optimistic */
-       ret = LDAP_SUCCESS;
-
        /* check that each attr in the entry is allowed by some oc */
        for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
-               ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals );
-               if ( ret != 0 ) {
+               int ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals );
+               if ( ret != LDAP_SUCCESS ) {
                        char *type = a->a_desc->ad_cname->bv_val;
 
                        snprintf( textbuf, textlen, 
@@ -105,11 +125,11 @@ entry_schema_check(
                            "Entry (%s), %s\n",
                            e->e_dn, textbuf, 0 );
 
-                       break;
+                       return ret;
                }
        }
 
-       return( ret );
+       return LDAP_SUCCESS;
 }
 
 static char *