X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fadd.c;h=4557d083da3d6012c9e43c3f55a37387d3879e40;hb=4ef7e08afed20ed42f46c0c6ef317cf7ffc54466;hp=b951f406cec5ea40c2b26473078ee4474449d7cc;hpb=2bb75d54691e8c07b2974db6acda010a6b641fb6;p=openldap diff --git a/servers/slapd/add.c b/servers/slapd/add.c index b951f406ce..4557d083da 100644 --- a/servers/slapd/add.c +++ b/servers/slapd/add.c @@ -1,7 +1,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * 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 @@ -34,11 +34,11 @@ #include "slap.h" #ifdef LDAP_SLAPI -#include "slapi.h" -static void initAddPlugin( Operation *op, - struct berval *dn, Entry *e, int manageDSAit ); -static int doPreAddPluginFNs( Operation *op ); -static void doPostAddPluginFNs( Operation *op ); +#include "slapi/slapi.h" + +static void init_add_pblock( Operation *op, struct berval *dn, Entry *e, int manageDSAit ); +static int call_add_preop_plugins( Operation *op ); +static void call_add_postop_plugins( Operation *op ); #endif /* LDAP_SLAPI */ int @@ -239,7 +239,7 @@ do_add( Operation *op, SlapReply *rs ) } #ifdef LDAP_SLAPI - if ( op->o_pb ) initAddPlugin( op, &dn, e, manageDSAit ); + if ( op->o_pb ) init_add_pblock( op, &dn, e, manageDSAit ); #endif /* LDAP_SLAPI */ /* @@ -261,6 +261,7 @@ do_add( Operation *op, SlapReply *rs ) int update = op->o_bd->be_update_ndn.bv_len; 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, update, &rs->sr_text, textbuf, textlen, NULL ); @@ -299,7 +300,7 @@ do_add( Operation *op, SlapReply *rs ) * will actually contain something. */ if ( op->o_pb ) { - rs->sr_err = doPreAddPluginFNs( op ); + rs->sr_err = call_add_preop_plugins( op ); if ( rs->sr_err != LDAP_SUCCESS ) { /* plugin will have sent result */ goto done; @@ -308,13 +309,14 @@ do_add( Operation *op, SlapReply *rs ) #endif /* LDAP_SLAPI */ op->ora_e = e; - if ( (op->o_bd->be_add)( op, rs ) == 0 ) { #ifdef SLAPD_MULTIMASTER - if ( !repl_user ) + if ( !repl_user ) #endif - { - replog( op ); - } + { + cb.sc_next = op->o_callback; + op->o_callback = &cb; + } + if ( (op->o_bd->be_add)( op, rs ) == 0 ) { be_entry_release_w( op, e ); e = NULL; } @@ -328,7 +330,7 @@ do_add( Operation *op, SlapReply *rs ) * on replicas (for now, it involves the minimum code intrusion). */ if ( op->o_pb ) { - rs->sr_err = doPreAddPluginFNs( op ); + rs->sr_err = call_add_preop_plugins( op ); if ( rs->sr_err != LDAP_SUCCESS ) { /* plugin will have sent result */ goto done; @@ -367,7 +369,7 @@ do_add( Operation *op, SlapReply *rs ) } else { #ifdef LDAP_SLAPI if ( op->o_pb ) { - rs->sr_err = doPreAddPluginFNs( op ); + rs->sr_err = call_add_preop_plugins( op ); if ( rs->sr_err != LDAP_SUCCESS ) { /* plugin will have sent result */ goto done; @@ -385,7 +387,7 @@ do_add( Operation *op, SlapReply *rs ) } #ifdef LDAP_SLAPI - if ( op->o_pb ) doPostAddPluginFNs( op ); + if ( op->o_pb ) call_add_postop_plugins( op ); #endif /* LDAP_SLAPI */ done: @@ -590,7 +592,6 @@ slap_entry2mods( Modifications **mods, const char **text, char *textbuf, size_t textlen ) -) { Modifications *modhead = NULL; Modifications *mod; @@ -599,20 +600,15 @@ slap_entry2mods( AttributeDescription *a_new_desc; int i, count; - *text = textbuf; - a_new = e->e_attrs; while ( a_new != NULL ) { a_new_desc = a_new->a_desc; mod = (Modifications *) malloc( sizeof( Modifications )); - if ( a_new_desc != slap_schema.si_ad_queryid ) - mod->sml_op = LDAP_MOD_REPLACE; - else - mod->sml_op = LDAP_MOD_ADD; + mod->sml_op = LDAP_MOD_REPLACE; - ber_dupbv( &mod->sml_type, &a_new_desc->ad_cname ); + mod->sml_type = a_new_desc->ad_cname; for ( count = 0; a_new->a_vals[count].bv_val; count++ ); @@ -658,36 +654,40 @@ slap_entry2mods( } #ifdef LDAP_SLAPI -static void initAddPlugin( Operation *op, +static void init_add_pblock( Operation *op, struct berval *dn, Entry *e, int manageDSAit ) { - slapi_x_pblock_set_operation( op->o_pb, op ); + slapi_int_pblock_set_operation( op->o_pb, op ); slapi_pblock_set( op->o_pb, SLAPI_ADD_TARGET, (void *)dn->bv_val ); slapi_pblock_set( op->o_pb, SLAPI_ADD_ENTRY, (void *)e ); slapi_pblock_set( op->o_pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit ); } -static int doPreAddPluginFNs( Operation *op ) +static int call_add_preop_plugins( Operation *op ) { int rc; - rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb ); + rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_ADD_FN, op->o_pb ); if ( rc < 0 ) { /* * A preoperation plugin failure will abort the * entire operation. */ #ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "do_add: add preoperation plugin failed\n", - 0, 0, 0); + LDAP_LOG( OPERATION, INFO, + "do_add: add preoperation plugin failed\n", + 0, 0, 0); #else - Debug(LDAP_DEBUG_TRACE, "do_add: add preoperation plugin failed.\n", - 0, 0, 0); - if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) || - rc == LDAP_SUCCESS ) { + Debug(LDAP_DEBUG_TRACE, + "do_add: add preoperation plugin failed.\n", + 0, 0, 0); +#endif + + if (( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, + (void *)&rc ) != 0 ) || rc == LDAP_SUCCESS ) + { rc = LDAP_OTHER; } -#endif } else { rc = LDAP_SUCCESS; } @@ -695,18 +695,20 @@ static int doPreAddPluginFNs( Operation *op ) return rc; } -static void doPostAddPluginFNs( Operation *op ) +static void call_add_postop_plugins( Operation *op ) { int rc; - rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb ); + rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_POST_ADD_FN, op->o_pb ); if ( rc < 0 ) { #ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "do_add: add postoperation plugin failed\n", - 0, 0, 0); + LDAP_LOG( OPERATION, INFO, + "do_add: add postoperation plugin failed\n", + 0, 0, 0); #else - Debug(LDAP_DEBUG_TRACE, "do_add: add postoperation plugin failed.\n", - 0, 0, 0); + Debug(LDAP_DEBUG_TRACE, + "do_add: add postoperation plugin failed\n", + 0, 0, 0); #endif } }