Add some initial BDB_INDEX code... needs much work.

[openldap] / servers / slapd / modify.c

diff --git a/servers/slapd/modify.c b/servers/slapd/modify.c
index 21b4bbcd6b0ff485132c4d212a58a14fecb8bab1..a00e54dc674491d6e5d75ef7ac8027f64274458a 100644 (file)
--- a/servers/slapd/modify.c
+++ b/servers/slapd/modify.c
@@ -54,7 +54,6 @@ do_modify(
        Debug( LDAP_DEBUG_TRACE, "do_modify\n", 0, 0, 0 );
 #endif
 
-
        /*
         * Parse the modify request.  It looks like this:
         *
@@ -190,7 +189,7 @@ do_modify(
                goto cleanup;
        }
 
-       if( ndn == '\0' ) {
+       if( *ndn == '\0' ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
                           "do_modify: attempt to modify root DSE.\n" ));
@@ -352,7 +351,8 @@ int slap_modlist2mods(
        int update,
        Modifications **mods,
        const char **text,
-       char *textbuf, size_t textlen )
+       char *textbuf,
+       size_t textlen )
 {
        int rc;
        Modifications **modtail = mods;
@@ -372,7 +372,8 @@ int slap_modlist2mods(
 
                if( rc != LDAP_SUCCESS ) {
                        slap_mods_free( mod );
-                       snprintf( textbuf, textlen, "%s: %s", ml->ml_type, text );
+                       snprintf( textbuf, textlen, "%s: %s",
+                               ml->ml_type, *text );
                        *text = textbuf;
                        return rc;
                }
@@ -414,6 +415,21 @@ int slap_modlist2mods(
                        return LDAP_CONSTRAINT_VIOLATION;
                }
 
+               if ( is_at_obsolete( ad->ad_type ) &&
+                       ( mod->sml_op == LDAP_MOD_ADD || ml->ml_bvalues != NULL ) )
+               {
+                       /*
+                        * attribute is obsolete,
+                        * only allow replace/delete with no values
+                        */
+                       slap_mods_free( mod );
+                       snprintf( textbuf, textlen,
+                               "%s: attribute is obsolete",
+                               ml->ml_type );
+                       *text = textbuf;
+                       return LDAP_CONSTRAINT_VIOLATION;
+               }
+
                /*
                 * check values
                 */
@@ -423,16 +439,6 @@ int slap_modlist2mods(
                                ad->ad_type->sat_syntax->ssyn_validate;
 
                        if( !validate ) {
-#ifdef NEW_LOGGING
-                               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                                          "modlist2mods: Attribute %s, no validator for syntax %s\n",
-                                          ml->ml_type, ad->ad_type->sat_syntax->ssyn_oid ));
-#else
-                               Debug( LDAP_DEBUG_TRACE,
-                                       "modlist2mods: no validator for syntax %s\n",
-                                       ad->ad_type->sat_syntax->ssyn_oid, 0, 0 );
-#endif
-
                                slap_mods_free( mod );
                                *text = "no validator for syntax";
                                snprintf( textbuf, textlen,
@@ -452,7 +458,7 @@ int slap_modlist2mods(
                                if( rc != 0 ) {
                                        slap_mods_free( mod );
                                        snprintf( textbuf, textlen,
-                                               "%s: value #%ld contains invalid data",
+                                               "%s: value #%ld invalid per syntax",
                                                ml->ml_type, (long) nvals );
                                        *text = textbuf;
                                        return LDAP_INVALID_SYNTAX;
@@ -471,7 +477,7 @@ int slap_modlist2mods(
                                        "%s: multiple value provided",
                                        ml->ml_type );
                                *text = textbuf;
-                               return LDAP_INVALID_SYNTAX;
+                               return LDAP_CONSTRAINT_VIOLATION;
                        }
                }
 
@@ -559,53 +565,3 @@ int slap_mods_opattrs(
        return LDAP_SUCCESS;
 }
 
-
-void
-slap_mod_free(
-       Modification    *mod,
-       int                             freeit
-)
-{
-       ad_free( mod->sm_desc, 1 );
-
-       if ( mod->sm_bvalues != NULL )
-               ber_bvecfree( mod->sm_bvalues );
-
-       if( freeit )
-               free( mod );
-}
-
-void
-slap_mods_free(
-    Modifications      *ml
-)
-{
-       Modifications *next;
-
-       for ( ; ml != NULL; ml = next ) {
-               next = ml->sml_next;
-
-               slap_mod_free( &ml->sml_mod, 0 );
-               free( ml );
-       }
-}
-
-void
-slap_modlist_free(
-    LDAPModList        *ml
-)
-{
-       LDAPModList *next;
-
-       for ( ; ml != NULL; ml = next ) {
-               next = ml->ml_next;
-
-               if (ml->ml_type)
-                       free( ml->ml_type );
-
-               if ( ml->ml_bvalues != NULL )
-                       ber_bvecfree( ml->ml_bvalues );
-
-               free( ml );
-       }
-}