Add search no-op support.

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

diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index 86ecb572d896ebe4885d3ae57a2c0d14b6c37e39..195fa4d434f575c5e86171d73b6224481e492146 100644 (file)
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -1,7 +1,7 @@
 /* modrdn.c - ldbm backend modrdn routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -91,7 +91,7 @@ ldbm_back_modrdn(
        /* get entry with writer lock */
        if ( (e = dn2entry_w( be, ndn, &matched )) == NULL ) {
                char* matched_dn = NULL;
-               BVarray refs;
+               BerVarray refs;
 
                if( matched != NULL ) {
                        matched_dn = strdup( matched->e_dn );
@@ -107,7 +107,7 @@ ldbm_back_modrdn(
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
-               if ( refs ) bvarray_free( refs );
+               if ( refs ) ber_bvarray_free( refs );
                free( matched_dn );
 
                return( -1 );
@@ -116,7 +116,7 @@ ldbm_back_modrdn(
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* parent is a referral, don't allow add */
                /* parent is an alias, don't allow add */
-               BVarray refs = get_entry_referrals( be,
+               BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
 #ifdef NEW_LOGGING
@@ -130,7 +130,7 @@ ldbm_back_modrdn(
                send_ldap_result( conn, op, LDAP_REFERRAL,
                    e->e_dn, NULL, refs, NULL );
 
-               if ( refs ) bvarray_free( refs );
+               if ( refs ) ber_bvarray_free( refs );
                goto return_results;
        }
 
@@ -148,11 +148,11 @@ ldbm_back_modrdn(
                goto return_results;
        }
 
-       p_ndn.bv_val = dn_parent( be, e->e_ndn );
-       if ( p_ndn.bv_val )
-               p_ndn.bv_len = e->e_nname.bv_len - (p_ndn.bv_val - e->e_ndn);
-       else
-               p_ndn.bv_len = 0;
+       if ( be_issuffix( be, &e->e_nname ) ) {
+               p_ndn = slap_empty_bv ;
+       } else {
+               dnParent( &e->e_nname, &p_ndn );
+       }
 
        if ( p_ndn.bv_len != 0 ) {
                /* Make sure parent entry exist and we can write its 
@@ -201,11 +201,11 @@ ldbm_back_modrdn(
                       p_ndn.bv_val, 0, 0 );
 #endif
 
-               p_dn.bv_val = dn_parent( be, e->e_dn );
-               if ( p_dn.bv_val )
-                       p_dn.bv_len = e->e_name.bv_len - (p_dn.bv_val - e->e_dn);
-               else
-                       p_dn.bv_len = 0;
+               if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
+                       p_dn = slap_empty_bv;
+               } else {
+                       dnParent( &e->e_name, &p_dn );
+               }
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
@@ -219,7 +219,7 @@ ldbm_back_modrdn(
                /* no parent, must be root to modify rdn */
                isroot = be_isroot( be, &op->o_ndn );
                if ( ! isroot ) {
-                       if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+                       if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) {
                                p = (Entry *)&slap_entry_root;
                                
                                rc = access_allowed( be, conn, op, p,
@@ -291,8 +291,7 @@ ldbm_back_modrdn(
                np_ndn = nnewSuperior;
 
                /* newSuperior == oldParent? */
-               if ( p_ndn.bv_len == np_ndn->bv_len &&
-                       strcmp( p_ndn.bv_val, np_ndn->bv_val ) == 0 ) {
+               if ( dn_match( &p_ndn, np_ndn ) ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "backend", LDAP_LEVEL_INFO, "ldbm_back_modrdn: "
                                "new parent\"%s\" seems to be the same as the "
@@ -398,7 +397,7 @@ ldbm_back_modrdn(
                        }
 
                        if ( ! isroot ) {
-                               if ( be_issuffix( be, "" ) || be_isupdate( be, &op->o_ndn ) ) {
+                               if ( be_issuffix( be, (struct berval *)&slap_empty_bv ) || be_isupdate( be, &op->o_ndn ) ) {
                                        np = (Entry *)&slap_entry_root;
                                
                                        rc = access_allowed( be, conn, op, np,
@@ -496,7 +495,9 @@ ldbm_back_modrdn(
        /* Get attribute types and values of our new rdn, we will
         * need to add that to our new entry
         */
-       if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, &text, LDAP_DN_FORMAT_LDAP ) ) {
+       if ( ldap_str2rdn( newrdn->bv_val, &new_rdn, (char **)&text,
+               LDAP_DN_FORMAT_LDAP ) )
+       {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
                        "ldbm_back_modrdn: can't figure out type(s)/value(s) of newrdn\n" ));
@@ -522,7 +523,9 @@ ldbm_back_modrdn(
 #endif
 
        /* Retrieve the old rdn from the entry's dn */
-       if ( ldap_str2rdn( dn->bv_val, &old_rdn, &text, LDAP_DN_FORMAT_LDAP ) ) {
+       if ( ldap_str2rdn( dn->bv_val, &old_rdn, (char **)&text,
+               LDAP_DN_FORMAT_LDAP ) )
+       {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
                           "ldbm_back_modrdn: can't figure out the old_rdn type(s)/value(s).\n" ));
@@ -610,7 +613,7 @@ ldbm_back_modrdn(
                mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications )
                        + 2 * sizeof( struct berval ) );
                mod_tmp->sml_desc = desc;
-               mod_tmp->sml_bvalues = (BVarray)( mod_tmp + 1 );
+               mod_tmp->sml_bvalues = (BerVarray)( mod_tmp + 1 );
                mod_tmp->sml_bvalues[0] = new_rdn[0][a_cnt]->la_value;
                mod_tmp->sml_bvalues[1].bv_val = NULL;
                mod_tmp->sml_op = SLAP_MOD_SOFTADD;
@@ -684,7 +687,7 @@ ldbm_back_modrdn(
                        mod_tmp = (Modifications *)ch_malloc( sizeof( Modifications )
                                + 2 * sizeof( struct berval ) );
                        mod_tmp->sml_desc = desc;
-                       mod_tmp->sml_bvalues = (BVarray)(mod_tmp+1);
+                       mod_tmp->sml_bvalues = (BerVarray)(mod_tmp+1);
                        mod_tmp->sml_bvalues[0] = old_rdn[0][d_cnt]->la_value;
                        mod_tmp->sml_bvalues[1].bv_val = NULL;
                        mod_tmp->sml_op = LDAP_MOD_DELETE;