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 37fb844dd937ed23f0b5312ecb6792e6a3719570..7ff5926457bfac6cff1bb25d644fde8a09c85342 100644 (file)
--- a/servers/slapd/back-ldbm/modify.c
+++ b/servers/slapd/back-ldbm/modify.c
@@ -71,7 +71,7 @@ int ldbm_modify_internal(
                        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";
@@ -94,7 +94,7 @@ int ldbm_modify_internal(
                        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";
@@ -116,7 +116,7 @@ int ldbm_modify_internal(
                        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";
@@ -143,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;
@@ -245,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
 )
 {
@@ -268,15 +268,14 @@ ldbm_back_modify(
 
 
        /* 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;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
                        refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched,
-                                       dn, LDAP_SCOPE_DEFAULT )
+                               ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
                } else {
@@ -297,11 +296,11 @@ ldbm_back_modify(
                /* parent is a referral, don't allow add */
                /* parent is an alias, don't allow add */
                struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn, LDAP_SCOPE_DEFAULT );
+                       conn, op, e );
 
 #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 );
@@ -317,7 +316,7 @@ ldbm_back_modify(
        }
        
        /* Modify the entry */
-       rc = ldbm_modify_internal( be, conn, op, ndn, modlist, e,
+       rc = ldbm_modify_internal( be, conn, op, ndn->bv_val, modlist, e,
                &text, textbuf, textlen );
 
        if( rc != LDAP_SUCCESS ) {
@@ -374,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,
@@ -387,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 ) {
@@ -460,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,
@@ -474,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 ) {