slight improvements; doesn't work yet

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index e6137f13b6a5e38ac872200854dbb2fe2c406ea1..ea8dd0e612ff41e5de32bd1210f4a6c8a1f249bc 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2004 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,7 +41,7 @@
 #include "ldap_pvt.h"
 #include "slap.h"
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 int
@@ -63,6 +63,13 @@ do_modrdn(
        ber_len_t       length;
        int manageDSAit;
 
+       struct berval pdn = { 0, NULL };
+       struct berval org_req_dn = { 0, NULL };
+       struct berval org_req_ndn = { 0, NULL };
+       struct berval org_dn = { 0, NULL };
+       struct berval org_ndn = { 0, NULL };
+       int     org_managedsait;
+
 #ifdef NEW_LOGGING
        LDAP_LOG( OPERATION, ENTRY, "do_modrdn: begin\n", 0, 0, 0 );
 #else
@@ -324,7 +331,7 @@ do_modrdn(
                slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn );
                slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
 
-               rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
+               rs->sr_err = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_MODRDN_FN, pb );
                if ( rs->sr_err < 0 ) {
                        /*
                         * A preoperation plugin failure will abort the
@@ -362,14 +369,50 @@ do_modrdn(
                if ( LDAP_STAILQ_EMPTY( &op->o_bd->be_syncinfo ))
 #endif
                {
+                       slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
                        op->orr_deleteoldrdn = deloldrdn;
-                       if ( (op->o_bd->be_modrdn)( op, rs ) == 0
 #ifdef SLAPD_MULTIMASTER
-                               && ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
+                       if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
 #endif
-                       ) {
-                               replog( op );
+                       {
+                               cb.sc_next = op->o_callback;
+                               op->o_callback = &cb;
+                       }
+                       op->o_bd->be_modrdn( op, rs );
+
+                       if ( op->o_bd->be_delete ) {
+                               org_req_dn = op->o_req_dn;
+                               org_req_ndn = op->o_req_ndn;
+                               org_dn = op->o_dn;
+                               org_ndn = op->o_ndn;
+                               org_managedsait = get_manageDSAit( op );
+                               op->o_dn = op->o_bd->be_rootdn;
+                               op->o_ndn = op->o_bd->be_rootndn;
+                               op->o_managedsait = 1;
+
+                               while ( rs->sr_err == LDAP_SUCCESS &&
+                                               op->o_delete_glue_parent ) {
+                       op->o_delete_glue_parent = 0;
+                                       if ( !be_issuffix( op->o_bd, &op->o_req_ndn )) {
+                                               slap_callback cb = { NULL };
+                                               cb.sc_response = slap_null_cb;
+                                               dnParent( &op->o_req_ndn, &pdn );
+                                               op->o_req_dn = pdn;
+                                               op->o_req_ndn = pdn;
+                                               op->o_callback = &cb;
+                                               op->o_bd->be_delete( op, rs );
+                                       } else {
+                                               break;
+                                       }
+                               }
+                               op->o_managedsait = org_managedsait;
+                   op->o_dn = org_dn;
+                               op->o_ndn = org_ndn;
+                               op->o_req_dn = org_req_dn;
+                               op->o_req_ndn = org_req_ndn;
+                               op->o_delete_glue_parent = 0;
                        }
+
 #ifndef SLAPD_MULTIMASTER
                } else {
                        BerVarray defref = NULL;
@@ -406,7 +449,7 @@ do_modrdn(
        }
 
 #if defined( LDAP_SLAPI )
-       if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) < 0 ) {
+       if ( pb != NULL && slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_MODRDN_FN, pb ) < 0 ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO, "do_modrdn: modrdn postoperation plugins "
                                "failed\n", 0, 0, 0 );