Merge remote-tracking branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index 67940a58ba881d3e649c0ffc6a2ca950bc595729..632b6d3e65fd2f8c239d1ea2a26a8ad1b780afe0 100644 (file)
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
  * Portions Copyright 1999 Dmitry Kovalev.
  * Portions Copyright 2002 Pierangelo Masarati.
  * All rights reserved.
@@ -50,7 +50,6 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                                *e = NULL;
        int                     manageDSAit = get_manageDSAit( op );
        struct berval           *newSuperior = op->oq_modrdn.rs_newSup;
-       char                    *next;
  
        Debug( LDAP_DEBUG_TRACE, "==>backsql_modrdn() renaming entry \"%s\", "
                        "newrdn=\"%s\", newSuperior=\"%s\"\n",
@@ -73,7 +72,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                        LDAP_SCOPE_BASE, 
                        (time_t)(-1), NULL, dbh, op, rs,
                        slap_anlist_all_attributes,
-                       ( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY ) );
+                       ( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY | BACKSQL_ISF_GET_OC ) );
        switch ( rs->sr_err ) {
        case LDAP_SUCCESS:
                break;
@@ -108,13 +107,9 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                goto done;
        }
 
-#ifdef BACKSQL_ARBITRARY_KEY
-       Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): entry id=%s\n",
-               e_id.eid_id.bv_val, 0, 0 );
-#else /* ! BACKSQL_ARBITRARY_KEY */
-       Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): entry id=%ld\n",
-               e_id.eid_id, 0, 0 );
-#endif /* ! BACKSQL_ARBITRARY_KEY */
+       Debug( LDAP_DEBUG_TRACE,
+               "   backsql_modrdn(): entry id=" BACKSQL_IDFMT "\n",
+               BACKSQL_IDARG(e_id.eid_id), 0, 0 );
 
        if ( get_assert( op ) &&
                        ( test_filter( op, &r, get_assertion( op ) )
@@ -165,21 +160,16 @@ backsql_modrdn( Operation *op, SlapReply *rs )
         */
        bsi.bsi_e = &p;
        e_id = bsi.bsi_base_id;
+       memset( &bsi.bsi_base_id, 0, sizeof( bsi.bsi_base_id ) );
        rs->sr_err = backsql_init_search( &bsi, &pndn,
                        LDAP_SCOPE_BASE, 
                        (time_t)(-1), NULL, dbh, op, rs,
                        slap_anlist_all_attributes,
                        BACKSQL_ISF_GET_ENTRY );
 
-#ifdef BACKSQL_ARBITRARY_KEY
-       Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
-               "old parent entry id is %s\n",
-               bsi.bsi_base_id.eid_id.bv_val, 0, 0 );
-#else /* ! BACKSQL_ARBITRARY_KEY */
-       Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
-               "old parent entry id is %ld\n",
-               bsi.bsi_base_id.eid_id, 0, 0 );
-#endif /* ! BACKSQL_ARBITRARY_KEY */
+       Debug( LDAP_DEBUG_TRACE,
+               "   backsql_modrdn(): old parent entry id is " BACKSQL_IDFMT "\n",
+               BACKSQL_IDARG(bsi.bsi_base_id.eid_id), 0, 0 );
 
        if ( rs->sr_err != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_modrdn(): "
@@ -198,7 +188,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
        }
 
        if ( newSuperior ) {
-               (void)backsql_free_entryID( op, &bsi.bsi_base_id, 0 );
+               (void)backsql_free_entryID( &bsi.bsi_base_id, 0, op->o_tmpmemctx );
                
                /*
                 * namingContext "" is not supported
@@ -234,15 +224,9 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
                n_id = bsi.bsi_base_id;
 
-#ifdef BACKSQL_ARBITRARY_KEY
-               Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
-                       "new parent entry id=%s\n",
-                       n_id.eid_id.bv_val, 0, 0 );
-#else /* ! BACKSQL_ARBITRARY_KEY */
-               Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
-                       "new parent entry id=%ld\n",
-                       n_id.eid_id, 0, 0 );
-#endif /* ! BACKSQL_ARBITRARY_KEY */
+               Debug( LDAP_DEBUG_TRACE,
+                       "   backsql_modrdn(): new parent entry id=" BACKSQL_IDFMT "\n",
+                       BACKSQL_IDARG(n_id.eid_id), 0, 0 );
 
                if ( !access_allowed( op, &n, slap_schema.si_ad_children, 
                                        NULL, ACL_WADD, NULL ) ) {
@@ -260,6 +244,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                new_npdn = &pndn;
        }
 
+       memset( &bsi.bsi_base_id, 0, sizeof( bsi.bsi_base_id ) );
+
        if ( newSuperior && dn_match( &pndn, new_npdn ) ) {
                Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(): "
                        "newSuperior is equal to old parent - ignored\n",
@@ -318,7 +304,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
        rc = backsql_BindParamBerVal( sth, 1, SQL_PARAM_INPUT, &realnew_dn );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "   backsql_add_attr(): "
+                       "   backsql_modrdn(): "
                        "error binding DN parameter for objectClass %s\n",
                        oc->bom_oc->soc_cname.bv_val, 0, 0 );
                backsql_PrintErrors( bi->sql_db_env, dbh, 
@@ -334,7 +320,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
        rc = backsql_BindParamID( sth, 2, SQL_PARAM_INPUT, &n_id.eid_id );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "   backsql_add_attr(): "
+                       "   backsql_modrdn(): "
                        "error binding parent ID parameter for objectClass %s\n",
                        oc->bom_oc->soc_cname.bv_val, 0, 0 );
                backsql_PrintErrors( bi->sql_db_env, dbh, 
@@ -350,7 +336,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
        rc = backsql_BindParamID( sth, 3, SQL_PARAM_INPUT, &e_id.eid_keyval );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "   backsql_add_attr(): "
+                       "   backsql_modrdn(): "
                        "error binding entry ID parameter for objectClass %s\n",
                        oc->bom_oc->soc_cname.bv_val, 0, 0 );
                backsql_PrintErrors( bi->sql_db_env, dbh, 
@@ -366,7 +352,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
        rc = backsql_BindParamID( sth, 4, SQL_PARAM_INPUT, &e_id.eid_id );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE,
-                       "   backsql_add_attr(): "
+                       "   backsql_modrdn(): "
                        "error binding ID parameter for objectClass %s\n",
                        oc->bom_oc->soc_cname.bv_val, 0, 0 );
                backsql_PrintErrors( bi->sql_db_env, dbh, 
@@ -396,7 +382,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
        slap_mods_opattrs( op, &op->orr_modlist, 1 );
 
-       oc = backsql_id2oc( bi, e_id.eid_oc_id );
+       assert( e_id.eid_oc != NULL );
+       oc = e_id.eid_oc;
        rs->sr_err = backsql_modify_internal( op, rs, dbh, oc, &e_id, op->orr_modlist );
        slap_graduate_commit_csn( op );
        if ( rs->sr_err != LDAP_SUCCESS ) {
@@ -408,7 +395,7 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                char            textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
 
                backsql_entry_clean( op, &r );
-               (void)backsql_free_entryID( op, &e_id, 0 );
+               (void)backsql_free_entryID( &e_id, 0, op->o_tmpmemctx );
 
                bsi.bsi_e = &r;
                rs->sr_err = backsql_init_search( &bsi, &new_ndn,
@@ -452,10 +439,10 @@ backsql_modrdn( Operation *op, SlapReply *rs )
 
                e_id = bsi.bsi_base_id;
 
-               rs->sr_err = entry_schema_check( op, &r, NULL, 0,
+               rs->sr_err = entry_schema_check( op, &r, NULL, 0, 0, NULL,
                        &rs->sr_text, textbuf, sizeof( textbuf ) );
                if ( rs->sr_err != LDAP_SUCCESS ) {
-                       Debug( LDAP_DEBUG_TRACE, "   backsql_add(\"%s\"): "
+                       Debug( LDAP_DEBUG_TRACE, "   backsql_modrdn(\"%s\"): "
                                "entry failed schema check -- aborting\n",
                                r.e_name.bv_val, 0, 0 );
                        e = NULL;
@@ -511,11 +498,11 @@ done:;
        }
        
        if ( !BER_BVISNULL( &e_id.eid_ndn ) ) {
-               (void)backsql_free_entryID( op, &e_id, 0 );
+               (void)backsql_free_entryID( &e_id, 0, op->o_tmpmemctx );
        }
 
        if ( !BER_BVISNULL( &n_id.eid_ndn ) ) {
-               (void)backsql_free_entryID( op, &n_id, 0 );
+               (void)backsql_free_entryID( &n_id, 0, op->o_tmpmemctx );
        }
 
        if ( !BER_BVISNULL( &r.e_nname ) ) {