X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapi%2Fslapi_ops.c;h=c830aa5075ebfd0a4d0d6dfc56d0cb156c4fe80c;hb=43ec05a45acf31098a461514a5ce04c176aa4994;hp=c5f327150af1da5140e6f1c1be10dd8a740de303;hpb=d6d202693dfea3ec9d9dce12610e9c5612ecfea1;p=openldap diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c index c5f327150a..c830aa5075 100644 --- a/servers/slapd/slapi/slapi_ops.c +++ b/servers/slapd/slapi/slapi_ops.c @@ -31,100 +31,96 @@ #include #include -/* - * use a fake listener when faking a connection, - * so it can be used in ACLs - */ -static struct slap_listener slap_unknown_listener = { - BER_BVC("unknown"), /* FIXME: use a URI form? (e.g. slapi://) */ - BER_BVC("UNKNOWN") +#ifdef LDAP_SLAPI + +static struct slap_listener slapi_listener = { + BER_BVC("slapi://"), + BER_BVC("slapi://") }; -static void -slapi_int_send_ldap_result_shim( - Operation *op, - SlapReply *rs ) +static LDAPControl ** +slapi_int_dup_controls( LDAPControl **controls ) { - LDAPControl **controls = NULL; - size_t i; - plugin_result_callback prc = NULL; - void *callback_data = NULL; + LDAPControl **c; + size_t i; - assert( op->o_pb != NULL ); + if ( controls == NULL ) + return NULL; + + for ( i = 0; controls[i] != NULL; i++ ) + ; - slapi_pblock_get( op->o_pb, SLAPI_RESCONTROLS, (void **)&controls ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_RESULT_CALLBACK, (void **)&prc ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); + c = (LDAPControl **) slapi_ch_calloc( i + 1, sizeof(LDAPControl *) ); - assert( controls == NULL ); + for ( i = 0; controls[i] != NULL; i++ ) { + c[i] = slapi_dup_control( controls[i] ); + } - /* Copy these before they go out of scope */ - if ( rs->sr_ctrls != NULL ) { - for ( i = 0; rs->sr_ctrls[i] != NULL; i++ ) - ; + return c; +} - controls = (LDAPControl **)slapi_ch_calloc( i + 1, - sizeof(LDAPControl )); +static int +slapi_int_result( + Operation *op, + SlapReply *rs ) +{ + Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op ); + plugin_result_callback prc = NULL; + void *callback_data = NULL; + LDAPControl **ctrls = NULL; - for ( i = 0; rs->sr_ctrls[i] != NULL; i++ ) - controls[i] = slapi_dup_control( rs->sr_ctrls[i] ); + assert( pb != NULL ); - controls[i] = NULL; - } + slapi_pblock_get( pb, SLAPI_X_INTOP_RESULT_CALLBACK, (void **)&prc ); + slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); - slapi_pblock_set( op->o_pb, SLAPI_RESCONTROLS, (void *)controls ); - slapi_pblock_set( op->o_pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs->sr_err ); + /* we need to duplicate controls because they might go out of scope */ + ctrls = slapi_int_dup_controls( rs->sr_ctrls ); + slapi_pblock_set( pb, SLAPI_RESCONTROLS, ctrls ); if ( prc != NULL ) { (*prc)( rs->sr_err, callback_data ); } - return; + return rs->sr_err; } static int -slapi_int_send_search_entry_shim( +slapi_int_search_entry( Operation *op, SlapReply *rs ) { + Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op ); plugin_search_entry_callback psec = NULL; void *callback_data = NULL; + int rc = LDAP_SUCCESS; - assert( op->o_pb != NULL ); + assert( pb != NULL ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, &psec ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); + slapi_pblock_get( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, (void **)&psec ); + slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); if ( psec != NULL ) { - return (*psec)( rs->sr_entry, callback_data ); + rc = (*psec)( rs->sr_entry, callback_data ); } - return LDAP_SUCCESS; -} - -static void -slapi_int_send_ldap_extended_shim( - Operation *op, - SlapReply *rs ) -{ - assert( op->o_pb != NULL ); - - return; + return rc; } static int -slapi_int_send_search_reference_shim( +slapi_int_search_reference( Operation *op, SlapReply *rs ) { int i, rc = LDAP_SUCCESS; plugin_referral_entry_callback prec = NULL; void *callback_data = NULL; + Slapi_PBlock *pb = SLAPI_OPERATION_PBLOCK( op ); - assert( op->o_pb != NULL ); + assert( pb != NULL ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, &prec ); - slapi_pblock_get( op->o_pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); + slapi_pblock_get( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, (void **)&prec ); + slapi_pblock_get( pb, SLAPI_X_INTOP_CALLBACK_DATA, &callback_data ); if ( prec != NULL ) { for ( i = 0; rs->sr_ref[i].bv_val != NULL; i++ ) { @@ -138,72 +134,114 @@ slapi_int_send_search_reference_shim( return rc; } -Connection * -slapi_int_init_connection( - char *DN, - int OpType ) -{ - Connection *pConn; - Operation *op; - ber_len_t max = sockbuf_max_incoming; +int +slapi_int_response( Slapi_Operation *op, SlapReply *rs ) +{ + int rc; - pConn = (Connection *) slapi_ch_calloc(1, sizeof(Connection)); + switch ( rs->sr_type ) { + case REP_RESULT: + rc = slapi_int_result( op, rs ); + break; + case REP_SEARCH: + rc = slapi_int_search_entry( op, rs ); + break; + case REP_SEARCHREF: + rc = slapi_int_search_reference( op, rs ); + break; + default: + rc = LDAP_OTHER; + break; + } - LDAP_STAILQ_INIT( &pConn->c_pending_ops ); + assert( rc != SLAP_CB_CONTINUE ); /* never try to send a wire response */ + + return rc; +} + +static int +slapi_int_get_ctrls( Slapi_PBlock *pb ) +{ + LDAPControl **c; + int rc = LDAP_SUCCESS; + + if ( pb->pop->o_ctrls != NULL ) { + for ( c = pb->pop->o_ctrls; *c != NULL; c++ ) { + rc = slap_parse_ctrl( pb->pop, &pb->rs, *c, &pb->rs.sr_text ); + if ( rc != LDAP_SUCCESS ) + break; + } + } + + return rc; +} + +void +slapi_int_connection_init_pb( Slapi_PBlock *pb, ber_tag_t tag ) +{ + Connection *conn; + Operation *op; + ber_len_t max = sockbuf_max_incoming; + + conn = (Connection *) slapi_ch_calloc( 1, sizeof(Connection) ); + + LDAP_STAILQ_INIT( &conn->c_pending_ops ); op = (Operation *) slapi_ch_calloc( 1, OPERATION_BUFFER_SIZE ); op->o_hdr = (Opheader *)(op + 1); + op->o_hdr->oh_extensions = NULL; op->o_controls = (void **)(op->o_hdr + 1); - pConn->c_pending_ops.stqh_first = op; - pConn->c_pending_ops.stqh_first->o_pb = NULL; - pConn->c_pending_ops.stqh_first->o_extensions = NULL; + op->o_callback = (slap_callback *) slapi_ch_calloc( 1, sizeof(slap_callback) ); + op->o_callback->sc_response = slapi_int_response; + op->o_callback->sc_cleanup = NULL; + op->o_callback->sc_private = pb; + op->o_callback->sc_next = NULL; + + conn->c_pending_ops.stqh_first = op; - /* connection object */ - pConn->c_authmech.bv_val = NULL; - pConn->c_authmech.bv_len = 0; - pConn->c_dn.bv_val = NULL; - pConn->c_dn.bv_len = 0; - pConn->c_ndn.bv_val = NULL; - pConn->c_ndn.bv_len = 0; + /* connection object authorization information */ + conn->c_authtype = LDAP_AUTH_NONE; + BER_BVZERO( &conn->c_authmech ); + BER_BVZERO( &conn->c_dn ); + BER_BVZERO( &conn->c_ndn ); - pConn->c_listener = &slap_unknown_listener; - ber_dupbv( &pConn->c_peer_domain, (struct berval *)&slap_unknown_bv ); - ber_dupbv( &pConn->c_peer_name, (struct berval *)&slap_unknown_bv ); + conn->c_listener = &slapi_listener; + ber_dupbv( &conn->c_peer_domain, (struct berval *)&slap_unknown_bv ); + ber_dupbv( &conn->c_peer_name, (struct berval *)&slap_unknown_bv ); - LDAP_STAILQ_INIT( &pConn->c_ops ); + LDAP_STAILQ_INIT( &conn->c_ops ); - pConn->c_sasl_bind_mech.bv_val = NULL; - pConn->c_sasl_bind_mech.bv_len = 0; - pConn->c_sasl_authctx = NULL; - pConn->c_sasl_sockctx = NULL; - pConn->c_sasl_extra = NULL; + BER_BVZERO( &conn->c_sasl_bind_mech ); + conn->c_sasl_authctx = NULL; + conn->c_sasl_sockctx = NULL; + conn->c_sasl_extra = NULL; - pConn->c_sb = ber_sockbuf_alloc( ); + conn->c_sb = ber_sockbuf_alloc(); - ber_sockbuf_ctrl( pConn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max ); + ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max ); - pConn->c_currentber = NULL; + conn->c_currentber = NULL; /* should check status of thread calls */ - ldap_pvt_thread_mutex_init( &pConn->c_mutex ); - ldap_pvt_thread_mutex_init( &pConn->c_write_mutex ); - ldap_pvt_thread_cond_init( &pConn->c_write_cv ); + ldap_pvt_thread_mutex_init( &conn->c_mutex ); + ldap_pvt_thread_mutex_init( &conn->c_write_mutex ); + ldap_pvt_thread_cond_init( &conn->c_write_cv ); - ldap_pvt_thread_mutex_lock( &pConn->c_mutex ); + ldap_pvt_thread_mutex_lock( &conn->c_mutex ); - pConn->c_n_ops_received = 0; - pConn->c_n_ops_executing = 0; - pConn->c_n_ops_pending = 0; - pConn->c_n_ops_completed = 0; + conn->c_n_ops_received = 0; + conn->c_n_ops_executing = 0; + conn->c_n_ops_pending = 0; + conn->c_n_ops_completed = 0; - pConn->c_n_get = 0; - pConn->c_n_read = 0; - pConn->c_n_write = 0; + conn->c_n_get = 0; + conn->c_n_read = 0; + conn->c_n_write = 0; - pConn->c_protocol = LDAP_VERSION3; + conn->c_protocol = LDAP_VERSION3; - pConn->c_activitytime = pConn->c_starttime = slap_get_time(); + conn->c_activitytime = conn->c_starttime = slap_get_time(); /* * A real connection ID is required, because syncrepl associates @@ -211,324 +249,142 @@ slapi_int_init_connection( * Setting a fake connection ID will cause slap_get_commit_csn() * to return a stale value. */ - connection_assign_nextid( pConn ); + connection_assign_nextid( conn ); - pConn->c_conn_state = 0x01; /* SLAP_C_ACTIVE */ - pConn->c_struct_state = 0x02; /* SLAP_C_USED */ + conn->c_conn_state = 0x01; /* SLAP_C_ACTIVE */ + conn->c_struct_state = 0x02; /* SLAP_C_USED */ - pConn->c_ssf = pConn->c_transport_ssf = 0; - pConn->c_tls_ssf = 0; + conn->c_ssf = conn->c_transport_ssf = 0; + conn->c_tls_ssf = 0; - backend_connection_init( pConn ); + backend_connection_init( conn ); - pConn->c_send_ldap_result = slapi_int_send_ldap_result_shim; - pConn->c_send_search_entry = slapi_int_send_search_entry_shim; - pConn->c_send_ldap_extended = slapi_int_send_ldap_extended_shim; - pConn->c_send_search_reference = slapi_int_send_search_reference_shim; + conn->c_send_ldap_result = slap_send_ldap_result; + conn->c_send_search_entry = slap_send_search_entry; + conn->c_send_ldap_extended = slap_send_ldap_extended; + conn->c_send_search_reference = slap_send_search_reference; /* operation object */ - pConn->c_pending_ops.stqh_first->o_tag = OpType; - pConn->c_pending_ops.stqh_first->o_protocol = LDAP_VERSION3; - pConn->c_pending_ops.stqh_first->o_authmech.bv_val = NULL; - pConn->c_pending_ops.stqh_first->o_authmech.bv_len = 0; - pConn->c_pending_ops.stqh_first->o_time = slap_get_time(); - pConn->c_pending_ops.stqh_first->o_do_not_cache = 1; - pConn->c_pending_ops.stqh_first->o_threadctx = ldap_pvt_thread_pool_context(); - pConn->c_pending_ops.stqh_first->o_tmpmemctx = NULL; - pConn->c_pending_ops.stqh_first->o_tmpmfuncs = &ch_mfuncs; - pConn->c_pending_ops.stqh_first->o_conn = pConn; - pConn->c_pending_ops.stqh_first->o_connid = pConn->c_connid; - - ldap_pvt_thread_mutex_unlock( &pConn->c_mutex ); - - return pConn; + op->o_tag = tag; + op->o_protocol = LDAP_VERSION3; + BER_BVZERO( &op->o_authmech ); + op->o_time = slap_get_time(); + op->o_do_not_cache = 1; + op->o_threadctx = ldap_pvt_thread_pool_context(); + op->o_tmpmemctx = NULL; + op->o_tmpmfuncs = &ch_mfuncs; + op->o_conn = conn; + op->o_connid = conn->c_connid; + op->o_bd = frontendDB; + + pb->pop = op; + pb->pconn = conn; + pb->internal_op = 1; + + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); } -void slapi_int_connection_destroy( Connection **pConn ) +static void +slapi_int_set_operation_dn( Slapi_PBlock *pb ) { - Connection *conn = *pConn; - Operation *op; + Backend *be; + Operation *op = pb->pop; - if ( pConn == NULL ) { - return; + if ( BER_BVISNULL( &op->o_ndn ) ) { + /* set to root DN */ + be = select_backend( &op->o_req_ndn, 0, 0 ); + assert( be != NULL ); + ber_dupbv( &op->o_dn, &be->be_rootdn ); + ber_dupbv( &op->o_ndn, &be->be_rootndn ); } - - op = (Operation *)conn->c_pending_ops.stqh_first; - - slap_graduate_commit_csn( op ); - - if ( op->o_req_dn.bv_val != NULL ) { - slapi_ch_free( (void **)&op->o_req_dn.bv_val ); - } - if ( op->o_req_ndn.bv_val != NULL ) { - slapi_ch_free( (void **)&op->o_req_ndn.bv_val ); - } - - if ( conn->c_sb != NULL ) { - ber_sockbuf_free( conn->c_sb ); - } - if ( op != NULL ) { - slapi_ch_free( (void **)&op ); - } - slapi_ch_free( (void **)pConn ); } -/* - * Function : values2obj - * Convert an array of strings into a BerVarray. - * the strings. - */ -static int -values2obj_copy( - char **ppValue, - BerVarray *bvobj ) +void +slapi_int_connection_done_pb( Slapi_PBlock *pb ) { - int i; - BerVarray tmpberval; + Connection *conn; + Operation *op; - if ( ppValue == NULL ) { - *bvobj = NULL; - return LDAP_SUCCESS; + PBLOCK_ASSERT_INTOP( pb, 0 ); + + conn = pb->pconn; + op = pb->pop; + + /* free allocated DNs */ + if ( !BER_BVISNULL( &op->o_dn ) ) + op->o_tmpfree( op->o_dn.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &op->o_ndn ) ) + op->o_tmpfree( op->o_ndn.bv_val, op->o_tmpmemctx ); + + if ( !BER_BVISNULL( &op->o_req_dn ) ) + op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &op->o_req_ndn ) ) + op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx ); + + switch ( op->o_tag ) { + case LDAP_REQ_MODRDN: + if ( !BER_BVISNULL( &op->orr_newrdn )) + op->o_tmpfree( op->orr_newrdn.bv_val, op->o_tmpmemctx ); + if ( !BER_BVISNULL( &op->orr_nnewrdn )) + op->o_tmpfree( op->orr_nnewrdn.bv_val, op->o_tmpmemctx ); + if ( op->orr_newSup != NULL ) { + assert( !BER_BVISNULL( op->orr_newSup ) ); + op->o_tmpfree( op->orr_newSup->bv_val, op->o_tmpmemctx ); + op->o_tmpfree( op->orr_newSup, op->o_tmpmemctx ); + } + if ( op->orr_nnewSup != NULL ) { + assert( !BER_BVISNULL( op->orr_nnewSup ) ); + op->o_tmpfree( op->orr_nnewSup->bv_val, op->o_tmpmemctx ); + op->o_tmpfree( op->orr_nnewSup, op->o_tmpmemctx ); + } + break; + case LDAP_REQ_ADD: + slapi_int_mods_free( op->ora_modlist ); + break; + case LDAP_REQ_MODIFY: + slapi_int_mods_free( op->orm_modlist ); + break; + case LDAP_REQ_SEARCH: + if ( op->ors_attrs != NULL ) { + op->o_tmpfree( op->ors_attrs, op->o_tmpmemctx ); + op->ors_attrs = NULL; + } + break; + default: + break; } - for ( i = 0; ppValue[i] != NULL; i++ ) - ; /* EMPTY */ - - tmpberval = (BerVarray)slapi_ch_malloc( (i+1) * (sizeof(struct berval)) ); - if ( tmpberval == NULL ) { - return LDAP_NO_MEMORY; - } - for ( i = 0; ppValue[i] != NULL; i++ ) { - size_t len = strlen( ppValue[i] ); + slapi_ch_free_string( &conn->c_authmech.bv_val ); + slapi_ch_free_string( &conn->c_dn.bv_val ); + slapi_ch_free_string( &conn->c_ndn.bv_val ); - tmpberval[i].bv_val = slapi_ch_malloc( len + 1 ); - AC_MEMCPY( tmpberval[i].bv_val, ppValue[i], len + 1 ); - tmpberval[i].bv_len = len; + if ( conn->c_sb != NULL ) { + ber_sockbuf_free( conn->c_sb ); } - tmpberval[i].bv_val = NULL; - tmpberval[i].bv_len = 0; - - *bvobj = tmpberval; - return LDAP_SUCCESS; + slapi_ch_free( (void **)&pb->pop->o_callback ); + slapi_ch_free( (void **)&pb->pop ); + slapi_ch_free( (void **)&pb->pconn ); } static int -bvptr2obj_copy( - struct berval **bvptr, - BerVarray *bvobj ) +slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which ) { - int i; - BerVarray tmpberval; - - if ( bvptr == NULL ) { - *bvobj = NULL; - return LDAP_SUCCESS; - } - - for ( i = 0; bvptr[i] != NULL; i++ ) - ; /* EMPTY */ - - tmpberval = (BerVarray)slapi_ch_malloc( (i + 1) * sizeof(struct berval)); - if ( tmpberval == NULL ) { - return LDAP_NO_MEMORY; - } - - for ( i = 0; bvptr[i] != NULL; i++ ) { - tmpberval[i].bv_val = slapi_ch_malloc( bvptr[i]->bv_len ); - tmpberval[i].bv_len = bvptr[i]->bv_len; - AC_MEMCPY( tmpberval[i].bv_val, bvptr[i]->bv_val, bvptr[i]->bv_len ); - } - - tmpberval[i].bv_val = NULL; - tmpberval[i].bv_len = 0; + BI_op_bind **func; + SlapReply *rs = &pb->rs; + int rc; - *bvobj = tmpberval; + PBLOCK_ASSERT_INTOP( pb, 0 ); - return LDAP_SUCCESS; -} - -/* - * Function : slapi_int_ldapmod_to_entry - * convert a dn plus an array of LDAPMod struct ptrs to an entry structure - * with a link list of the correspondent attributes. - * Return value : LDAP_SUCCESS - * LDAP_NO_MEMORY - * LDAP_OTHER -*/ -static Entry * -slapi_int_ldapmod_to_entry( - Connection *pConn, - char *ldn, - LDAPMod **mods ) -{ - struct berval dn = BER_BVNULL; - Entry *pEntry=NULL; - LDAPMod *pMod; - struct berval *bv; - Operation *op; - - Modifications *modlist = NULL; - Modifications **modtail = &modlist; - Modifications tmp; - - int rc = LDAP_SUCCESS; - int i; - - const char *text = NULL; - - op = (Operation *)pConn->c_pending_ops.stqh_first; - - pEntry = (Entry *) ch_calloc( 1, sizeof(Entry) ); - if ( pEntry == NULL) { - rc = LDAP_NO_MEMORY; - goto cleanup; - } - - dn.bv_val = ldn; - dn.bv_len = strlen(ldn); - - rc = dnPrettyNormal( NULL, &dn, &pEntry->e_name, &pEntry->e_nname, NULL ); - if ( rc != LDAP_SUCCESS ) { - goto cleanup; - } - - if ( rc == LDAP_SUCCESS ) { - for ( i = 0, pMod = mods[0]; rc == LDAP_SUCCESS && pMod != NULL; pMod = mods[++i]) { - Modifications *mod; - - if ( (pMod->mod_op & LDAP_MOD_BVALUES) != 0 ) { - /* - * Convert an array of pointers to bervals to - * an array of bervals. Note that we need to copy the - * values too, as the slap_mods_check() will free the - * original values after prettying; the modifications - * being passed in may not have been allocated on the - * heap. - */ - rc = bvptr2obj_copy( pMod->mod_bvalues, &bv ); - if ( rc != LDAP_SUCCESS ) goto cleanup; - tmp.sml_type.bv_val = pMod->mod_type; - tmp.sml_type.bv_len = strlen( pMod->mod_type ); - tmp.sml_values = bv; - tmp.sml_nvalues = NULL; - - mod = (Modifications *) ch_malloc( sizeof(Modifications) ); - - mod->sml_op = LDAP_MOD_ADD; - mod->sml_flags = 0; - mod->sml_next = NULL; - mod->sml_desc = NULL; - mod->sml_type = tmp.sml_type; - mod->sml_values = tmp.sml_values; - mod->sml_nvalues = tmp.sml_nvalues; - - *modtail = mod; - modtail = &mod->sml_next; - - } else { - /* attr values are in string format, need to be converted */ - /* to an array of bervals */ - if ( pMod->mod_values == NULL ) { - rc = LDAP_OTHER; - } else { - rc = values2obj_copy( pMod->mod_values, &bv ); - if ( rc != LDAP_SUCCESS ) goto cleanup; - tmp.sml_type.bv_val = pMod->mod_type; - tmp.sml_type.bv_len = strlen( pMod->mod_type ); - tmp.sml_values = bv; - tmp.sml_nvalues = NULL; - - mod = (Modifications *) ch_malloc( sizeof(Modifications) ); - - mod->sml_op = LDAP_MOD_ADD; - mod->sml_flags = 0; - mod->sml_next = NULL; - mod->sml_desc = NULL; - mod->sml_type = tmp.sml_type; - mod->sml_values = tmp.sml_values; - mod->sml_nvalues = tmp.sml_nvalues; - - *modtail = mod; - modtail = &mod->sml_next; - } - } - } /* for each LDAPMod */ - } - - op->o_bd = select_backend( &pEntry->e_nname, 0, 0 ); - if ( op->o_bd == NULL ) { - rc = LDAP_PARTIAL_RESULTS; - } else { - int repl_user = be_isupdate_dn( op->o_bd, &op->o_bd->be_rootdn ); - if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) { - int update = !BER_BVISNULL( &op->o_bd->be_update_ndn ); - char textbuf[ SLAP_TEXT_BUFLEN ]; - size_t textlen = sizeof( textbuf ); - - rc = slap_mods_check( modlist, &text, - textbuf, textlen, NULL ); - - if ( rc != LDAP_SUCCESS) { - goto cleanup; - } - - if ( !update ) { - rc = slap_mods_no_user_mod_check( op, modlist, - &text, textbuf, textlen ); - if ( rc != LDAP_SUCCESS) { - goto cleanup; - } - } - - if ( !repl_user ) { - rc = slap_mods_opattrs( op, modlist, modtail, - &text, textbuf, textlen, 1 ); - if ( rc != LDAP_SUCCESS) { - goto cleanup; - } - } - - rc = slap_mods2entry( modlist, &pEntry, repl_user, - 0, &text, textbuf, textlen ); - if (rc != LDAP_SUCCESS) { - goto cleanup; - } - - } else { - rc = LDAP_REFERRAL; - } - } - -cleanup:; - if ( modlist != NULL ) - slap_mods_free( modlist ); + rc = slapi_int_get_ctrls( pb ); if ( rc != LDAP_SUCCESS ) { - if ( pEntry != NULL ) { - slapi_entry_free( pEntry ); - } - pEntry = NULL; + rs->sr_err = rc; + return rc; } - return( pEntry ); -} + func = &pb->pop->o_bd->be_bind; -static int -slapi_int_get_ctrls( Operation *op, SlapReply *rs, LDAPControl **controls ) -{ - LDAPControl **c; - int rc; - - op->o_ctrls = controls; - if ( op->o_ctrls == NULL ) { - return LDAP_SUCCESS; - } - - for ( c = op->o_ctrls; *c != NULL; c++ ) { - rc = slap_parse_ctrl( op, rs, *c, &rs->sr_text ); - if ( rc != LDAP_SUCCESS ) - break; - } + rc = func[which]( pb->pop, &pb->rs ); return rc; } @@ -536,574 +392,176 @@ slapi_int_get_ctrls( Operation *op, SlapReply *rs, LDAPControl **controls ) int slapi_delete_internal_pb( Slapi_PBlock *pb ) { -#ifdef LDAP_SLAPI - Connection *pConn = NULL; - Operation *op = NULL; - struct berval dn = BER_BVNULL; - char *ldn = NULL; - LDAPControl **controls = NULL; - int manageDsaIt = SLAP_CONTROL_NONE; - int operation_flags = 0; - int isCritical; - - SlapReply rs = { REP_RESULT }; - if ( pb == NULL ) { return -1; } - slapi_pblock_get( pb, SLAPI_TARGET_DN, &ldn ); - slapi_pblock_get( pb, SLAPI_REQCONTROLS, &controls ); - slapi_pblock_get( pb, SLAPI_X_INTOP_FLAGS, &operation_flags ); - - if ( ldn == NULL ) { - rs.sr_err = LDAP_PARAM_ERROR; - goto cleanup; - } - - pConn = slapi_int_init_connection( NULL, LDAP_REQ_DELETE ); - if (pConn == NULL) { - rs.sr_err = LDAP_NO_MEMORY; - goto cleanup; - } - - op = (Operation *)pConn->c_pending_ops.stqh_first; - op->o_pb = pb; - - rs.sr_err = slapi_int_get_ctrls( op, &rs, controls ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - dn.bv_val = ldn; - dn.bv_len = strlen(ldn); - - rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - if ( slapi_control_present( controls, - SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical) ) { - manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; - } - - op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 ); - if ( op->o_bd == NULL ) { - rs.sr_err = LDAP_PARTIAL_RESULTS; - goto cleanup; - } - - op->o_dn = pConn->c_dn = op->o_bd->be_rootdn; - op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn; - - if ( op->o_bd->be_delete ) { - int repl_user = be_isupdate( op ); - if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) { - slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; - if ( operation_flags & SLAPI_OP_FLAG_LOG_CHANGE ) - op->o_callback = &cb; - - op->o_bd->be_delete( op, &rs ); - } else { - rs.sr_err = LDAP_REFERRAL; - } - } else { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; - } - -cleanup: - slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err ); + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_DELETE ); - slapi_int_connection_destroy( &pConn ); + slapi_int_func_internal_pb( pb, op_delete ); + slap_graduate_commit_csn( pb->pop ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } int slapi_add_internal_pb( Slapi_PBlock *pb ) { -#ifdef LDAP_SLAPI - Connection *pConn = NULL; - Slapi_Entry *entry = NULL; - Slapi_Entry *argEntry = NULL; - char *dn = NULL; - LDAPMod **mods = NULL; - LDAPControl **controls = NULL; - int operation_flags = 0; - Operation *op = NULL; - - int manageDsaIt = SLAP_CONTROL_NONE; - int isCritical; - int freeEntry = 0; - int i; - - SlapReply rs = { REP_RESULT }; + SlapReply *rs; + Slapi_Entry *entry_orig = NULL; if ( pb == NULL ) { return -1; } - pConn = slapi_int_init_connection( NULL, LDAP_REQ_ADD ); - if ( pConn == NULL ) { - rs.sr_err = LDAP_OTHER; - goto cleanup; - } + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_ADD ); - slapi_pblock_get( pb, SLAPI_ADD_TARGET, &dn ); - slapi_pblock_get( pb, SLAPI_ADD_ENTRY, &argEntry ); - slapi_pblock_get( pb, SLAPI_MODIFY_MODS, &mods ); - slapi_pblock_get( pb, SLAPI_REQCONTROLS, &controls ); - slapi_pblock_get( pb, SLAPI_X_INTOP_FLAGS, &operation_flags ); + rs = &pb->rs; - if ( argEntry != NULL ) { - entry = slapi_entry_dup( argEntry ); - dn = slapi_entry_get_dn( argEntry ); - } else { - if ( mods == NULL || dn == NULL ) { - rs.sr_err = LDAP_PARAM_ERROR; - goto cleanup; - } + entry_orig = pb->pop->ora_e; + pb->pop->ora_e = NULL; - for ( i = 0; mods[i] != NULL; i++ ) { - if ( (mods[i]->mod_op & LDAP_MOD_OP ) != LDAP_MOD_ADD ) { - rs.sr_err = LDAP_OTHER; - goto cleanup; - } - } - - entry = slapi_int_ldapmod_to_entry( pConn, dn, mods ); - if ( entry == NULL ) { - rs.sr_err = LDAP_OTHER; + if ( entry_orig != NULL ) { + if ( pb->pop->ora_modlist != NULL || !BER_BVISNULL( &pb->pop->o_req_ndn )) { + rs->sr_err = LDAP_PARAM_ERROR; goto cleanup; } - } - - if ( slapi_control_present( controls, LDAP_CONTROL_MANAGEDSAIT, - NULL, &isCritical ) ) { - manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; - } - - op = (Operation *)pConn->c_pending_ops.stqh_first; - op->o_pb = pb; - rs.sr_err = slapi_int_get_ctrls( op, &rs, controls ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - op->o_bd = select_backend( &entry->e_nname, manageDsaIt, 1 ); - if ( op->o_bd == NULL ) { - rs.sr_err = LDAP_PARTIAL_RESULTS; + assert( BER_BVISNULL( &pb->pop->o_req_dn ) ); /* shouldn't get set */ + ber_dupbv( &pb->pop->o_req_dn, &entry_orig->e_name ); + ber_dupbv( &pb->pop->o_req_ndn, &entry_orig->e_nname ); + } else if ( pb->pop->ora_modlist == NULL || BER_BVISNULL( &pb->pop->o_req_ndn )) { + rs->sr_err = LDAP_PARAM_ERROR; goto cleanup; } - op->o_dn = pConn->c_dn = op->o_bd->be_rootdn; - op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn; - op->oq_add.rs_e = entry; - - if ( op->o_bd->be_add ) { - int repl_user = be_isupdate( op ); - if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) { - slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; + /* + * The caller can specify a new entry, or a target DN and set + * of modifications, but not both. + */ + pb->pop->ora_e = (Entry *)slapi_ch_calloc( 1, sizeof(Entry) ); + ber_dupbv( &pb->pop->ora_e->e_name, &pb->pop->o_req_dn ); + ber_dupbv( &pb->pop->ora_e->e_nname, &pb->pop->o_req_ndn ); - if ( operation_flags & SLAPI_OP_FLAG_LOG_CHANGE ) - op->o_callback = &cb; + if ( entry_orig != NULL ) { + assert( pb->pop->ora_modlist == NULL ); - if ( op->o_bd->be_add( op, &rs ) == LDAP_SUCCESS ) { - be_entry_release_w( op, entry ); - entry = NULL; - } - } else { - rs.sr_err = LDAP_REFERRAL; + rs->sr_err = slap_entry2mods( entry_orig, &pb->pop->ora_modlist, + &rs->sr_text, pb->textbuf, sizeof( pb->textbuf ) ); + if ( rs->sr_err != LDAP_SUCCESS ) { + goto cleanup; } } else { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; + assert( pb->pop->ora_modlist != NULL ); + } + + rs->sr_err = slap_mods_check( pb->pop->ora_modlist, &rs->sr_text, + pb->textbuf, sizeof( pb->textbuf ), NULL ); + if ( rs->sr_err != LDAP_SUCCESS ) { + goto cleanup; + } + + if ( slapi_int_func_internal_pb( pb, op_add ) == 0 ) { + if ( pb->pop->ora_e != NULL && pb->pop->o_private != NULL ) { + BackendDB *bd = pb->pop->o_bd; + + /* could we use SLAPI_BACKEND instead? */ + pb->pop->o_bd = (BackendDB *)pb->pop->o_private; + pb->pop->o_private = NULL; + be_entry_release_w( pb->pop, pb->pop->ora_e ); + pb->pop->ora_e = NULL; + pb->pop->o_bd = bd; + pb->pop->o_private = NULL; + } } cleanup: - slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err ); + slap_graduate_commit_csn( pb->pop ); - if ( entry != NULL ) { - slapi_entry_free( entry ); + if ( pb->pop->ora_e != NULL ) { + slapi_entry_free( pb->pop->ora_e ); + pb->pop->ora_e = NULL; + } + if ( entry_orig != NULL ) { + pb->pop->ora_e = entry_orig; + slapi_int_mods_free( pb->pop->ora_modlist ); + pb->pop->ora_modlist = NULL; } - - slapi_int_connection_destroy( &pConn ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } int slapi_modrdn_internal_pb( Slapi_PBlock *pb ) { -#ifdef LDAP_SLAPI - struct berval dn = BER_BVNULL; - struct berval newrdn = BER_BVNULL; - struct berval newsupdn = BER_BVNULL; - struct berval newSuperiorPretty = BER_BVNULL; - struct berval newSuperiorNormalized = BER_BVNULL; - Connection *pConn = NULL; - Operation *op = NULL; - int manageDsaIt = SLAP_CONTROL_NONE; - int isCritical; - - char *olddn; - char *lnewrdn; - char *newsuperior; - int deloldrdn; - LDAPControl **controls; - int operation_flags; - - SlapReply rs = { REP_RESULT }; - if ( pb == NULL ) { return -1; } - slapi_pblock_get( pb, SLAPI_MODRDN_TARGET, &olddn ); - slapi_pblock_get( pb, SLAPI_MODRDN_NEWRDN, &lnewrdn ); - slapi_pblock_get( pb, SLAPI_MODRDN_NEWSUPERIOR, &newsuperior ); - slapi_pblock_get( pb, SLAPI_MODRDN_DELOLDRDN, &deloldrdn ); - slapi_pblock_get( pb, SLAPI_REQCONTROLS, &controls ); -#if 0 - slapi_pblock_get( pb, SLAPI_TARGET_UNIQUEID, uniqueid ); - slapi_pblock_get( pb, SLAPI_PLUGIN_IDENTITY, plugin_identity ); -#endif - slapi_pblock_get( pb, SLAPI_X_INTOP_FLAGS, &operation_flags ); - - pConn = slapi_int_init_connection( NULL, LDAP_REQ_MODRDN ); - if ( pConn == NULL) { - rs.sr_err = LDAP_NO_MEMORY; - goto cleanup; - } - - op = (Operation *)pConn->c_pending_ops.stqh_first; - op->o_pb = pb; - - rs.sr_err = slapi_int_get_ctrls( op, &rs, controls ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - if ( slapi_control_present( controls, - SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) { - manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; - } - - dn.bv_val = (char *)olddn; - dn.bv_len = strlen( olddn ); - - rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } - - if ( op->o_req_dn.bv_len == 0 ) { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; - goto cleanup; - } - - op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 ); - if ( op->o_bd == NULL ) { - rs.sr_err = LDAP_PARTIAL_RESULTS; - goto cleanup; - } - - op->o_dn = pConn->c_dn = op->o_bd->be_rootdn; - op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn; - - newrdn.bv_val = (char *)lnewrdn; - newrdn.bv_len = strlen( lnewrdn ); - - rs.sr_err = dnPrettyNormal( NULL, &newrdn, &op->oq_modrdn.rs_newrdn, &op->oq_modrdn.rs_nnewrdn, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_MODRDN ); - if ( rdn_validate( &op->oq_modrdn.rs_nnewrdn ) != LDAP_SUCCESS ) { + if ( BER_BVISEMPTY( &pb->pop->o_req_ndn ) ) { + pb->rs.sr_err = LDAP_UNWILLING_TO_PERFORM; goto cleanup; } - if ( newsuperior != NULL ) { - newsupdn.bv_val = (char *)newsuperior; - newsupdn.bv_len = strlen( newsuperior ); - - rs.sr_err = dnPrettyNormal( NULL, &newsupdn, &newSuperiorPretty, &newSuperiorNormalized, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - op->oq_modrdn.rs_newSup = &newSuperiorPretty; - op->oq_modrdn.rs_nnewSup = &newSuperiorNormalized; - } else { - op->oq_modrdn.rs_newSup = NULL; - op->oq_modrdn.rs_nnewSup = NULL; - } - - op->oq_modrdn.rs_deleteoldrdn = deloldrdn; - - if ( op->o_bd->be_modrdn ) { - int repl_user = be_isupdate( op ); - if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) { - slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; - - if ( operation_flags & SLAPI_OP_FLAG_LOG_CHANGE ) - op->o_callback = &cb; - - op->o_bd->be_modrdn( op, &rs ); - } else { - rs.sr_err = LDAP_REFERRAL; - } - } else { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; - } + slapi_int_func_internal_pb( pb, op_modrdn ); cleanup: - - slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err ); - - if ( op->oq_modrdn.rs_newrdn.bv_val != NULL ) - slapi_ch_free( (void **)&op->oq_modrdn.rs_newrdn.bv_val ); - if ( op->oq_modrdn.rs_nnewrdn.bv_val != NULL ) - slapi_ch_free( (void **)&op->oq_modrdn.rs_nnewrdn.bv_val ); - if ( newSuperiorPretty.bv_val != NULL ) - slapi_ch_free( (void **)&newSuperiorPretty.bv_val ); - if ( newSuperiorNormalized.bv_val != NULL ) - slapi_ch_free( (void **)&newSuperiorNormalized.bv_val ); - - slapi_int_connection_destroy( &pConn ); + slap_graduate_commit_csn( pb->pop ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } -int slapi_modify_internal_pb( Slapi_PBlock *pb ) +int +slapi_modify_internal_pb( Slapi_PBlock *pb ) { -#ifdef LDAP_SLAPI - int i; - Connection *pConn = NULL; - Operation *op = NULL; - - struct berval dn = BER_BVNULL; - - int manageDsaIt = SLAP_CONTROL_NONE; - int isCritical; - struct berval *bv; - LDAPMod *pMod; - - Modifications *modlist = NULL; - Modifications **modtail = &modlist; - Modifications tmp; - - char *ldn = NULL; - LDAPMod **mods = NULL; - LDAPControl **controls = NULL; - int operation_flags = 0; - - SlapReply rs = { REP_RESULT }; + SlapReply *rs; if ( pb == NULL ) { return -1; } - slapi_pblock_get( pb, SLAPI_MODIFY_TARGET, &ldn ); - slapi_pblock_get( pb, SLAPI_MODIFY_MODS, &mods ); - slapi_pblock_get( pb, SLAPI_REQCONTROLS, &controls ); -#if 0 - slapi_pblock_get( pb, SLAPI_TARGET_UNIQUEID, uniqueid ); - slapi_pblock_get( pb, SLAPI_PLUGIN_IDENTITY, plugin_identity ); -#endif - slapi_pblock_get( pb, SLAPI_X_INTOP_FLAGS, &operation_flags ); - - if ( mods == NULL || *mods == NULL || ldn == NULL ) { - rs.sr_err = LDAP_PARAM_ERROR ; - goto cleanup; - } - - pConn = slapi_int_init_connection( NULL, LDAP_REQ_MODIFY ); - if ( pConn == NULL ) { - rs.sr_err = LDAP_NO_MEMORY; - goto cleanup; - } + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_MODIFY ); - op = (Operation *)pConn->c_pending_ops.stqh_first; - op->o_pb = pb; + rs = &pb->rs; - rs.sr_err = slapi_int_get_ctrls( op, &rs, controls ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - dn.bv_val = ldn; - dn.bv_len = strlen( ldn ); - - rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) { + if ( pb->pop->orm_modlist == NULL ) { + rs->sr_err = LDAP_PARAM_ERROR; goto cleanup; } - if ( slapi_control_present( controls, - SLAPI_CONTROL_MANAGEDSAIT_OID, NULL, &isCritical ) ) { - manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; - } - - op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 ); - if ( op->o_bd == NULL ) { - rs.sr_err = LDAP_PARTIAL_RESULTS; - goto cleanup; - } - - op->o_dn = pConn->c_dn = op->o_bd->be_rootdn; - op->o_ndn = pConn->c_ndn = op->o_bd->be_rootndn; - - for ( i = 0, pMod = mods[0]; - rs.sr_err == LDAP_SUCCESS && pMod != NULL; - pMod = mods[++i] ) - { - Modifications *mod; - - if ( (pMod->mod_op & LDAP_MOD_BVALUES) != 0 ) { - /* - * attr values are in berval format - * convert an array of pointers to bervals - * to an array of bervals - */ - rs.sr_err = bvptr2obj_copy( pMod->mod_bvalues, &bv ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - tmp.sml_type.bv_val = pMod->mod_type; - tmp.sml_type.bv_len = strlen( pMod->mod_type ); - tmp.sml_values = bv; - tmp.sml_nvalues = NULL; - - mod = (Modifications *)ch_malloc( sizeof(Modifications) ); - - mod->sml_op = pMod->mod_op & LDAP_MOD_OP; - mod->sml_flags = 0; - mod->sml_next = NULL; - mod->sml_desc = NULL; - mod->sml_type = tmp.sml_type; - mod->sml_values = tmp.sml_values; - mod->sml_nvalues = tmp.sml_nvalues; - } else { - rs.sr_err = values2obj_copy( pMod->mod_values, &bv ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - tmp.sml_type.bv_val = pMod->mod_type; - tmp.sml_type.bv_len = strlen( pMod->mod_type ); - tmp.sml_values = bv; - tmp.sml_nvalues = NULL; - - mod = (Modifications *) ch_malloc( sizeof(Modifications) ); - - mod->sml_op = pMod->mod_op & LDAP_MOD_OP; - mod->sml_flags = 0; - mod->sml_next = NULL; - mod->sml_desc = NULL; - mod->sml_type = tmp.sml_type; - mod->sml_values = tmp.sml_values; - mod->sml_nvalues = tmp.sml_nvalues; - } - *modtail = mod; - modtail = &mod->sml_next; - - switch( pMod->mod_op & LDAP_MOD_OP ) { - case LDAP_MOD_ADD: - if ( mod->sml_values == NULL ) { - rs.sr_err = LDAP_PROTOCOL_ERROR; - goto cleanup; - } - - /* fall through */ - case LDAP_MOD_DELETE: - case LDAP_MOD_REPLACE: - case LDAP_MOD_INCREMENT: - break; - - default: - rs.sr_err = LDAP_PROTOCOL_ERROR; - goto cleanup; - } - } - *modtail = NULL; - - if ( op->o_req_ndn.bv_len == 0 ) { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; + if ( BER_BVISEMPTY( &pb->pop->o_req_ndn ) ) { + rs->sr_err = LDAP_UNWILLING_TO_PERFORM; goto cleanup; } - op->oq_modify.rs_modlist = modlist; - - if ( op->o_bd->be_modify ) { - int repl_user = be_isupdate( op ); - if ( !op->o_bd->be_update_ndn.bv_len || repl_user ) { - int update = !BER_BVISEMPTY( &op->o_bd->be_update_ndn ); - const char *text = NULL; - char textbuf[ SLAP_TEXT_BUFLEN ]; - size_t textlen = sizeof( textbuf ); - slap_callback cb = { NULL, slap_replog_cb, NULL, NULL }; - - rs.sr_err = slap_mods_check( modlist, - &text, textbuf, textlen, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } - - if ( !update ) { - rs.sr_err = slap_mods_no_user_mod_check( op, modlist, - &text, textbuf, textlen ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } - } - - if ( !repl_user ) { - rs.sr_err = slap_mods_opattrs( op, modlist, - modtail, &text, textbuf, - textlen, 1 ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } - } + rs->sr_err = slap_mods_check( pb->pop->orm_modlist, + &rs->sr_text, pb->textbuf, sizeof( pb->textbuf ), NULL ); + if ( rs->sr_err != LDAP_SUCCESS ) { + goto cleanup; + } - if ( operation_flags & SLAPI_OP_FLAG_LOG_CHANGE ) - op->o_callback = &cb; - - op->o_bd->be_modify( op, &rs ); - } else { - rs.sr_err = LDAP_REFERRAL; - } - } else { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; - } + slapi_int_func_internal_pb( pb, op_modify ); cleanup: - slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err ); - - if ( modlist != NULL ) - slap_mods_free( modlist ); - - slapi_int_connection_destroy( &pConn ); + slap_graduate_commit_csn( pb->pop ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } -#ifdef LDAP_SLAPI static int slapi_int_search_entry_callback( Slapi_Entry *entry, void *callback_data ) { - int nentries = 0, i = 0; - Slapi_Entry **head = NULL, **tp; - Slapi_PBlock *pb = (Slapi_PBlock *)callback_data; + int nentries = 0, i = 0; + Slapi_Entry **head = NULL, **tp; + Slapi_PBlock *pb = (Slapi_PBlock *)callback_data; + + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_SEARCH ); entry = slapi_entry_dup( entry ); if ( entry == NULL ) { - return 1; + return LDAP_NO_MEMORY; } slapi_pblock_get( pb, SLAPI_NENTRIES, &nentries ); @@ -1114,261 +572,96 @@ slapi_int_search_entry_callback( Slapi_Entry *entry, void *callback_data ) tp = (Slapi_Entry **)slapi_ch_malloc( 2 * sizeof(Slapi_Entry *) ); if ( tp == NULL ) { slapi_entry_free( entry ); - return 1; + return LDAP_NO_MEMORY; } - tp[ 0 ] = entry; + tp[0] = entry; } else { tp = (Slapi_Entry **)slapi_ch_realloc( (char *)head, sizeof(Slapi_Entry *) * ( i + 1 ) ); if ( tp == NULL ) { slapi_entry_free( entry ); - return 1; + return LDAP_NO_MEMORY; } - tp[ i - 1 ] = entry; + tp[i - 1] = entry; } - tp[ i ] = NULL; + tp[i] = NULL; slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_SEARCH_ENTRIES, (void *)tp ); slapi_pblock_set( pb, SLAPI_NENTRIES, (void *)i ); return LDAP_SUCCESS; } -#endif /* LDAP_SLAPI */ -int slapi_search_internal_pb( Slapi_PBlock *pb ) +int +slapi_search_internal_pb( Slapi_PBlock *pb ) { -#ifdef LDAP_SLAPI return slapi_search_internal_callback_pb( pb, (void *)pb, NULL, slapi_int_search_entry_callback, NULL ); -#else - return -1; -#endif } -int slapi_search_internal_callback_pb( Slapi_PBlock *pb, +int +slapi_search_internal_callback_pb( Slapi_PBlock *pb, void *callback_data, plugin_result_callback prc, plugin_search_entry_callback psec, plugin_referral_entry_callback prec ) { -#ifdef LDAP_SLAPI - Connection *c; - Operation *op = NULL; - struct berval dn = BER_BVNULL; - Filter *filter = NULL; - struct berval fstr = BER_BVNULL; - AttributeName *an = NULL; - const char *text = NULL; - - int manageDsaIt = SLAP_CONTROL_NONE; - int isCritical; - int i; - - char *ldn = NULL; - int scope = LDAP_SCOPE_BASE; - char *filStr = NULL; - LDAPControl **controls = NULL; - char **attrs = NULL; - char *uniqueid = NULL; - int attrsonly = 0; - int operation_flags = 0; - int freeFilter = 0; - - SlapReply rs = { REP_RESULT }; + int free_filter = 0; + SlapReply *rs; if ( pb == NULL ) { return -1; } - slapi_pblock_get( pb, SLAPI_SEARCH_TARGET, &ldn ); - slapi_pblock_get( pb, SLAPI_SEARCH_SCOPE, &scope ); - slapi_pblock_get( pb, SLAPI_SEARCH_FILTER, &filter ); - slapi_pblock_get( pb, SLAPI_SEARCH_STRFILTER, &filStr ); - slapi_pblock_get( pb, SLAPI_SEARCH_ATTRS, &attrs ); - slapi_pblock_get( pb, SLAPI_SEARCH_ATTRSONLY, &attrsonly ); - slapi_pblock_get( pb, SLAPI_REQCONTROLS, &controls ); - slapi_pblock_get( pb, SLAPI_TARGET_UNIQUEID, &uniqueid ); - slapi_pblock_get( pb, SLAPI_X_INTOP_FLAGS, &operation_flags ); - - c = slapi_int_init_connection( NULL, LDAP_REQ_SEARCH ); - if ( c == NULL ) { - rs.sr_err = LDAP_NO_MEMORY; - goto cleanup; - } - - op = (Operation *)c->c_pending_ops.stqh_first; - op->o_pb = pb; - - /* callback and arguments */ - slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK, prc ); - slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, psec ); - slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, prec ); - slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA, callback_data ); + PBLOCK_ASSERT_INTOP( pb, LDAP_REQ_SEARCH ); - rs.sr_err = slapi_int_get_ctrls( op, &rs, controls ); - if ( rs.sr_err != LDAP_SUCCESS ) - goto cleanup; - - if ( ldn != NULL ) { - dn.bv_val = ldn; - dn.bv_len = strlen(ldn); - } + rs = &pb->rs; - rs.sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, NULL ); - if ( rs.sr_err != LDAP_SUCCESS ) { - goto cleanup; - } + /* search callback and arguments */ + slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK, (void *)prc ); + slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, (void *)psec ); + slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, (void *)prec ); + slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA, (void *)callback_data ); - if ( scope != LDAP_SCOPE_BASE && - scope != LDAP_SCOPE_ONELEVEL && - scope != LDAP_SCOPE_SUBTREE ) { - rs.sr_err = LDAP_PROTOCOL_ERROR; + if ( BER_BVISEMPTY( &pb->pop->ors_filterstr )) { + rs->sr_err = LDAP_PARAM_ERROR; goto cleanup; } - if ( filter == NULL ) { - if ( filStr == NULL ) { - rs.sr_err = LDAP_PARAM_ERROR; - goto cleanup; - } - - filter = slapi_str2filter( filStr ); - if ( filter == NULL ) { - rs.sr_err = LDAP_PROTOCOL_ERROR; - goto cleanup; - } - - freeFilter = 1; - } - - filter2bv( filter, &fstr ); - - for ( i = 0; attrs != NULL && attrs[i] != NULL; i++ ) { - ; /* count the number of attributes */ - } - - if (i > 0) { - an = (AttributeName *)slapi_ch_calloc( (i + 1), sizeof(AttributeName) ); - for (i = 0; attrs[i] != 0; i++) { - an[i].an_desc = NULL; - an[i].an_oc = NULL; - an[i].an_oc_exclude = 0; - an[i].an_name.bv_val = slapi_ch_strdup(attrs[i]); - an[i].an_name.bv_len = strlen(attrs[i]); - slap_bv2ad( &an[i].an_name, &an[i].an_desc, &text ); - } - an[i].an_name.bv_val = NULL; - } - - memset( &rs, 0, sizeof(rs) ); - rs.sr_type = REP_RESULT; - rs.sr_err = LDAP_SUCCESS; - rs.sr_entry = NULL; /* paranoia */ - - if ( scope == LDAP_SCOPE_BASE ) { - rs.sr_entry = NULL; - - if ( op->o_req_ndn.bv_len == 0 ) { - rs.sr_err = root_dse_info( c, &rs.sr_entry, &rs.sr_text ); - } - - if( rs.sr_err != LDAP_SUCCESS ) { - send_ldap_result( op, &rs ); - goto cleanup; - } else if ( rs.sr_entry != NULL ) { - rs.sr_err = test_filter( op, rs.sr_entry, filter ); - - if ( rs.sr_err == LDAP_COMPARE_TRUE ) { - rs.sr_type = REP_SEARCH; - rs.sr_err = LDAP_SUCCESS; - rs.sr_attrs = an; - rs.sr_operational_attrs = NULL; - rs.sr_flags = REP_ENTRY_MODIFIABLE; - - send_search_entry( op, &rs ); - } - - entry_free( rs.sr_entry ); - - rs.sr_type = REP_RESULT; - rs.sr_err = LDAP_SUCCESS; - - send_ldap_result( op, &rs ); - + if ( pb->pop->ors_filter == NULL ) { + pb->pop->ors_filter = slapi_str2filter( pb->pop->ors_filterstr.bv_val ); + if ( pb->pop->ors_filter == NULL ) { + rs->sr_err = LDAP_PROTOCOL_ERROR; goto cleanup; } - } - - if ( !op->o_req_ndn.bv_len && default_search_nbase.bv_len ) { - slapi_ch_free( (void **)&op->o_req_dn.bv_val ); - slapi_ch_free( (void **)&op->o_req_ndn.bv_val ); - ber_dupbv( &op->o_req_dn, &default_search_base ); - ber_dupbv( &op->o_req_ndn, &default_search_nbase ); + free_filter = 1; } - if ( slapi_control_present( controls, - LDAP_CONTROL_MANAGEDSAIT, NULL, &isCritical ) ) { - manageDsaIt = isCritical ? SLAP_CONTROL_CRITICAL : SLAP_CONTROL_NONCRITICAL; - } - - op->o_bd = select_backend( &op->o_req_ndn, manageDsaIt, 1 ); - if ( op->o_bd == NULL ) { - if ( manageDsaIt > SLAP_CONTROL_NONE ) { - rs.sr_err = LDAP_NO_SUCH_OBJECT; - } else { - rs.sr_err = LDAP_PARTIAL_RESULTS; - } - goto cleanup; - } - - op->o_dn = c->c_dn = op->o_bd->be_rootdn; - op->o_ndn = c->c_ndn = op->o_bd->be_rootndn; - - op->oq_search.rs_scope = scope; - op->oq_search.rs_deref = 0; - op->oq_search.rs_slimit = SLAP_NO_LIMIT; - op->oq_search.rs_tlimit = SLAP_NO_LIMIT; - op->oq_search.rs_attrsonly = attrsonly; - op->oq_search.rs_attrs = an; - op->oq_search.rs_filter = filter; - op->oq_search.rs_filterstr = fstr; - - if ( op->o_bd->be_search != NULL ) { - (*op->o_bd->be_search)( op, &rs ); - } else { - rs.sr_err = LDAP_UNWILLING_TO_PERFORM; - } + slapi_int_func_internal_pb( pb, op_search ); cleanup: - slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err ); - slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK, NULL ); - slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK, NULL ); - slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, NULL ); - slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA, NULL ); - - if ( freeFilter && filter != NULL ) - slapi_filter_free( filter, 1 ); - if ( fstr.bv_val ) - slapi_ch_free( (void **)&fstr.bv_val ); - if ( an != NULL ) - slapi_ch_free( (void **)&an ); + if ( free_filter ) { + slapi_filter_free( pb->pop->ors_filter, 1 ); + pb->pop->ors_filter = NULL; + } - slapi_int_connection_destroy( &c ); + slapi_pblock_delete_param( pb, SLAPI_X_INTOP_RESULT_CALLBACK ); + slapi_pblock_delete_param( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK ); + slapi_pblock_delete_param( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK ); + slapi_pblock_delete_param( pb, SLAPI_X_INTOP_CALLBACK_DATA ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } /* Wrappers for old API */ -void slapi_search_internal_set_pb( Slapi_PBlock *pb, +void +slapi_search_internal_set_pb( Slapi_PBlock *pb, const char *base, int scope, const char *filter, @@ -1379,18 +672,22 @@ void slapi_search_internal_set_pb( Slapi_PBlock *pb, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_SEARCH_TARGET, (void *)base ); - slapi_pblock_set( pb, SLAPI_SEARCH_SCOPE, (void *)scope ); - slapi_pblock_set( pb, SLAPI_SEARCH_FILTER, NULL ); + slapi_int_connection_init_pb( pb, LDAP_REQ_SEARCH ); + slapi_pblock_set( pb, SLAPI_SEARCH_TARGET, (void *)base ); + slapi_pblock_set( pb, SLAPI_SEARCH_SCOPE, (void *)scope ); + slapi_pblock_set( pb, SLAPI_SEARCH_FILTER, NULL ); slapi_pblock_set( pb, SLAPI_SEARCH_STRFILTER, (void *)filter ); - slapi_pblock_set( pb, SLAPI_SEARCH_ATTRS, (void *)attrs ); + slapi_pblock_set( pb, SLAPI_SEARCH_ATTRS, (void *)attrs ); slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)attrsonly ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); - slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); - slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); -#endif /* LDAP_SLAPI */ + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); + slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_pblock_set( pb, SLAPI_SEARCH_DEREF, (void *)0 ); + slapi_pblock_set( pb, SLAPI_SEARCH_SIZELIMIT, (void *)SLAP_NO_LIMIT ); + slapi_pblock_set( pb, SLAPI_SEARCH_TIMELIMIT, (void *)SLAP_NO_LIMIT ); + + slapi_int_set_operation_dn( pb ); } Slapi_PBlock * @@ -1402,26 +699,21 @@ slapi_search_internal( char **attrs, int attrsonly ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; pb = slapi_pblock_new(); - if ( pb == NULL ) { - return NULL; - } - slapi_search_internal_set_pb( pb, ldn, scope, filStr, attrs, attrsonly, + slapi_search_internal_set_pb( pb, ldn, scope, filStr, + attrs, attrsonly, controls, NULL, NULL, 0 ); slapi_search_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } -void slapi_modify_internal_set_pb( Slapi_PBlock *pb, +void +slapi_modify_internal_set_pb( Slapi_PBlock *pb, const char *dn, LDAPMod **mods, LDAPControl **controls, @@ -1429,14 +721,14 @@ void slapi_modify_internal_set_pb( Slapi_PBlock *pb, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn ); - slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)mods ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_int_connection_init_pb( pb, LDAP_REQ_MODIFY ); + slapi_pblock_set( pb, SLAPI_MODIFY_TARGET, (void *)dn ); + slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)mods ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); -#endif /* LDAP_SLAPI */ + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_int_set_operation_dn( pb ); } /* Function : slapi_modify_internal @@ -1456,13 +748,9 @@ slapi_modify_internal( LDAPControl **controls, int log_change ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; pb = slapi_pblock_new(); - if ( pb == NULL ) { - return NULL; - } slapi_modify_internal_set_pb( pb, ldn, mods, controls, NULL, NULL, log_change ? SLAPI_OP_FLAG_LOG_CHANGE : 0 ); @@ -1470,43 +758,37 @@ slapi_modify_internal( slapi_modify_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } -int slapi_add_internal_set_pb( Slapi_PBlock *pb, +int +slapi_add_internal_set_pb( Slapi_PBlock *pb, const char *dn, LDAPMod **attrs, LDAPControl **controls, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn ); - slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)attrs ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_int_connection_init_pb( pb, LDAP_REQ_ADD ); + slapi_pblock_set( pb, SLAPI_ADD_TARGET, (void *)dn ); + slapi_pblock_set( pb, SLAPI_MODIFY_MODS, (void *)attrs ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_int_set_operation_dn( pb ); return 0; -#else - return -1; -#endif /* LDAP_SLAPI */ } -Slapi_PBlock *slapi_add_internal( +Slapi_PBlock * +slapi_add_internal( char * dn, LDAPMod **attrs, LDAPControl **controls, int log_changes ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; pb = slapi_pblock_new(); - if ( pb == NULL ) - return NULL; slapi_add_internal_set_pb( pb, dn, attrs, controls, NULL, log_changes ? SLAPI_OP_FLAG_LOG_CHANGE : 0 ); @@ -1514,23 +796,21 @@ Slapi_PBlock *slapi_add_internal( slapi_add_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } -void slapi_add_entry_internal_set_pb( Slapi_PBlock *pb, +void +slapi_add_entry_internal_set_pb( Slapi_PBlock *pb, Slapi_Entry *e, LDAPControl **controls, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_int_connection_init_pb( pb, LDAP_REQ_ADD ); + slapi_pblock_set( pb, SLAPI_ADD_ENTRY, (void *)e ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); -#endif /* LDAP_SLAPI */ + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_int_set_operation_dn( pb ); } Slapi_PBlock * @@ -1539,12 +819,9 @@ slapi_add_entry_internal( LDAPControl **controls, int log_changes ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; pb = slapi_pblock_new(); - if ( pb == NULL ) - return NULL; slapi_add_entry_internal_set_pb( pb, e, controls, NULL, log_changes ? SLAPI_OP_FLAG_LOG_CHANGE : 0 ); @@ -1552,12 +829,10 @@ slapi_add_entry_internal( slapi_add_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } -void slapi_rename_internal_set_pb( Slapi_PBlock *pb, +void +slapi_rename_internal_set_pb( Slapi_PBlock *pb, const char *olddn, const char *newrdn, const char *newsuperior, @@ -1567,16 +842,16 @@ void slapi_rename_internal_set_pb( Slapi_PBlock *pb, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_MODRDN_TARGET, (void *)olddn ); - slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn ); + slapi_int_connection_init_pb( pb, LDAP_REQ_MODRDN ); + slapi_pblock_set( pb, SLAPI_MODRDN_TARGET, (void *)olddn ); + slapi_pblock_set( pb, SLAPI_MODRDN_NEWRDN, (void *)newrdn ); slapi_pblock_set( pb, SLAPI_MODRDN_NEWSUPERIOR, (void *)newsuperior ); - slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); - slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); - slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); -#endif /* LDAP_SLAPI */ + slapi_pblock_set( pb, SLAPI_MODRDN_DELOLDRDN, (void *)deloldrdn ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); + slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_int_set_operation_dn( pb ); } /* Function : slapi_modrdn_internal @@ -1599,13 +874,9 @@ slapi_modrdn_internal( LDAPControl **controls, int log_change ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; - pb = slapi_pblock_new(); - if ( pb == NULL ) { - return NULL; - } + pb = slapi_pblock_new (); slapi_rename_internal_set_pb( pb, olddn, lnewrdn, NULL, deloldrdn, controls, NULL, NULL, @@ -1614,25 +885,23 @@ slapi_modrdn_internal( slapi_modrdn_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } -void slapi_delete_internal_set_pb( Slapi_PBlock *pb, +void +slapi_delete_internal_set_pb( Slapi_PBlock *pb, const char *dn, LDAPControl **controls, const char *uniqueid, Slapi_ComponentId *plugin_identity, int operation_flags ) { -#ifdef LDAP_SLAPI - slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)dn ); - slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); + slapi_int_connection_init_pb( pb, LDAP_REQ_DELETE ); + slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)dn ); + slapi_pblock_set( pb, SLAPI_REQCONTROLS, (void *)controls ); slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, (void *)uniqueid ); slapi_pblock_set( pb, SLAPI_PLUGIN_IDENTITY, (void *)plugin_identity ); - slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); -#endif /* LDAP_SLAPI */ + slapi_pblock_set( pb, SLAPI_X_INTOP_FLAGS, (void *)operation_flags ); + slapi_int_set_operation_dn( pb ); } /* Function : slapi_delete_internal @@ -1651,12 +920,9 @@ slapi_delete_internal( LDAPControl **controls, int log_change ) { -#ifdef LDAP_SLAPI Slapi_PBlock *pb; pb = slapi_pblock_new(); - if ( pb == NULL ) - return NULL; slapi_delete_internal_set_pb( pb, ldn, controls, NULL, NULL, log_change ? SLAPI_OP_FLAG_LOG_CHANGE : 0 ); @@ -1664,8 +930,7 @@ slapi_delete_internal( slapi_delete_internal_pb( pb ); return pb; -#else - return NULL; -#endif /* LDAP_SLAPI */ } +#endif /* LDAP_SLAPI */ +