More struct berval DN changes

[openldap] / servers / slapd / back-ldbm / modify.c

diff --git a/servers/slapd/back-ldbm/modify.c b/servers/slapd/back-ldbm/modify.c
index 9bda7df81cd7cc2d6c9d63eec3c190b896cd7338..7ff5926457bfac6cff1bb25d644fde8a09c85342 100644 (file)
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -34,7 +34,9 @@ int ldbm_modify_internal(
     const char *dn,
     Modifications      *modlist,
     Entry      *e,
-       const char **text 
+       const char **text,
+       char *textbuf,
+       size_t textlen
 )
 {
        int rc, err;
@@ -44,9 +46,9 @@ int ldbm_modify_internal(
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "ldbm_modify_internal: %s\n", dn ));
+               "ldbm_modify_internal: %s\n", dn ));
 #else
-       Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal:\n", 0, 0, 0);
+       Debug(LDAP_DEBUG_TRACE, "ldbm_modify_internal: %s\n", dn, 0, 0);
 #endif
 
 
@@ -64,19 +66,19 @@ int ldbm_modify_internal(
                case LDAP_MOD_ADD:
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                  "ldbm_modify_internal: add\n" ));
+                               "ldbm_modify_internal: add\n" ));
 #else
                        Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: add\n", 0, 0, 0);
 #endif
 
-                       err = add_values( e, mod, op->o_ndn );
+                       err = add_values( e, mod, op->o_ndn.bv_val );
 
                        if( err != LDAP_SUCCESS ) {
                                *text = "modify: add values failed";
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                                          "ldbm_modify_internal: failed %d (%s)\n",
-                                          err, *text ));
+                                       "ldbm_modify_internal: failed %d (%s)\n",
+                                       err, *text ));
 #else
                                Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -87,18 +89,18 @@ int ldbm_modify_internal(
                case LDAP_MOD_DELETE:
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                  "ldbm_modify_internal: delete\n" ));
+                               "ldbm_modify_internal: delete\n" ));
 #else
                        Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: delete\n", 0, 0, 0);
 #endif
 
-                       err = delete_values( e, mod, op->o_ndn );
+                       err = delete_values( e, mod, op->o_ndn.bv_val );
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
                                *text = "modify: delete values failed";
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                                          "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
+                                       "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
 #else
                                Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -109,18 +111,18 @@ int ldbm_modify_internal(
                case LDAP_MOD_REPLACE:
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                  "ldbm_modify_internal:  replace\n" ));
+                               "ldbm_modify_internal:  replace\n" ));
 #else
                        Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: replace\n", 0, 0, 0);
 #endif
 
-                       err = replace_values( e, mod, op->o_ndn );
+                       err = replace_values( e, mod, op->o_ndn.bv_val );
                        assert( err != LDAP_TYPE_OR_VALUE_EXISTS );
                        if( err != LDAP_SUCCESS ) {
                                *text = "modify: replace values failed";
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                                          "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
+                                       "ldbm_modify_internal: failed %d (%s)\n", err, *text ));
 #else
                                Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
                                        err, *text, 0);
@@ -132,7 +134,7 @@ int ldbm_modify_internal(
                case SLAP_MOD_SOFTADD:
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
-                                  "ldbm_modify_internal: softadd\n" ));
+                               "ldbm_modify_internal: softadd\n" ));
 #else
                        Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: softadd\n", 0, 0, 0);
 #endif
@@ -141,7 +143,7 @@ int ldbm_modify_internal(
                         * We need to add index if necessary.
                         */
                        mod->sm_op = LDAP_MOD_ADD;
-                       err = add_values( e, mod, op->o_ndn );
+                       err = add_values( e, mod, op->o_ndn.bv_val );
 
                        if ( err == LDAP_TYPE_OR_VALUE_EXISTS ) {
                                err = LDAP_SUCCESS;
@@ -163,7 +165,7 @@ int ldbm_modify_internal(
                default:
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                                  "ldbm_modify_internal: invalid op %d\n", mod->sm_op ));
+                               "ldbm_modify_internal: invalid op %d\n", mod->sm_op ));
 #else
                        Debug(LDAP_DEBUG_ANY, "ldbm_modify_internal: invalid op %d\n",
                                mod->sm_op, 0, 0);
@@ -173,7 +175,7 @@ int ldbm_modify_internal(
                        *text = "Invalid modify operation";
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                                  "ldbm_modify_internal: %d (%s)\n", err, *text ));
+                               "ldbm_modify_internal: %d (%s)\n", err, *text ));
 #else
                        Debug(LDAP_DEBUG_ARGS, "ldbm_modify_internal: %d %s\n",
                                err, *text, 0);
@@ -200,14 +202,14 @@ int ldbm_modify_internal(
        ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
 
        /* check that the entry still obeys the schema */
-       rc = entry_schema_check( e, save_attrs, text );
+       rc = entry_schema_check( e, save_attrs, text, textbuf, textlen );
        if ( rc != LDAP_SUCCESS ) {
                attrs_free( e->e_attrs );
                e->e_attrs = save_attrs;
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_ERR,
-                          "ldbm_modify_internal: entry failed schema check: %s\n",
-                          *text ));
+                       "ldbm_modify_internal: entry failed schema check: %s\n",
+                       *text ));
 #else
                Debug( LDAP_DEBUG_ANY, "entry failed schema check: %s\n",
                        *text, 0, 0 );
@@ -243,8 +245,8 @@ ldbm_back_modify(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn,
+    struct berval      *dn,
+    struct berval      *ndn,
     Modifications      *modlist
 )
 {
@@ -254,19 +256,21 @@ ldbm_back_modify(
        Entry           *e;
        int             manageDSAit = get_manageDSAit( op );
        const char *text = NULL;
+       char textbuf[SLAP_TEXT_BUFLEN];
+       size_t textlen = sizeof textbuf;
 
 #ifdef NEW_LOGGING
        LDAP_LOG(( "backend", LDAP_LEVEL_ENTRY,
-                  "ldbm_back_modify: enter\n" ));
+               "ldbm_back_modify: enter\n" ));
 #else
        Debug(LDAP_DEBUG_ARGS, "ldbm_back_modify:\n", 0, 0, 0);
 #endif
 
 
        /* acquire and lock entry */
-       if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
+       if ( (e = dn2entry_w( be, ndn->bv_val, &matched )) == NULL ) {
                char* matched_dn = NULL;
-               struct berval **refs = NULL;
+               struct berval **refs;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
@@ -275,16 +279,15 @@ ldbm_back_modify(
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
                } else {
-                       refs = default_referral;
+                       refs = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
-               if ( matched != NULL ) {
-                       ber_bvecfree( refs );
-                       free( matched_dn );
-               }
+               ber_bvecfree( refs );
+               free( matched_dn );
 
                return( -1 );
        }
@@ -297,7 +300,7 @@ ldbm_back_modify(
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_modify: entry (%s) is referral\n", ndn ));
+                          "ldbm_back_modify: entry (%s) is referral\n", ndn->bv_val ));
 #else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
@@ -313,7 +316,8 @@ ldbm_back_modify(
        }
        
        /* Modify the entry */
-       rc = ldbm_modify_internal( be, conn, op, ndn, modlist, e, &text );
+       rc = ldbm_modify_internal( be, conn, op, ndn->bv_val, modlist, e,
+               &text, textbuf, textlen );
 
        if( rc != LDAP_SUCCESS ) {
                if( rc != SLAPD_ABANDON ) {
@@ -352,7 +356,7 @@ add_values(
        int             i;
        Attribute       *a;
 
-       /* char *desc = mod->sm_desc->ad_cname->bv_val; */
+       /* char *desc = mod->sm_desc->ad_cname.bv_val; */
        MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
 
        a = attr_find( e->e_attrs, mod->sm_desc );
@@ -369,7 +373,7 @@ add_values(
                        int rc;
                        int j;
                        const char *text = NULL;
-                       struct berval *asserted;
+                       struct berval *asserted = NULL;
 
                        rc = value_normalize( mod->sm_desc,
                                SLAP_MR_EQUALITY,
@@ -382,7 +386,7 @@ add_values(
                        for ( j = 0; a->a_vals[j] != NULL; j++ ) {
                                int match;
                                int rc = value_match( &match, mod->sm_desc, mr,
-                                       SLAP_MR_MODIFY_MATCHING,
+                                       SLAP_MR_VALUE_SYNTAX_MATCH,
                                        a->a_vals[j], asserted, &text );
 
                                if( rc == LDAP_SUCCESS && match == 0 ) {
@@ -413,7 +417,7 @@ delete_values(
 {
        int             i, j, k, found;
        Attribute       *a;
-       char *desc = mod->sm_desc->ad_cname->bv_val;
+       char *desc = mod->sm_desc->ad_cname.bv_val;
        MatchingRule *mr = mod->sm_desc->ad_type->sat_equality;
 
        /* delete the entire attribute */
@@ -455,7 +459,7 @@ delete_values(
                int rc;
                const char *text = NULL;
 
-               struct berval *asserted;
+               struct berval *asserted = NULL;
 
                rc = value_normalize( mod->sm_desc,
                        SLAP_MR_EQUALITY,
@@ -469,7 +473,7 @@ delete_values(
                for ( j = 0; a->a_vals[j] != NULL; j++ ) {
                        int match;
                        int rc = value_match( &match, mod->sm_desc, mr,
-                               SLAP_MR_MODIFY_MATCHING,
+                               SLAP_MR_VALUE_SYNTAX_MATCH,
                                a->a_vals[j], asserted, &text );
 
                        if( rc == LDAP_SUCCESS && match != 0 ) {