X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=97c5cf385723a7b4225ce032140c2531bea0ec10;hb=52165180f7713b5fdebef933a9dca8842daa2e2a;hp=07b8d2d904e85903dcf497ac7bcc51e908ee5efb;hpb=42d8c0a39dde2f6d21691434eaadea9803ee54c4;p=openldap diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 07b8d2d904..97c5cf3857 100644 --- a/servers/slapd/result.c +++ b/servers/slapd/result.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2003 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -38,14 +38,34 @@ #include "slap.h" #ifdef LDAP_SLAPI -#include "slapi.h" +#include "slapi/slapi.h" #endif +const struct berval slap_dummy_bv = BER_BVNULL; + int slap_null_cb( Operation *op, SlapReply *rs ) { return 0; } +int slap_freeself_cb( Operation *op, SlapReply *rs ) +{ + assert( op->o_callback ); + + op->o_tmpfree( op->o_callback, op->o_tmpmemctx ); + op->o_callback = NULL; + + return SLAP_CB_CONTINUE; +} + +int slap_replog_cb( Operation *op, SlapReply *rs ) +{ + if ( rs->sr_err == LDAP_SUCCESS ) { + replog( op ); + } + return SLAP_CB_CONTINUE; +} + static char *v2ref( BerVarray ref, const char *text ) { size_t len = 0, i = 0; @@ -68,11 +88,7 @@ static char *v2ref( BerVarray ref, const char *text ) v2 = SLAP_MALLOC( len+i+sizeof("Referral:") ); if( v2 == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 ); -#endif return NULL; } @@ -88,11 +104,7 @@ static char *v2ref( BerVarray ref, const char *text ) for( i=0; ref[i].bv_val != NULL; i++ ) { v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 ); if( v2 == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "v2ref: SLAP_MALLOC failed", 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 ); -#endif return NULL; } v2[len-1] = '\n'; @@ -177,14 +189,8 @@ static long send_ldap_ber( * it's a hard error and return. */ -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_ldap_ber: conn %lu ber_flush failed err=%d (%s)\n", - conn ? conn->c_connid : 0, err, sock_errstr(err) ); -#else Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n", err, sock_errstr(err), 0 ); -#endif if ( err != EWOULDBLOCK && err != EAGAIN ) { connection_closing( conn ); @@ -211,52 +217,143 @@ static long send_ldap_ber( } static int -send_ldap_controls( BerElement *ber, LDAPControl **c ) +send_ldap_control( BerElement *ber, LDAPControl *c ) +{ + int rc; + + assert( c != NULL ); + + rc = ber_printf( ber, "{s" /*}*/, c->ldctl_oid ); + + if( c->ldctl_iscritical ) { + rc = ber_printf( ber, "b", + (ber_int_t) c->ldctl_iscritical ) ; + if( rc == -1 ) return rc; + } + + if( c->ldctl_value.bv_val != NULL ) { + rc = ber_printf( ber, "O", &c->ldctl_value ); + if( rc == -1 ) return rc; + } + + rc = ber_printf( ber, /*{*/"N}" ); + if( rc == -1 ) return rc; + + return 0; +} + +static int +send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c ) { int rc; +#ifdef LDAP_SLAPI + LDAPControl **sctrls = NULL; + + /* + * Retrieve any additional controls that may be set by the + * plugin. + */ + + if ( o->o_pb && + slapi_pblock_get( o->o_pb, SLAPI_RESCONTROLS, &sctrls ) != 0 ) + { + sctrls = NULL; + } + + if ( c == NULL && sctrls == NULL ) return 0; +#else if( c == NULL ) return 0; +#endif /* LDAP_SLAPI */ rc = ber_printf( ber, "t{"/*}*/, LDAP_TAG_CONTROLS ); if( rc == -1 ) return rc; - for( ; *c != NULL; c++) { - rc = ber_printf( ber, "{s" /*}*/, (*c)->ldctl_oid ); - - if( (*c)->ldctl_iscritical ) { - rc = ber_printf( ber, "b", - (ber_int_t) (*c)->ldctl_iscritical ) ; +#ifdef LDAP_SLAPI + if ( c != NULL ) +#endif /* LDAP_SLAPI */ + { + for( ; *c != NULL; c++) { + rc = send_ldap_control( ber, *c ); if( rc == -1 ) return rc; } + } - if( (*c)->ldctl_value.bv_val != NULL ) { - rc = ber_printf( ber, "O", &((*c)->ldctl_value)); - if( rc == -1 ) return rc; +#ifdef LDAP_DEVEL + /* this is a hack to avoid having to modify op->s_ctrls */ + if( o->o_sortedresults ) { + BerElementBuffer berbuf; + BerElement *sber = (BerElement *) &berbuf; + LDAPControl sorted; + BER_BVZERO( &sorted.ldctl_value ); + sorted.ldctl_oid = LDAP_CONTROL_SORTRESPONSE; + sorted.ldctl_iscritical = 0; + + ber_init2( sber, NULL, LBER_USE_DER ); + + ber_printf( sber, "{i}", LDAP_UNWILLING_TO_PERFORM ); + + if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) { + return LBER_ERROR; } - rc = ber_printf( ber, /*{*/"N}" ); + (void) ber_free_buf( ber ); + + rc = send_ldap_control( ber, &sorted ); if( rc == -1 ) return rc; } +#endif + +#ifdef LDAP_SLAPI + if ( sctrls != NULL ) { + for ( c = sctrls; *c != NULL; c++ ) { + rc = send_ldap_control( ber, *c ); + if( rc == -1 ) return rc; + } + } +#endif /* LDAP_SLAPI */ rc = ber_printf( ber, /*{*/"N}" ); return rc; } -void +static int send_ldap_response( Operation *op, SlapReply *rs ) { BerElementBuffer berbuf; BerElement *ber = (BerElement *) &berbuf; - int rc; + int rc = LDAP_SUCCESS; long bytes; - if (op->o_callback && op->o_callback->sc_response) { - rc = op->o_callback->sc_response( op, rs ); - if ( rc != SLAP_CB_CONTINUE ) return; + if ( rs->sr_err == SLAPD_ABANDON ) { + rc = SLAPD_ABANDON; + goto clean2; } - + + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, + *sc_next = op->o_callback; + + rc = SLAP_CB_CONTINUE; + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_response ) { + rc = op->o_callback->sc_response( op, rs ); + if ( first && op->o_callback == NULL ) { + sc = NULL; + } + if ( rc != SLAP_CB_CONTINUE ) break; + } + first = 0; + } + + op->o_callback = sc; + if ( rc != SLAP_CB_CONTINUE ) goto clean2; + } + #ifdef LDAP_CONNECTIONLESS if (op->o_conn && op->o_conn->c_is_udp) ber = op->o_res_ber; @@ -267,34 +364,21 @@ send_ldap_response( ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx ); } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_response: msgid=%d tag=%lu err=%d\n", - rs->sr_msgid, rs->sr_tag, rs->sr_err ); -#else Debug( LDAP_DEBUG_TRACE, "send_ldap_response: msgid=%d tag=%lu err=%d\n", rs->sr_msgid, rs->sr_tag, rs->sr_err ); -#endif if( rs->sr_ref ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, - "send_ldap_response: conn %lu ref=\"%s\"\n", - op->o_connid, - rs->sr_ref[0].bv_val ? rs->sr_ref[0].bv_val : "NULL" , 0 ); -#else Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=\"%s\"\n", rs->sr_ref[0].bv_val ? rs->sr_ref[0].bv_val : "NULL", NULL, NULL ); -#endif } #ifdef LDAP_CONNECTIONLESS if (op->o_conn && op->o_conn->c_is_udp && op->o_protocol == LDAP_VERSION2 ) { - rc = ber_printf( ber, "t{ess" /*"}}"*/, + rc = ber_printf( ber, "t{ess" /*"}"*/, rs->sr_tag, rs->sr_err, rs->sr_matched == NULL ? "" : rs->sr_matched, rs->sr_text == NULL ? "" : rs->sr_text ); @@ -331,11 +415,15 @@ send_ldap_response( { if ( rs->sr_rspoid != NULL ) { rc = ber_printf( ber, "ts", - LDAP_TAG_EXOP_RES_OID, rs->sr_rspoid ); + rs->sr_type == REP_EXTENDED + ? LDAP_TAG_EXOP_RES_OID : LDAP_TAG_IM_RES_OID, + rs->sr_rspoid ); } if( rc != -1 && rs->sr_rspdata != NULL ) { rc = ber_printf( ber, "tO", - LDAP_TAG_EXOP_RES_VALUE, rs->sr_rspdata ); + rs->sr_type == REP_EXTENDED + ? LDAP_TAG_EXOP_RES_VALUE : LDAP_TAG_IM_RES_VALUE, + rs->sr_rspdata ); } } @@ -343,8 +431,8 @@ send_ldap_response( rc = ber_printf( ber, /*"{"*/ "N}" ); } - if( rc != -1 && rs->sr_ctrls != NULL ) { - rc = send_ldap_controls( ber, rs->sr_ctrls ); + if( rc != -1 ) { + rc = send_ldap_controls( op, ber, rs->sr_ctrls ); } if( rc != -1 ) { @@ -352,25 +440,23 @@ send_ldap_response( } #ifdef LDAP_CONNECTIONLESS - if( op->o_conn && op->o_conn->c_is_udp && op->o_protocol == LDAP_VERSION2 && rc != -1 ) { + if( op->o_conn && op->o_conn->c_is_udp && op->o_protocol == LDAP_VERSION2 + && rc != -1 ) + { rc = ber_printf( ber, /*"{"*/ "N}" ); } #endif if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_ldap_response: conn %lu ber_printf failed\n", - op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif #ifdef LDAP_CONNECTIONLESS if (!op->o_conn || op->o_conn->c_is_udp == 0) #endif - ber_free_buf( ber ); - return; + { + ber_free_buf( ber ); + } + goto cleanup; } /* send BER */ @@ -378,35 +464,68 @@ send_ldap_response( #ifdef LDAP_CONNECTIONLESS if (!op->o_conn || op->o_conn->c_is_udp == 0) #endif - ber_free_buf( ber ); + { + ber_free_buf( ber ); + } if ( bytes < 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_ldap_response: conn %lu ber write failed\n", - op->o_connid ? op->o_connid : 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_ldap_response: ber write failed\n", 0, 0, 0 ); -#endif - return; + goto cleanup; } #ifdef LDAP_SLAPI if ( op->o_pb ) { slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, (void *)rs->sr_err ); - slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, (void *)rs->sr_matched ); + slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, + (void *)rs->sr_matched ); slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, (void *)rs->sr_text ); } #endif /* LDAP_SLAPI */ - ldap_pvt_thread_mutex_lock( &num_sent_mutex ); - num_bytes_sent += bytes; - num_pdu_sent++; - ldap_pvt_thread_mutex_unlock( &num_sent_mutex ); - return; + ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); + ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); + +cleanup:; + /* Tell caller that we did this for real, as opposed to being + * overridden by a callback + */ + rc = SLAP_CB_CONTINUE; + +clean2:; + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, *sc_next; + + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_cleanup ) { + (void)op->o_callback->sc_cleanup( op, rs ); + if ( first && op->o_callback != sc ) { + sc = op->o_callback; + } + } + first = 0; + } + op->o_callback = sc; + } + + + if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) { + free( (char *)rs->sr_matched ); + rs->sr_matched = NULL; + } + + if ( rs->sr_ref && rs->sr_flags & REP_REF_MUSTBEFREED ) { + ber_bvarray_free( rs->sr_ref ); + rs->sr_ref = NULL; + } + + return rc; } @@ -422,16 +541,9 @@ send_ldap_disconnect( Operation *op, SlapReply *rs ) rs->sr_type = REP_EXTENDED; -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_disconnect: conn %lu %d:%s\n", - op->o_connid, rs->sr_err, rs->sr_text ? rs->sr_text : "" ); -#else Debug( LDAP_DEBUG_TRACE, "send_ldap_disconnect %d:%s\n", rs->sr_err, rs->sr_text ? rs->sr_text : "", NULL ); -#endif - if ( op->o_protocol < LDAP_VERSION3 ) { rs->sr_rspoid = NULL; @@ -444,11 +556,12 @@ send_ldap_disconnect( Operation *op, SlapReply *rs ) rs->sr_msgid = 0; } - send_ldap_response( op, rs ); - - Statslog( LDAP_DEBUG_STATS, - "conn=%lu op=%lu DISCONNECT tag=%lu err=%d text=%s\n", - op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err, rs->sr_text ? rs->sr_text : "" ); + if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { + Statslog( LDAP_DEBUG_STATS, + "%s DISCONNECT tag=%lu err=%d text=%s\n", + op->o_log_prefix, rs->sr_tag, rs->sr_err, + rs->sr_text ? rs->sr_text : "", 0 ); + } } void @@ -460,42 +573,27 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) rs->sr_type = REP_RESULT; - assert( !LDAP_API_ERROR( rs->sr_err ) && ( rs->sr_err >= 0 )); + /* Propagate Abandons so that cleanup callbacks can be processed */ + if ( rs->sr_err == SLAPD_ABANDON ) + goto abandon; + + assert( !LDAP_API_ERROR( rs->sr_err ) ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_result: conn %lu op=%lu p=%d\n", - op->o_connid, op->o_opid, op->o_protocol ); -#else Debug( LDAP_DEBUG_TRACE, - "send_ldap_result: conn=%lu op=%lu p=%d\n", - op->o_connid, op->o_opid, op->o_protocol ); -#endif + "send_ldap_result: %s p=%d\n", + op->o_log_prefix, op->o_protocol, 0 ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, - "send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n", - rs->sr_err, rs->sr_matched ? rs->sr_matched : "", - rs->sr_text ? rs->sr_text : "" ); -#else Debug( LDAP_DEBUG_ARGS, "send_ldap_result: err=%d matched=\"%s\" text=\"%s\"\n", rs->sr_err, rs->sr_matched ? rs->sr_matched : "", rs->sr_text ? rs->sr_text : "" ); -#endif if( rs->sr_ref ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ARGS, - "send_ldap_result: referral=\"%s\"\n", - rs->sr_ref[0].bv_val ? rs->sr_ref[0].bv_val : "NULL", 0, 0 ); -#else Debug( LDAP_DEBUG_ARGS, "send_ldap_result: referral=\"%s\"\n", rs->sr_ref[0].bv_val ? rs->sr_ref[0].bv_val : "NULL", NULL, NULL ); -#endif } assert( rs->sr_err != LDAP_PARTIAL_RESULTS ); @@ -519,13 +617,17 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) * should just set SLAPI_RESULT_CODE rather than sending a * result if they wish to change the result. */ - if ( op->o_pb ) { - slapi_x_pblock_set_operation( op->o_pb, op ); - slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, (void *)rs->sr_err ); - slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, (void *)rs->sr_text ); - slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, (void *)rs->sr_matched ); - - (void) doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_RESULT_FN, op->o_pb ); + if ( op->o_callback == NULL && op->o_pb != NULL ) { + slapi_int_pblock_set_operation( op->o_pb, op ); + slapi_pblock_set( op->o_pb, SLAPI_RESULT_CODE, + (void *)rs->sr_err ); + slapi_pblock_set( op->o_pb, SLAPI_RESULT_TEXT, + (void *)rs->sr_text ); + slapi_pblock_set( op->o_pb, SLAPI_RESULT_MATCHED, + (void *)rs->sr_matched ); + + (void) slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_RESULT_FN, + op->o_pb ); } #endif /* LDAP_SLAPI */ @@ -538,22 +640,23 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) rs->sr_tag = req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; - send_ldap_response( op, rs ); - - if ( op->o_tag == LDAP_REQ_SEARCH ) { - char nbuf[64]; - snprintf( nbuf, sizeof nbuf, "%d nentries=%d", - rs->sr_err, rs->sr_nentries ); - - Statslog( LDAP_DEBUG_STATS, - "conn=%lu op=%lu SEARCH RESULT tag=%lu err=%s text=%s\n", - op->o_connid, op->o_opid, rs->sr_tag, nbuf, - rs->sr_text ? rs->sr_text : "" ); - } else { - Statslog( LDAP_DEBUG_STATS, - "conn=%lu op=%lu RESULT tag=%lu err=%d text=%s\n", - op->o_connid, op->o_opid, rs->sr_tag, rs->sr_err, - rs->sr_text ? rs->sr_text : "" ); +abandon: + if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { + if ( op->o_tag == LDAP_REQ_SEARCH ) { + char nbuf[64]; + snprintf( nbuf, sizeof nbuf, "%d nentries=%d", + rs->sr_err, rs->sr_nentries ); + + Statslog( LDAP_DEBUG_STATS, + "%s SEARCH RESULT tag=%lu err=%s text=%s\n", + op->o_log_prefix, rs->sr_tag, nbuf, + rs->sr_text ? rs->sr_text : "", 0 ); + } else { + Statslog( LDAP_DEBUG_STATS, + "%s RESULT tag=%lu err=%d text=%s\n", + op->o_log_prefix, rs->sr_tag, rs->sr_err, + rs->sr_text ? rs->sr_text : "", 0 ); + } } if( tmp != NULL ) ch_free(tmp); @@ -565,16 +668,9 @@ void send_ldap_sasl( Operation *op, SlapReply *rs ) { rs->sr_type = REP_SASL; -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_sasl: conn %lu err=%d len=%lu\n", - op->o_connid, rs->sr_err, - rs->sr_sasldata ? rs->sr_sasldata->bv_len : -1 ); -#else Debug( LDAP_DEBUG_TRACE, "send_ldap_sasl: err=%d len=%ld\n", rs->sr_err, rs->sr_sasldata ? (long) rs->sr_sasldata->bv_len : -1, NULL ); -#endif rs->sr_tag = req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; @@ -587,18 +683,11 @@ slap_send_ldap_extended( Operation *op, SlapReply *rs ) { rs->sr_type = REP_EXTENDED; -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_extended: err=%d oid=%s len=%ld\n", - rs->sr_err, rs->sr_rspoid ? rs->sr_rspoid : "", - rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 ); -#else Debug( LDAP_DEBUG_TRACE, "send_ldap_extended: err=%d oid=%s len=%ld\n", rs->sr_err, rs->sr_rspoid ? rs->sr_rspoid : "", rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 ); -#endif rs->sr_tag = req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; @@ -610,18 +699,11 @@ void slap_send_ldap_intermediate( Operation *op, SlapReply *rs ) { rs->sr_type = REP_INTERMEDIATE; -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_ldap_intermediate: err=%d oid=%s len=%ld\n", - rs->sr_err, rs->sr_rspoid ? rs->sr_rspoid : "", - rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 ); -#else Debug( LDAP_DEBUG_TRACE, "send_ldap_intermediate: err=%d oid=%s len=%ld\n", rs->sr_err, rs->sr_rspoid ? rs->sr_rspoid : "", rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 ); -#endif rs->sr_tag = LDAP_RES_INTERMEDIATE; rs->sr_msgid = op->o_msgid; send_ldap_response( op, rs ); @@ -632,19 +714,16 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) { BerElementBuffer berbuf; BerElement *ber = (BerElement *) &berbuf; - Attribute *a, *aa; + Attribute *a; int i, j, rc=-1, bytes; char *edn; int userattrs; - int opattrs; AccessControlState acl_state = ACL_STATE_INIT; #ifdef LDAP_SLAPI /* Support for computed attribute plugins */ computed_attr_context ctx; AttributeName *anp; #endif - void *mark = NULL; - AttributeDescription *ad_entry = slap_schema.si_ad_entry; /* a_flags: array of flags telling if the i-th element will be @@ -652,38 +731,58 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) * e_flags: array of a_flags */ char **e_flags = NULL; - + rs->sr_type = REP_SEARCH; - if (op->o_callback && op->o_callback->sc_response) { - rc = op->o_callback->sc_response( op, rs ); - if ( rc != SLAP_CB_CONTINUE ) return rc; + + /* eventually will loop through generated operational attribute types + * currently implemented types include: + * entryDN, subschemaSubentry, and hasSubordinates */ + /* NOTE: moved before overlays callback circling because + * they may modify entry and other stuff in rs */ + /* check for special all operational attributes ("+") type */ + /* FIXME: maybe we could se this flag at the operation level; + * however, in principle the caller of send_search_entry() may + * change the attribute list at each call */ + rs->sr_attr_flags = slap_attr_flags( rs->sr_attrs ); + + rc = backend_operational( op, rs ); + if ( rc ) { + goto error_return; + } + + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, + *sc_next = op->o_callback; + + rc = SLAP_CB_CONTINUE; + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_response ) { + rc = op->o_callback->sc_response( op, rs ); + if ( first && op->o_callback == NULL ) { + sc = NULL; + } + if ( rc != SLAP_CB_CONTINUE ) break; + } + first = 0; + } + + op->o_callback = sc; + if ( rc != SLAP_CB_CONTINUE ) goto error_return; } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, "send_search_entry: conn %lu dn=\"%s\"%s\n", + Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: conn %lu dn=\"%s\"%s\n", op->o_connid, rs->sr_entry->e_name.bv_val, op->ors_attrsonly ? " (attrsOnly)" : "" ); -#else - Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: dn=\"%s\"%s\n", - rs->sr_entry->e_name.bv_val, - op->ors_attrsonly ? " (attrsOnly)" : "", 0 ); -#endif - - mark = sl_mark( op->o_tmpmemctx ); if ( !access_allowed( op, rs->sr_entry, ad_entry, NULL, ACL_READ, NULL )) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, + Debug( LDAP_DEBUG_ACL, "send_search_entry: conn %lu access to entry (%s) not allowed\n", op->o_connid, rs->sr_entry->e_name.bv_val, 0 ); -#else - Debug( LDAP_DEBUG_ACL, - "send_search_entry: access to entry not allowed\n", - 0, 0, 0 ); -#endif - sl_release( mark, op->o_tmpmemctx ); - return( 1 ); + rc = 1; + goto error_return; } edn = rs->sr_entry->e_nname.bv_val; @@ -692,11 +791,9 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) /* read back control or LDAP_CONNECTIONLESS */ ber = op->o_res_ber; } else { - ber_len_t siz, len; struct berval bv; - entry_flatsize( rs->sr_entry, &siz, &len, 0 ); - bv.bv_len = siz + len; + bv.bv_len = entry_flatsize( rs->sr_entry, 0 ); bv.bv_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx ); ber_init2( ber, &bv, LBER_USE_DER ); @@ -724,13 +821,9 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding DN error" ); @@ -738,12 +831,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } /* check for special all user attributes ("*") type */ - userattrs = ( rs->sr_attrs == NULL ) ? 1 - : an_find( rs->sr_attrs, &AllUser ); - - /* check for special all operational attributes ("+") type */ - opattrs = ( rs->sr_attrs == NULL ) ? 0 - : an_find( rs->sr_attrs, &AllOper ); + userattrs = SLAP_USERATTRS( rs->sr_attr_flags ); /* create an array of arrays of flags. Each flag corresponds * to particular value of attribute and equals 1 if value matches @@ -760,16 +848,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) size = i * sizeof(char *) + k; if ( size > 0 ) { char *a_flags; - e_flags = sl_calloc ( 1, i * sizeof(char *) + k, op->o_tmpmemctx ); + e_flags = slap_sl_calloc ( 1, i * sizeof(char *) + k, op->o_tmpmemctx ); if( e_flags == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_entry: conn %lu sl_calloc failed\n", - op->o_connid ? op->o_connid : 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, - "send_search_entry: sl_calloc failed\n", 0, 0, 0 ); -#endif + "send_search_entry: conn %lu slap_sl_calloc failed\n", + op->o_connid ? op->o_connid : 0, 0, 0 ); ber_free( ber, 1 ); send_ldap_error( op, rs, LDAP_OTHER, "out of memory" ); @@ -785,14 +868,9 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) rc = filter_matched_values(op, rs->sr_entry->e_attrs, &e_flags) ; if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, "send_search_entry: " + Debug( LDAP_DEBUG_ANY, "send_search_entry: " "conn %lu matched values filtering failed\n", op->o_connid ? op->o_connid : 0, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "matched values filtering failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "matched values filtering error" ); @@ -803,6 +881,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) for ( a = rs->sr_entry->e_attrs, j = 0; a != NULL; a = a->a_next, j++ ) { AttributeDescription *desc = a->a_desc; + int finish = 0; if ( rs->sr_attrs == NULL ) { /* all attrs request, skip operational attributes */ @@ -813,62 +892,52 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } else { /* specific attrs requested */ if ( is_at_operational( desc->ad_type ) ) { - if( !opattrs && !ad_inlist( desc, rs->sr_attrs ) ) { + if ( !SLAP_OPATTRS( rs->sr_attr_flags ) && + !ad_inlist( desc, rs->sr_attrs ) ) + { continue; } } else { - if (!userattrs && !ad_inlist( desc, rs->sr_attrs ) ) { + if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) + { continue; } } } - if ( ! access_allowed( op, rs->sr_entry, desc, NULL, - ACL_READ, &acl_state ) ) - { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "send_search_entry: conn %lu access to attribute %s not " - "allowed\n", op->o_connid, desc->ad_cname.bv_val, 0 ); -#else - Debug( LDAP_DEBUG_ACL, "acl: " - "access to attribute %s not allowed\n", - desc->ad_cname.bv_val, 0, 0 ); -#endif - continue; - } + if ( op->ors_attrsonly ) { + if ( ! access_allowed( op, rs->sr_entry, desc, NULL, + ACL_READ, &acl_state ) ) + { + Debug( LDAP_DEBUG_ACL, "send_search_entry: " + "conn %lu access to attribute %s not allowed\n", + op->o_connid, desc->ad_cname.bv_val, 0 ); + continue; + } - if (( rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname )) == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_entry: conn %lu ber_printf failed\n", - op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif + if (( rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname )) == -1 ) { + Debug( LDAP_DEBUG_ANY, + "send_search_entry: conn %lu ber_printf failed\n", + op->o_connid, 0, 0 ); - if ( op->o_res_ber == NULL ) ber_free_buf( ber ); - send_ldap_error( op, rs, LDAP_OTHER, "encoding description error"); - goto error_return; - } + if ( op->o_res_ber == NULL ) ber_free_buf( ber ); + send_ldap_error( op, rs, LDAP_OTHER, + "encoding description error"); + goto error_return; + } + finish = 1; - if ( ! op->ors_attrsonly ) { - for ( i = 0; a->a_vals[i].bv_val != NULL; i++ ) { + } else { + int first = 1; + for ( i = 0; a->a_nvals[i].bv_val != NULL; i++ ) { if ( ! access_allowed( op, rs->sr_entry, - desc, &a->a_vals[i], ACL_READ, &acl_state ) ) + desc, &a->a_nvals[i], ACL_READ, &acl_state ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, + Debug( LDAP_DEBUG_ACL, "send_search_entry: conn %lu " - "access to attribute %s, value %d not allowed\n", + "access to attribute %s, value #%d not allowed\n", op->o_connid, desc->ad_cname.bv_val, i ); -#else - Debug( LDAP_DEBUG_ACL, - "acl: access to attribute %s, " - "value %d not allowed\n", - desc->ad_cname.bv_val, i, 0 ); -#endif continue; } @@ -877,15 +946,24 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) continue; } + if ( first ) { + first = 0; + finish = 1; + if (( rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname )) == -1 ) { + Debug( LDAP_DEBUG_ANY, + "send_search_entry: conn %lu ber_printf failed\n", + op->o_connid, 0, 0 ); + + if ( op->o_res_ber == NULL ) ber_free_buf( ber ); + send_ldap_error( op, rs, LDAP_OTHER, + "encoding description error"); + goto error_return; + } + } if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu " "ber_printf failed.\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, @@ -895,14 +973,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } } - if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + if ( finish && ( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) { + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encode end error" ); @@ -910,15 +984,13 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } } - /* eventually will loop through generated operational attributes */ - /* only have subschemaSubentry and numSubordinates are implemented */ - aa = backend_operational( op, rs, opattrs ); - - if ( aa != NULL && op->o_vrFilter != NULL ) { + /* NOTE: moved before overlays callback circling because + * they may modify entry and other stuff in rs */ + if ( rs->sr_operational_attrs != NULL && op->o_vrFilter != NULL ) { int k = 0; size_t size; - for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) { + for ( a = rs->sr_operational_attrs, i=0; a != NULL; a = a->a_next, i++ ) { for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ) k++; } @@ -930,22 +1002,14 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) * Reuse previous memory - we likely need less space * for operational attributes */ - tmp = sl_realloc( e_flags, i * sizeof(char *) + k, + tmp = slap_sl_realloc( e_flags, i * sizeof(char *) + k, op->o_tmpmemctx ); if ( tmp == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_entry: conn %lu " - "not enough memory " - "for matched values filtering\n", - op->o_connid, 0, 0); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu " "not enough memory " "for matched values filtering\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "not enough memory for matched values filtering" ); @@ -954,23 +1018,18 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) e_flags = tmp; a_flags = (char *)(e_flags + i); memset( a_flags, 0, k ); - for ( a = aa, i=0; a != NULL; a = a->a_next, i++ ) { + for ( a = rs->sr_operational_attrs, i=0; a != NULL; a = a->a_next, i++ ) { for ( j = 0; a->a_vals[j].bv_val != NULL; j++ ); e_flags[i] = a_flags; a_flags += j; } - rc = filter_matched_values(op, aa, &e_flags) ; + rc = filter_matched_values(op, rs->sr_operational_attrs, &e_flags) ; if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu " "matched values filtering failed\n", op->o_connid ? op->o_connid : 0, 0, 0); -#else - Debug( LDAP_DEBUG_ANY, - "matched values filtering failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "matched values filtering error" ); @@ -979,7 +1038,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } } - for (a = aa, j=0; a != NULL; a = a->a_next, j++ ) { + for (a = rs->sr_operational_attrs, j=0; a != NULL; a = a->a_next, j++ ) { AttributeDescription *desc = a->a_desc; if ( rs->sr_attrs == NULL ) { @@ -991,11 +1050,13 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } else { /* specific attrs requested */ if( is_at_operational( desc->ad_type ) ) { - if( !opattrs && !ad_inlist( desc, rs->sr_attrs ) ) { + if ( !SLAP_OPATTRS( rs->sr_attr_flags ) && + !ad_inlist( desc, rs->sr_attrs ) ) + { continue; } } else { - if (!userattrs && !ad_inlist( desc, rs->sr_attrs ) ) { + if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) { continue; } } @@ -1004,32 +1065,23 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) if ( ! access_allowed( op, rs->sr_entry, desc, NULL, ACL_READ, &acl_state ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, + Debug( LDAP_DEBUG_ACL, "send_search_entry: conn %lu " "access to attribute %s not allowed\n", op->o_connid, desc->ad_cname.bv_val, 0 ); -#else - Debug( LDAP_DEBUG_ACL, "send_search_entry: access to attribute %s " - "not allowed\n", desc->ad_cname.bv_val, 0, 0 ); -#endif continue; } rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname ); if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu " "ber_printf failed\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); - send_ldap_error( op, rs, LDAP_OTHER, "encoding description error" ); - attrs_free( aa ); + send_ldap_error( op, rs, LDAP_OTHER, + "encoding description error" ); goto error_return; } @@ -1038,17 +1090,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) if ( ! access_allowed( op, rs->sr_entry, desc, &a->a_vals[i], ACL_READ, &acl_state ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, + Debug( LDAP_DEBUG_ACL, "send_search_entry: conn %lu " "access to %s, value %d not allowed\n", op->o_connid, desc->ad_cname.bv_val, i ); -#else - Debug( LDAP_DEBUG_ACL, - "send_search_entry: access to attribute %s, " - "value %d not allowed\n", - desc->ad_cname.bv_val, i, 0 ); -#endif continue; } @@ -1058,36 +1103,25 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding values error" ); - attrs_free( aa ); goto error_return; } } } if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encode end error" ); - attrs_free( aa ); goto error_return; } } @@ -1102,7 +1136,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) ctx.cac_attrs = rs->sr_attrs; ctx.cac_attrsonly = op->ors_attrsonly; ctx.cac_userattrs = userattrs; - ctx.cac_opattrs = opattrs; + ctx.cac_opattrs = rs->sr_attr_flags; ctx.cac_acl_state = acl_state; ctx.cac_private = (void *)ber; @@ -1112,10 +1146,8 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) if ( rs->sr_attrs != NULL ) { for ( anp = rs->sr_attrs; anp->an_name.bv_val != NULL; anp++ ) { rc = compute_evaluator( &ctx, anp->an_name.bv_val, - rs->sr_entry, slapi_x_compute_output_ber ); - if ( rc == 1 ) { - break; - } + rs->sr_entry, slapi_int_compute_output_ber ); + if ( rc == 1 ) break; } } else { /* @@ -1124,7 +1156,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) * plugin decide whether to be naughty or not. */ rc = compute_evaluator( &ctx, "*", - rs->sr_entry, slapi_x_compute_output_ber ); + rs->sr_entry, slapi_int_compute_output_ber ); } if ( rc == 1 ) { if ( op->o_res_ber == NULL ) ber_free_buf( ber ); @@ -1136,15 +1168,14 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) /* free e_flags */ if ( e_flags ) { - sl_free( e_flags, op->o_tmpmemctx ); + slap_sl_free( e_flags, op->o_tmpmemctx ); e_flags = NULL; } - attrs_free( aa ); rc = ber_printf( ber, /*{{*/ "}N}" ); - if( rc != -1 && rs->sr_ctrls != NULL ) { - rc = send_ldap_controls( ber, rs->sr_ctrls ); + if( rc != -1 ) { + rc = send_ldap_controls( op, ber, rs->sr_ctrls ); } if( rc != -1 ) { @@ -1161,62 +1192,92 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) } if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_entry: conn %lu ber_printf failed\n", - op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "ber_printf failed\n", 0, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encode entry end error" ); - sl_release( mark, op->o_tmpmemctx ); - return( 1 ); + rc = 1; + goto error_return; + } + + if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) { + be_entry_release_rw( op, rs->sr_entry, 0 ); + rs->sr_flags ^= REP_ENTRY_MUSTRELEASE; + rs->sr_entry = NULL; } if ( op->o_res_ber == NULL ) { - bytes = op->o_noop ? 0 : send_ldap_ber( op->o_conn, ber ); + bytes = send_ldap_ber( op->o_conn, ber ); ber_free_buf( ber ); if ( bytes < 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, + Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber write failed.\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_ANY, - "send_search_entry: ber write failed\n", - 0, 0, 0 ); -#endif - sl_release( mark, op->o_tmpmemctx ); - return -1; + rc = -1; + goto error_return; } rs->sr_nentries++; - ldap_pvt_thread_mutex_lock( &num_sent_mutex ); - num_bytes_sent += bytes; - num_entries_sent++; - num_pdu_sent++; - ldap_pvt_thread_mutex_unlock( &num_sent_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); + ldap_pvt_mp_add_ulong( slap_counters.sc_entries, 1 ); + ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); } - Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu ENTRY dn=\"%s\"\n", - op->o_connid, op->o_opid, rs->sr_entry->e_dn, 0, 0 ); + Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n", + op->o_log_prefix, edn, 0, 0, 0 ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 ); -#else - Debug( LDAP_DEBUG_TRACE, "<= send_search_entry\n", 0, 0, 0 ); -#endif + Debug( LDAP_DEBUG_TRACE, + "<= send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 ); rc = 0; error_return:; - sl_release( mark, op->o_tmpmemctx ); - if ( e_flags ) sl_free( e_flags, op->o_tmpmemctx ); + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, *sc_next; + + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_cleanup ) { + (void)op->o_callback->sc_cleanup( op, rs ); + if ( first && op->o_callback != sc ) { + sc = op->o_callback; + } + } + first = 0; + } + op->o_callback = sc; + } + + if ( e_flags ) { + slap_sl_free( e_flags, op->o_tmpmemctx ); + } + + if ( rs->sr_operational_attrs ) { + attrs_free( rs->sr_operational_attrs ); + rs->sr_operational_attrs = NULL; + } + rs->sr_attr_flags = SLAP_ATTRS_UNDEFINED; + + /* FIXME: I think rs->sr_type should be explicitly set to + * REP_SEARCH here. That's what it was when we entered this + * function. send_ldap_error may have changed it, but we + * should set it back so that the cleanup functions know + * what they're doing. + */ + if ( op->o_tag == LDAP_REQ_SEARCH && rs->sr_type == REP_SEARCH + && rs->sr_entry + && ( rs->sr_flags & REP_ENTRY_MUSTBEFREED ) ) + { + entry_free( rs->sr_entry ); + rs->sr_entry = NULL; + rs->sr_flags &= ~REP_ENTRY_MUSTBEFREED; + } + return( rc ); } @@ -1227,43 +1288,43 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) BerElement *ber = (BerElement *) &berbuf; int rc = 0; int bytes; - void *mark; AttributeDescription *ad_ref = slap_schema.si_ad_ref; AttributeDescription *ad_entry = slap_schema.si_ad_entry; rs->sr_type = REP_SEARCHREF; - if (op->o_callback && op->o_callback->sc_response) { - rc = op->o_callback->sc_response( op, rs ); - if ( rc != SLAP_CB_CONTINUE ) return rc; - } + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, + *sc_next = op->o_callback; + + rc = SLAP_CB_CONTINUE; + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_response ) { + rc = op->o_callback->sc_response( op, rs ); + if ( first && op->o_callback == NULL ) { + sc = NULL; + } + if ( rc != SLAP_CB_CONTINUE ) break; + } + first = 0; + } - mark = sl_mark( op->o_tmpmemctx ); + op->o_callback = sc; + if ( rc != SLAP_CB_CONTINUE ) goto rel; + } -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_search_reference: conn %lu dn=\"%s\"\n", - op->o_connid, - rs->sr_entry ? rs->sr_entry->e_name.bv_val : "(null)", 0 ); -#else Debug( LDAP_DEBUG_TRACE, "=> send_search_reference: dn=\"%s\"\n", rs->sr_entry ? rs->sr_entry->e_name.bv_val : "(null)", 0, 0 ); -#endif if ( rs->sr_entry && ! access_allowed( op, rs->sr_entry, ad_entry, NULL, ACL_READ, NULL ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "send_search_reference: conn %lu " - "access to entry %s not allowed\n", - op->o_connid, rs->sr_entry->e_dn, 0 ); -#else Debug( LDAP_DEBUG_ACL, "send_search_reference: access to entry not allowed\n", 0, 0, 0 ); -#endif rc = 1; goto rel; } @@ -1271,57 +1332,39 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) if ( rs->sr_entry && ! access_allowed( op, rs->sr_entry, ad_ref, NULL, ACL_READ, NULL ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "send_search_reference: conn %lu access " - "to reference not allowed.\n", op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ACL, "send_search_reference: access " "to reference not allowed\n", 0, 0, 0 ); -#endif rc = 1; goto rel; } #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE if( op->o_domain_scope ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_reference: conn %lu domainScope control in (%s).\n", - op->o_connid, rs->sr_entry->e_dn, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_reference: domainScope control in (%s)\n", rs->sr_entry->e_dn, 0, 0 ); -#endif rc = 0; goto rel; } #endif if( rs->sr_ref == NULL ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_reference: conn %lu null ref in (%s).\n", - op->o_connid, rs->sr_entry ? rs->sr_entry->e_dn : "(null)", 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_reference: null ref in (%s)\n", rs->sr_entry ? rs->sr_entry->e_dn : "(null)", 0, 0 ); -#endif rc = 1; goto rel; } if( op->o_protocol < LDAP_VERSION3 ) { + rc = 0; /* save the references for the result */ if( rs->sr_ref[0].bv_val != NULL ) { if( value_add( &rs->sr_v2ref, rs->sr_ref ) ) - return LDAP_OTHER; + rc = LDAP_OTHER; } - rc = 0; goto rel; } @@ -1338,8 +1381,8 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) rc = ber_printf( ber, "{it{W}" /*"}"*/ , op->o_msgid, LDAP_RES_SEARCH_REFERENCE, rs->sr_ref ); - if( rc != -1 && rs->sr_ctrls != NULL ) { - rc = send_ldap_controls( ber, rs->sr_ctrls ); + if( rc != -1 ) { + rc = send_ldap_controls( op, ber, rs->sr_ctrls ); } if( rc != -1 ) { @@ -1347,14 +1390,8 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) } if ( rc == -1 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_reference: conn %lu " - "ber_printf failed.\n", op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_reference: ber_printf failed\n", 0, 0, 0 ); -#endif #ifdef LDAP_CONNECTIONLESS if (!op->o_conn || op->o_conn->c_is_udp == 0) @@ -1364,33 +1401,52 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) goto rel; } + rc = 0; + if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) { + be_entry_release_rw( op, rs->sr_entry, 0 ); + rs->sr_flags ^= REP_ENTRY_MUSTRELEASE; + rs->sr_entry = NULL; + } + #ifdef LDAP_CONNECTIONLESS if (!op->o_conn || op->o_conn->c_is_udp == 0) { #endif - bytes = op->o_noop ? 0 : send_ldap_ber( op->o_conn, ber ); + bytes = send_ldap_ber( op->o_conn, ber ); ber_free_buf( ber ); - ldap_pvt_thread_mutex_lock( &num_sent_mutex ); - num_bytes_sent += bytes; - num_refs_sent++; - num_pdu_sent++; - ldap_pvt_thread_mutex_unlock( &num_sent_mutex ); + ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex ); + ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes ); + ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 ); + ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 ); + ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex ); #ifdef LDAP_CONNECTIONLESS } #endif - Statslog( LDAP_DEBUG_STATS2, "conn=%lu op=%lu REF dn=\"%s\"\n", - op->o_connid, op->o_opid, rs->sr_entry ? rs->sr_entry->e_dn : "(null)", 0, 0 ); + Statslog( LDAP_DEBUG_STATS2, "%s REF dn=\"%s\"\n", + op->o_log_prefix, rs->sr_entry ? rs->sr_entry->e_dn : "(null)", + 0, 0, 0 ); -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ENTRY, - "send_search_reference: conn %lu exit.\n", op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 ); -#endif rel: - sl_release( mark, op->o_tmpmemctx ); + if ( op->o_callback ) { + int first = 1; + slap_callback *sc = op->o_callback, *sc_next; + + for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) { + sc_next = op->o_callback->sc_next; + if ( op->o_callback->sc_cleanup ) { + (void)op->o_callback->sc_cleanup( op, rs ); + if ( first && op->o_callback != sc ) { + sc = op->o_callback; + } + } + first = 0; + } + op->o_callback = sc; + } + return rc; } @@ -1399,8 +1455,7 @@ str2result( char *s, int *code, char **matched, - char **info -) + char **info ) { int rc; char *c; @@ -1409,14 +1464,9 @@ str2result( *matched = NULL; *info = NULL; - if ( strncasecmp( s, "RESULT", 6 ) != 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, - "str2result: (%s), expecting \"RESULT\"\n", s, 0, 0 ); -#else + if ( strncasecmp( s, "RESULT", STRLENOF( "RESULT" ) ) != 0 ) { Debug( LDAP_DEBUG_ANY, "str2result (%s) expecting \"RESULT\"\n", s, 0, 0 ); -#endif return( -1 ); } @@ -1431,25 +1481,21 @@ str2result( c++; } - if ( strncasecmp( s, "code", 4 ) == 0 ) { + if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) { if ( c != NULL ) { *code = atoi( c ); } - } else if ( strncasecmp( s, "matched", 7 ) == 0 ) { + } else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) { if ( c != NULL ) { *matched = c; } - } else if ( strncasecmp( s, "info", 4 ) == 0 ) { + } else if ( strncasecmp( s, "info", STRLENOF( "info" ) ) == 0 ) { if ( c != NULL ) { *info = c; } } else { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "str2result: (%s) unknown.\n", s, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n", s, 0, 0 ); -#endif rc = -1; } @@ -1470,23 +1516,16 @@ int slap_read_controls( BerElementBuffer berbuf; BerElement *ber = (BerElement *) &berbuf; LDAPControl c; - ber_len_t siz, len; Operation myop; -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, "slap_read_controls: (%s) %s\n", - oid->bv_val, e->e_dn, 0 ); -#else Debug( LDAP_DEBUG_ANY, "slap_read_controls: (%s) %s\n", oid->bv_val, e->e_dn, 0 ); -#endif rs->sr_entry = e; rs->sr_attrs = ( oid == &slap_pre_read_bv ) ? op->o_preread_attrs : op->o_postread_attrs; - entry_flatsize( rs->sr_entry, &siz, &len, 0 ); - bv.bv_len = siz + len; + bv.bv_len = entry_flatsize( rs->sr_entry, 0 ); bv.bv_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx ); ber_init2( ber, &bv, LBER_USE_DER ); @@ -1507,7 +1546,80 @@ int slap_read_controls( c.ldctl_oid = oid->bv_val; c.ldctl_iscritical = 0; - *ctrl = sl_calloc( 1, sizeof(LDAPControl), NULL ); + if ( ctrl == NULL ) { + /* first try */ + *ctrl = (LDAPControl *) slap_sl_calloc( 1, sizeof(LDAPControl), NULL ); + } else { + /* retry: free previous try */ + slap_sl_free( (*ctrl)->ldctl_value.bv_val, op->o_tmpmemctx ); + } + **ctrl = c; return LDAP_SUCCESS; } + +/* Map API errors to protocol errors... */ +int +slap_map_api2result( SlapReply *rs ) +{ + switch(rs->sr_err) { + case LDAP_SERVER_DOWN: + return LDAP_UNAVAILABLE; + case LDAP_LOCAL_ERROR: + return LDAP_OTHER; + case LDAP_ENCODING_ERROR: + case LDAP_DECODING_ERROR: + return LDAP_PROTOCOL_ERROR; + case LDAP_TIMEOUT: + return LDAP_UNAVAILABLE; + case LDAP_AUTH_UNKNOWN: + return LDAP_AUTH_METHOD_NOT_SUPPORTED; + case LDAP_FILTER_ERROR: + rs->sr_text = "Filter error"; + return LDAP_OTHER; + case LDAP_USER_CANCELLED: + rs->sr_text = "User cancelled"; + return LDAP_OTHER; + case LDAP_PARAM_ERROR: + return LDAP_PROTOCOL_ERROR; + case LDAP_NO_MEMORY: + return LDAP_OTHER; + case LDAP_CONNECT_ERROR: + return LDAP_UNAVAILABLE; + case LDAP_NOT_SUPPORTED: + return LDAP_UNWILLING_TO_PERFORM; + case LDAP_CONTROL_NOT_FOUND: + return LDAP_PROTOCOL_ERROR; + case LDAP_NO_RESULTS_RETURNED: + return LDAP_NO_SUCH_OBJECT; + case LDAP_MORE_RESULTS_TO_RETURN: + rs->sr_text = "More results to return"; + return LDAP_OTHER; + case LDAP_CLIENT_LOOP: + case LDAP_REFERRAL_LIMIT_EXCEEDED: + return LDAP_LOOP_DETECT; + default: + if ( LDAP_API_ERROR(rs->sr_err) ) return LDAP_OTHER; + return rs->sr_err; + } +} + + +slap_mask_t +slap_attr_flags( AttributeName *an ) +{ + slap_mask_t flags = SLAP_ATTRS_UNDEFINED; + + if ( an == NULL ) { + flags |= ( SLAP_OPATTRS_NO | SLAP_USERATTRS_YES ); + + } else { + flags |= an_find( an, &AllOper ) + ? SLAP_OPATTRS_YES : SLAP_OPATTRS_NO; + flags |= an_find( an, &AllUser ) + ? SLAP_USERATTRS_YES : SLAP_USERATTRS_NO; + } + + return flags; +} +