Merge branch 'mdb.master' of ssh://git-master.openldap.org/~git/git/openldap

[openldap] / servers / slapd / slapi / slapi_pblock.c

diff --git a/servers/slapd/slapi/slapi_pblock.c b/servers/slapd/slapi/slapi_pblock.c
index b3644ac55d09f595b70cede71d1371808d079217..ddb0209326232ac7ed172a2b18db2416f41a89b1 100644 (file)
--- a/servers/slapd/slapi/slapi_pblock.c
+++ b/servers/slapd/slapi/slapi_pblock.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2002-2006 The OpenLDAP Foundation.
+ * Copyright 2002-2011 The OpenLDAP Foundation.
  * Portions Copyright 1997,2002-2003 IBM Corporation.
  * All rights reserved.
  *
@@ -64,7 +64,7 @@ pblock_get_param_class( int param )
        case SLAPI_DB2LDIF_PRINTKEY:
        case SLAPI_LDIF2DB_REMOVEDUPVALS:
        case SLAPI_MANAGEDSAIT:
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
        case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
        case SLAPI_IS_REPLICATED_OPERATION:
        case SLAPI_X_CONN_IS_UDP:
@@ -396,7 +396,7 @@ static int
 pblock_set_default( Slapi_PBlock *pb, int param, void *value ) 
 {
        slapi_pblock_class_t pbClass;
-       size_t i;
+       int i;
 
        pbClass = pblock_get_param_class( param );
        if ( pbClass == PBLOCK_CLASS_INVALID ) {
@@ -447,7 +447,7 @@ pblock_be_call( Slapi_PBlock *pb, int (*bep)(Operation *) )
        op = pb->pb_op;
 
        be_orig = op->o_bd;
-       op->o_bd = select_backend( &op->o_req_ndn, 0, 0 );
+       op->o_bd = select_backend( &op->o_req_ndn, 0 );
        rc = (*bep)( op );
        op->o_bd = be_orig;
 
@@ -483,7 +483,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_X_OPERATION_DELETE_GLUE_PARENT:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((ber_tag_t *)value) = pb->pb_op->o_delete_glue_parent;
+               *((int *)value) = pb->pb_op->o_delete_glue_parent;
                break;
        case SLAPI_X_OPERATION_NO_SCHEMA_CHECK:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -497,7 +497,8 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
 
                        rc = mods_structural_class( pb->pb_op->ora_modlist,
                                &tmpval, &pb->pb_rs->sr_text,
-                               pb->pb_textbuf, sizeof( pb->pb_textbuf ));
+                               pb->pb_textbuf, sizeof( pb->pb_textbuf ),
+                               pb->pb_op->o_tmpmemctx );
                        *((char **)value) = tmpval.bv_val;
                } else {
                        rc = PBLOCK_ERROR;
@@ -505,7 +506,7 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_X_OPERATION_NO_SUBORDINATE_GLUE:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((ber_tag_t *)value) = pb->pb_op->o_no_subordinate_glue;
+               *((int *)value) = pb->pb_op->o_no_subordinate_glue;
                break;
        case SLAPI_REQCONTROLS:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -519,13 +520,13 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                PBLOCK_ASSERT_OP( pb, 0 );
                *((int *)value) = get_manageDSAit( pb->pb_op );
                break;
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((int *)value) = get_manageDIT( pb->pb_op );
+               *((int *)value) = get_relax( pb->pb_op );
                break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );
-               *((BackendDB **)value) = select_backend( &pb->pb_op->o_req_ndn, 0, 0 );
+               *((BackendDB **)value) = select_backend( &pb->pb_op->o_req_ndn, 0 );
                break;
        case SLAPI_BE_TYPE:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -586,6 +587,12 @@ pblock_get( Slapi_PBlock *pb, int param, void **value )
                break;
        case SLAPI_CONN_DN:
                PBLOCK_ASSERT_CONN( pb );
+#if 0
+               /* This would be necessary to keep plugin compat after the fix in ITS#4158 */
+               if ( pb->pb_op->o_tag == LDAP_REQ_BIND && pb->pb_rs->sr_err == LDAP_SUCCESS )
+                       *((char **)value) = pb->pb_op->orb_edn.bv_val;
+               else
+#endif
                *((char **)value) = pb->pb_conn->c_dn.bv_val;
                break;
        case SLAPI_CONN_CLIENTIP:
@@ -918,9 +925,9 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                PBLOCK_ASSERT_OP( pb, 0 );
                pb->pb_op->o_managedsait = *((int *)value);
                break;
-       case SLAPI_X_MANAGEDIT:
+       case SLAPI_X_RELAX:
                PBLOCK_ASSERT_OP( pb, 0 );
-               pb->pb_op->o_managedit = *((int *)value);
+               pb->pb_op->o_relax = *((int *)value);
                break;
        case SLAPI_BACKEND:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -998,7 +1005,7 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                        break;
                }
 
-               newmods = slapi_int_ldapmods2modifications( (LDAPMod **)value );
+               newmods = slapi_int_ldapmods2modifications( pb->pb_op, (LDAPMod **)value );
                if ( newmods != NULL ) {
                        slap_mods_free( *mlp, 1 );
                        *mlp = newmods;
@@ -1145,7 +1152,7 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                        for ( i = 0; attrs[i] != NULL; i++ ) {
                                an[j].an_desc = NULL;
                                an[j].an_oc = NULL;
-                               an[j].an_oc_exclude = 0;
+                               an[j].an_flags = 0;
                                an[j].an_name.bv_val = attrs[i];
                                an[j].an_name.bv_len = strlen( attrs[i] );
                                if ( slap_bv2ad( &an[j].an_name, &an[j].an_desc, &pb->pb_rs->sr_text ) == LDAP_SUCCESS ) {
@@ -1169,7 +1176,9 @@ pblock_set( Slapi_PBlock *pb, int param, void *value )
                break;
        case SLAPI_SEARCH_RESULT_ENTRY:
                PBLOCK_ASSERT_OP( pb, 0 );
-               pb->pb_rs->sr_entry = (Slapi_Entry *)value;
+               rs_replace_entry( pb->pb_op, pb->pb_rs, NULL, (Slapi_Entry *)value );
+               /* TODO: Should REP_ENTRY_MODIFIABLE be set? */
+               pb->pb_rs->sr_flags |= REP_ENTRY_MUSTBEFREED;
                break;
        case SLAPI_BIND_RET_SASLCREDS:
                PBLOCK_ASSERT_OP( pb, 0 );
@@ -1415,4 +1424,3 @@ slapi_int_pblock_get_next( Slapi_PBlock **pb )
 }
 
 #endif /* LDAP_SLAPI */
-