X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fresult.c;h=0756260de04ab20c39dbb424b25379e2748c2ef1;hb=447f3f746e59fc5b724b8dd8bfb1ec0e02cc8d9f;hp=9d1e2817e1211b47c0bf8a73d7ca1798f2db34e0;hpb=02c5b51717eb1e8d24db3b64f474c17ea5d531b2;p=openldap diff --git a/servers/slapd/result.c b/servers/slapd/result.c index 9d1e2817e1..0756260de0 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-2004 The OpenLDAP Foundation. + * Copyright 1998-2009 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,9 +37,7 @@ #include "slap.h" -#ifdef LDAP_SLAPI -#include "slapi/slapi.h" -#endif +const struct berval slap_dummy_bv = BER_BVNULL; int slap_null_cb( Operation *op, SlapReply *rs ) { @@ -48,7 +46,7 @@ int slap_null_cb( Operation *op, SlapReply *rs ) int slap_freeself_cb( Operation *op, SlapReply *rs ) { - assert( op->o_callback ); + assert( op->o_callback != NULL ); op->o_tmpfree( op->o_callback, op->o_tmpmemctx ); op->o_callback = NULL; @@ -56,14 +54,6 @@ int slap_freeself_cb( Operation *op, SlapReply *rs ) 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; @@ -84,15 +74,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; - } + v2 = ch_malloc( len+i+sizeof("Referral:") ); if( text != NULL ) { strcpy(v2, text); @@ -104,15 +86,7 @@ static char *v2ref( BerVarray ref, const char *text ) len += sizeof("Referral:"); 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 = ch_realloc( v2, len + ref[i].bv_len + 1 ); v2[len-1] = '\n'; AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len ); len += ref[i].bv_len; @@ -125,7 +99,8 @@ static char *v2ref( BerVarray ref, const char *text ) return v2; } -static ber_tag_t req2res( ber_tag_t tag ) +ber_tag_t +slap_req2res( ber_tag_t tag ) { switch( tag ) { case LDAP_REQ_ADD: @@ -162,32 +137,57 @@ static long send_ldap_ber( BerElement *ber ) { ber_len_t bytes; + long ret = 0; + int closing = 0; ber_get_option( ber, LBER_OPT_BER_BYTES_TO_WRITE, &bytes ); /* write only one pdu at a time - wait til it's our turn */ - ldap_pvt_thread_mutex_lock( &conn->c_write_mutex ); + ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex ); + if ( connection_state_closing( conn )) { + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); + return 0; + } + while ( conn->c_writers > 0 ) { + ldap_pvt_thread_cond_wait( &conn->c_write1_cv, &conn->c_write1_mutex ); + } + /* connection was closed under us */ + if ( conn->c_writers < 0 ) { + closing = 1; + /* we're the last waiter, let the closer continue */ + if ( conn->c_writers == -1 ) + ldap_pvt_thread_cond_signal( &conn->c_write1_cv ); + } - /* lock the connection */ - ldap_pvt_thread_mutex_lock( &conn->c_mutex ); + conn->c_writers++; + + if ( closing ) { + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); + return 0; + } /* write the pdu */ while( 1 ) { int err; - ber_socket_t sd; - - if ( connection_state_closing( conn ) ) { - ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); - ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex ); - return 0; + /* lock the connection */ + if ( ldap_pvt_thread_mutex_trylock( &conn->c_mutex )) { + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); + ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex ); + if ( conn->c_writers < 0 ) { + ret = 0; + break; + } + continue; } - if ( ber_flush( conn->c_sb, ber, 0 ) == 0 ) { + if ( ber_flush2( conn->c_sb, ber, LBER_FLUSH_FREE_NEVER ) == 0 ) { + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); + ret = bytes; break; } - err = errno; + err = sock_errno(); /* * we got an error. if it's ewouldblock, we need to @@ -195,37 +195,46 @@ 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", + Debug( LDAP_DEBUG_CONNS, "ber_flush2 failed errno=%d reason=\"%s\"\n", err, sock_errstr(err), 0 ); -#endif if ( err != EWOULDBLOCK && err != EAGAIN ) { - connection_closing( conn ); + conn->c_writers--; + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); + connection_closing( conn, "connection lost on write" ); ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); - ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex ); - - return( -1 ); + return -1; } /* wait for socket to be write-ready */ + ldap_pvt_thread_mutex_lock( &conn->c_write2_mutex ); conn->c_writewaiter = 1; - ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd ); - slapd_set_write( sd, 1 ); + slapd_set_write( conn->c_sd, 1 ); - ldap_pvt_thread_cond_wait( &conn->c_write_cv, &conn->c_mutex ); + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); + ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); + ldap_pvt_thread_cond_wait( &conn->c_write2_cv, &conn->c_write2_mutex ); conn->c_writewaiter = 0; + ldap_pvt_thread_mutex_unlock( &conn->c_write2_mutex ); + ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex ); + if ( conn->c_writers < 0 ) { + ret = 0; + break; + } } - ldap_pvt_thread_mutex_unlock( &conn->c_mutex ); - ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex ); + if ( conn->c_writers < 0 ) { + conn->c_writers++; + if ( !conn->c_writers ) + ldap_pvt_thread_cond_signal( &conn->c_write1_cv ); + } else { + conn->c_writers--; + ldap_pvt_thread_cond_signal( &conn->c_write1_cv ); + } + ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex ); - return bytes; + return ret; } static int @@ -258,48 +267,143 @@ 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 */ + if( c == NULL ) + return 0; rc = ber_printf( ber, "t{"/*}*/, LDAP_TAG_CONTROLS ); if( rc == -1 ) return rc; -#ifdef LDAP_SLAPI - if ( c != NULL ) -#endif /* LDAP_SLAPI */ for( ; *c != NULL; c++) { rc = send_ldap_control( ber, *c ); if( rc == -1 ) return rc; } -#ifdef LDAP_SLAPI - if ( sctrls != NULL ) { - for ( c = sctrls; *c != NULL; c++ ) { - rc = send_ldap_control( ber, *c ); - if( rc == -1 ) return rc; +#ifdef SLAP_CONTROL_X_SORTEDRESULTS + /* 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, "{e}", LDAP_UNWILLING_TO_PERFORM ); + + if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) { + return -1; } + + (void) ber_free_buf( ber ); + + rc = send_ldap_control( ber, &sorted ); + if( rc == -1 ) return rc; } -#endif /* LDAP_SLAPI */ +#endif rc = ber_printf( ber, /*{*/"N}" ); return rc; } +/* + * slap_response_play() + * + * plays the callback list; rationale: a callback can + * - remove itself from the list, by setting op->o_callback = NULL; + * malloc()'ed callbacks should free themselves from inside the + * sc_response() function. + * - replace itself with another (list of) callback(s), by setting + * op->o_callback = a new (list of) callback(s); in this case, it + * is the callback's responsibility to to append existing subsequent + * callbacks to the end of the list that is passed to the sc_response() + * function. + * - modify the list of subsequent callbacks by modifying the value + * of the sc_next field from inside the sc_response() function; this + * case does not require any handling from inside slap_response_play() + * + * To stop execution of the playlist, the sc_response() function must return + * a value different from SLAP_SC_CONTINUE. + * + * The same applies to slap_cleanup_play(); only, there is no means to stop + * execution of the playlist, since all cleanup functions must be called. + */ +static int +slap_response_play( + Operation *op, + SlapReply *rs ) +{ + int rc; + + slap_callback *sc = op->o_callback, **scp; + + rc = SLAP_CB_CONTINUE; + for ( scp = ≻ *scp; ) { + slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next; + + op->o_callback = *scp; + if ( op->o_callback->sc_response ) { + rc = op->o_callback->sc_response( op, rs ); + if ( op->o_callback == NULL ) { + /* the callback has been removed; + * repair the list */ + *scp = sc_next; + sc_nextp = scp; + + } else if ( op->o_callback != *scp ) { + /* a new callback has been inserted + * in place of the existing one; repair the list */ + *scp = op->o_callback; + sc_nextp = scp; + } + if ( rc != SLAP_CB_CONTINUE ) break; + } + scp = sc_nextp; + } + + op->o_callback = sc; + return rc; +} + +static int +slap_cleanup_play( + Operation *op, + SlapReply *rs ) +{ + slap_callback *sc = op->o_callback, **scp; + + for ( scp = ≻ *scp; ) { + slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next; + + op->o_callback = *scp; + if ( op->o_callback->sc_cleanup ) { + (void)op->o_callback->sc_cleanup( op, rs ); + if ( op->o_callback == NULL ) { + /* the callback has been removed; + * repair the list */ + *scp = sc_next; + sc_nextp = scp; + + } else if ( op->o_callback != *scp ) { + /* a new callback has been inserted + * after the existing one; repair the list */ + /* a new callback has been inserted + * in place of the existing one; repair the list */ + *scp = op->o_callback; + sc_nextp = scp; + } + /* don't care about the result; do all cleanup */ + } + scp = sc_nextp; + } + + op->o_callback = sc; + return LDAP_SUCCESS; +} + static int send_ldap_response( Operation *op, @@ -310,26 +414,16 @@ send_ldap_response( int rc = LDAP_SUCCESS; long bytes; + if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) { + rc = SLAPD_ABANDON; + goto clean2; + } + if ( op->o_callback ) { - int first; - 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; + rc = slap_response_play( op, rs ); + if ( rc != SLAP_CB_CONTINUE ) { + goto clean2; } - - op->o_callback = sc; - if ( rc != SLAP_CB_CONTINUE ) goto clean2; } #ifdef LDAP_CONNECTIONLESS @@ -342,27 +436,14 @@ 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 @@ -406,11 +487,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 ); } } @@ -435,13 +520,7 @@ send_ldap_response( #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) @@ -462,32 +541,17 @@ send_ldap_response( } 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 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_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 ); + ldap_pvt_thread_mutex_lock( &op->o_counters->sc_mutex ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_pdu, 1 ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_bytes, (unsigned long)bytes ); + ldap_pvt_thread_mutex_unlock( &op->o_counters->sc_mutex ); cleanup:; /* Tell caller that we did this for real, as opposed to being @@ -497,33 +561,31 @@ cleanup:; clean2:; if ( op->o_callback ) { - int first; - slap_callback *sc = op->o_callback, - *sc_next = op->o_callback; - - 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 == NULL ) { - sc = NULL; - } - } - first = 0; - } - - op->o_callback = sc; + (void)slap_cleanup_play( op, rs ); } + if ( rs->sr_flags & REP_MATCHED_MUSTBEFREED ) { + rs->sr_flags ^= REP_MATCHED_MUSTBEFREED; /* paranoia */ + if ( rs->sr_matched ) { + free( (char *)rs->sr_matched ); + rs->sr_matched = NULL; + } + } - if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) { - free( (char *)rs->sr_matched ); - rs->sr_matched = NULL; + if ( rs->sr_flags & REP_REF_MUSTBEFREED ) { + rs->sr_flags ^= REP_REF_MUSTBEFREED; /* paranoia */ + if ( rs->sr_ref ) { + ber_bvarray_free( rs->sr_ref ); + rs->sr_ref = NULL; + } } - if ( rs->sr_ref && rs->sr_flags & REP_REF_MUSTBEFREED ) { - ber_bvarray_free( rs->sr_ref ); - rs->sr_ref = NULL; + if ( rs->sr_flags & REP_CTRLS_MUSTBEFREED ) { + rs->sr_flags ^= REP_CTRLS_MUSTBEFREED; /* paranoia */ + if ( rs->sr_ctrls ) { + slap_free_ctrls( op, rs->sr_ctrls ); + rs->sr_ctrls = NULL; + } } return rc; @@ -542,32 +604,26 @@ 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; - rs->sr_tag = req2res( op->o_tag ); + rs->sr_tag = slap_req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; } else { rs->sr_rspoid = LDAP_NOTICE_DISCONNECT; rs->sr_tag = LDAP_RES_EXTENDED; - rs->sr_msgid = 0; + rs->sr_msgid = LDAP_RES_UNSOLICITED; } if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { 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 : "" ); + "%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 ); } } @@ -580,52 +636,34 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) rs->sr_type = REP_RESULT; - assert( !LDAP_API_ERROR( rs->sr_err )); + /* Propagate Abandons so that cleanup callbacks can be processed */ + if ( rs->sr_err == SLAPD_ABANDON || op->o_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 ); if ( rs->sr_err == LDAP_REFERRAL ) { -#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE - if( op->o_domain_scope ) { - rs->sr_ref = NULL; - } -#endif + if( op->o_domain_scope ) rs->sr_ref = NULL; + if( rs->sr_ref == NULL ) { rs->sr_err = LDAP_NO_SUCH_OBJECT; } else if ( op->o_protocol < LDAP_VERSION3 ) { @@ -633,50 +671,35 @@ slap_send_ldap_result( Operation *op, SlapReply *rs ) } } -#ifdef LDAP_SLAPI - /* - * Call pre-result plugins. To avoid infinite recursion plugins - * should just set SLAPI_RESULT_CODE rather than sending a - * result if they wish to change the result. - */ - if ( 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 */ - if ( op->o_protocol < LDAP_VERSION3 ) { tmp = v2ref( rs->sr_ref, rs->sr_text ); rs->sr_text = tmp; rs->sr_ref = NULL; } - rs->sr_tag = req2res( op->o_tag ); +abandon: + rs->sr_tag = slap_req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; + if ( rs->sr_flags & REP_REF_MUSTBEFREED ) { + if ( rs->sr_ref == NULL ) { + rs->sr_flags ^= REP_REF_MUSTBEFREED; + ber_bvarray_free( oref ); + } + oref = NULL; /* send_ldap_response() will free rs->sr_ref if != NULL */ + } + 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, - "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 : "" ); + "%s SEARCH RESULT tag=%lu err=%d nentries=%d text=%s\n", + op->o_log_prefix, rs->sr_tag, rs->sr_err, + rs->sr_nentries, 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 : "" ); + "%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 ); } } @@ -689,21 +712,19 @@ 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_tag = slap_req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; - send_ldap_response( op, rs ); + if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { + 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 ); + } } void @@ -711,62 +732,62 @@ 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_tag = slap_req2res( op->o_tag ); rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0; - send_ldap_response( op, rs ); + if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { + Statslog( LDAP_DEBUG_STATS, + "%s RESULT oid=%s err=%d text=%s\n", + op->o_log_prefix, rs->sr_rspoid ? rs->sr_rspoid : "", + rs->sr_err, rs->sr_text ? rs->sr_text : "", 0 ); + } } 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 ); + if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) { + Statslog( LDAP_DEBUG_STATS2, + "%s INTERM oid=%s\n", + op->o_log_prefix, + rs->sr_rspoid ? rs->sr_rspoid : "", 0, 0, 0 ); + } } +/* + * returns: + * + * LDAP_SUCCESS entry sent + * LDAP_OTHER entry not sent (other) + * LDAP_INSUFFICIENT_ACCESS entry not sent (ACL) + * LDAP_UNAVAILABLE entry not sent (connection closed) + * LDAP_SIZELIMIT_EXCEEDED entry not sent (caller must send sizelimitExceeded) + */ + int slap_send_search_entry( Operation *op, SlapReply *rs ) { BerElementBuffer berbuf; BerElement *ber = (BerElement *) &berbuf; - Attribute *a, *aa = NULL; - int i, j, rc=-1, bytes; - char *edn; + Attribute *a; + int i, j, rc = LDAP_UNAVAILABLE, bytes; 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 + int attrsonly; AttributeDescription *ad_entry = slap_schema.si_ad_entry; /* a_flags: array of flags telling if the i-th element will be @@ -774,77 +795,66 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) * e_flags: array of a_flags */ char **e_flags = NULL; - - /* eventually will loop through generated operational attributes */ - /* only subschemaSubentry and numSubordinates are implemented */ + + if ( op->ors_slimit >= 0 && rs->sr_nentries >= op->ors_slimit ) { + return LDAP_SIZELIMIT_EXCEEDED; + } + + /* Every 64 entries, check for thread pool pause */ + if ( ( ( rs->sr_nentries & 0x3f ) == 0x3f ) && + ldap_pvt_thread_pool_pausing( &connection_pool ) > 0 ) + { + return LDAP_BUSY; + } + + rs->sr_type = REP_SEARCH; + + /* 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 */ - opattrs = ( rs->sr_attrs == NULL ) ? 0 - : an_find( rs->sr_attrs, &AllOper ); + /* FIXME: maybe we could set 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 ); - aa = backend_operational( op, rs, opattrs ); + rc = backend_operational( op, rs ); + if ( rc ) { + goto error_return; + } - rs->sr_type = REP_SEARCH; if ( op->o_callback ) { - int first; - 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; + rc = slap_response_play( op, rs ); + if ( rc != SLAP_CB_CONTINUE ) { + goto error_return; } - - 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", - op->o_connid, rs->sr_entry->e_name.bv_val, - op->ors_attrsonly ? " (attrsOnly)" : "" ); -#else 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)" : "" ); -#endif + + attrsonly = op->ors_attrsonly; if ( !access_allowed( op, rs->sr_entry, ad_entry, NULL, ACL_READ, NULL )) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "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: conn %lu access to entry (%s) not allowed\n", op->o_connid, rs->sr_entry->e_name.bv_val, 0 ); -#endif - rc = 1; + rc = LDAP_INSUFFICIENT_ACCESS; goto error_return; } - edn = rs->sr_entry->e_nname.bv_val; - if ( op->o_res_ber ) { /* 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_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx ); + 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 ); ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx ); @@ -871,24 +881,18 @@ 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, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding DN error" ); + rc = rs->sr_err; goto error_return; } /* check for special all user attributes ("*") type */ - userattrs = ( rs->sr_attrs == NULL ) ? 1 - : an_find( rs->sr_attrs, &AllUser ); + 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 @@ -907,15 +911,9 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) char *a_flags; 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 slap_sl_calloc failed\n", - op->o_connid ? op->o_connid : 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu slap_sl_calloc failed\n", op->o_connid ? op->o_connid : 0, 0, 0 ); -#endif ber_free( ber, 1 ); send_ldap_error( op, rs, LDAP_OTHER, "out of memory" ); @@ -931,18 +929,13 @@ 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: " - "conn %lu matched values filtering failed\n", - op->o_connid ? op->o_connid : 0, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: " "conn %lu matched values filtering failed\n", op->o_connid ? op->o_connid : 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" ); + rc = rs->sr_err; goto error_return; } } @@ -953,7 +946,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) int finish = 0; if ( rs->sr_attrs == NULL ) { - /* all attrs request, skip operational attributes */ + /* all user attrs request, skip operational attributes */ if( is_at_operational( desc->ad_type ) ) { continue; } @@ -961,47 +954,42 @@ 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 ) ) { - continue; + /* if not explicitly requested */ + if ( !ad_inlist( desc, rs->sr_attrs )) { + /* if not all op attrs requested, skip */ + if ( !SLAP_OPATTRS( rs->sr_attr_flags )) + continue; + /* if DSA-specific and replicating, skip */ + if ( op->o_sync != SLAP_CONTROL_NONE && + desc->ad_type->sat_usage == LDAP_SCHEMA_DSA_OPERATION ) + continue; } - } else { - if (!userattrs && !ad_inlist( desc, rs->sr_attrs ) ) { + if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) { continue; } } } - if ( op->ors_attrsonly ) { + if ( attrsonly ) { 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, "send_search_entry: " "conn %lu access to attribute %s not allowed\n", op->o_connid, desc->ad_cname.bv_val, 0 ); -#endif 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, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding description error"); + rc = rs->sr_err; goto error_return; } finish = 1; @@ -1012,17 +1000,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) if ( ! access_allowed( op, rs->sr_entry, desc, &a->a_nvals[i], ACL_READ, &acl_state ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "send_search_entry: conn %lu " - "access to attribute %s, value #%d not allowed\n", - op->o_connid, desc->ad_cname.bv_val, i ); -#else Debug( LDAP_DEBUG_ACL, "send_search_entry: conn %lu " "access to attribute %s, value #%d not allowed\n", op->o_connid, desc->ad_cname.bv_val, i ); -#endif continue; } @@ -1035,65 +1016,50 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) first = 0; finish = 1; 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, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding description error"); + rc = rs->sr_err; goto error_return; } } if (( rc = ber_printf( ber, "O", &a->a_vals[i] )) == -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, "send_search_entry: conn %lu " "ber_printf failed.\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding values error" ); + rc = rs->sr_err; goto error_return; } } } if ( finish && ( rc = ber_printf( ber, /*{[*/ "]N}" )) == -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, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encode end error" ); + rc = rs->sr_err; goto error_return; } } /* NOTE: moved before overlays callback circling because * they may modify entry and other stuff in rs */ - if ( aa != NULL && op->o_vrFilter != NULL ) { + 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++; } @@ -1108,19 +1074,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs ) 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" ); @@ -1129,38 +1087,32 @@ 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, - "send_search_entry: conn %lu " - "matched values filtering failed\n", - op->o_connid ? op->o_connid : 0, 0, 0); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu " "matched values filtering failed\n", op->o_connid ? op->o_connid : 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" ); + rc = rs->sr_err; goto error_return; } } } - 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 ) { - /* all attrs request, skip operational attributes */ + /* all user attrs request, skip operational attributes */ if( is_at_operational( desc->ad_type ) ) { continue; } @@ -1168,11 +1120,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; } } @@ -1181,55 +1135,36 @@ 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, - "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: conn %lu " "access to attribute %s not allowed\n", op->o_connid, desc->ad_cname.bv_val, 0 ); -#endif continue; } rc = ber_printf( ber, "{O[" /*]}*/ , &desc->ad_cname ); 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, "send_search_entry: conn %lu " "ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding description error" ); + rc = rs->sr_err; goto error_return; } - if ( ! op->ors_attrsonly ) { + if ( ! attrsonly ) { for ( i = 0; a->a_vals[i].bv_val != NULL; i++ ) { if ( ! access_allowed( op, rs->sr_entry, desc, &a->a_vals[i], ACL_READ, &acl_state ) ) { -#ifdef NEW_LOGGING - LDAP_LOG( ACL, INFO, - "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: conn %lu " "access to %s, value %d not allowed\n", op->o_connid, desc->ad_cname.bv_val, i ); -#endif continue; } @@ -1239,81 +1174,31 @@ 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, - "send_search_entry: conn %lu ber_printf failed\n", - op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encoding values error" ); + rc = rs->sr_err; goto error_return; } } } if (( rc = ber_printf( ber, /*{[*/ "]N}" )) == -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, "send_search_entry: conn %lu ber_printf failed\n", op->o_connid, 0, 0 ); -#endif if ( op->o_res_ber == NULL ) ber_free_buf( ber ); send_ldap_error( op, rs, LDAP_OTHER, "encode end error" ); + rc = rs->sr_err; goto error_return; } } -#ifdef LDAP_SLAPI - /* - * First, setup the computed attribute context that is - * passed to all plugins. - */ - if ( op->o_pb ) { - ctx.cac_pb = op->o_pb; - ctx.cac_attrs = rs->sr_attrs; - ctx.cac_attrsonly = op->ors_attrsonly; - ctx.cac_userattrs = userattrs; - ctx.cac_opattrs = opattrs; - ctx.cac_acl_state = acl_state; - ctx.cac_private = (void *)ber; - - /* - * For each client requested attribute, call the plugins. - */ - 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_int_compute_output_ber ); - if ( rc == 1 ) break; - } - } else { - /* - * Technically we shouldn't be returning operational attributes - * when the user requested only user attributes. We'll let the - * plugin decide whether to be naughty or not. - */ - rc = compute_evaluator( &ctx, "*", - rs->sr_entry, slapi_int_compute_output_ber ); - } - if ( rc == 1 ) { - if ( op->o_res_ber == NULL ) ber_free_buf( ber ); - send_ldap_error( op, rs, LDAP_OTHER, "computed attribute error" ); - goto error_return; - } - } -#endif /* LDAP_SLAPI */ - /* free e_flags */ if ( e_flags ) { slap_sl_free( e_flags, op->o_tmpmemctx ); @@ -1340,87 +1225,63 @@ 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" ); - rc = 1; + rc = rs->sr_err; goto error_return; } + Statslog( LDAP_DEBUG_STATS2, "%s ENTRY dn=\"%s\"\n", + op->o_log_prefix, rs->sr_entry->e_nname.bv_val, 0, 0, 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; + } + if ( op->o_res_ber == NULL ) { bytes = send_ldap_ber( op->o_conn, ber ); ber_free_buf( ber ); if ( bytes < 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, ERR, - "send_search_entry: conn %lu ber write failed.\n", - op->o_connid, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "send_search_entry: conn %lu ber write failed.\n", op->o_connid, 0, 0 ); -#endif - rc = -1; + rc = LDAP_UNAVAILABLE; 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( &op->o_counters->sc_mutex ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_bytes, (unsigned long)bytes ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_entries, 1 ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_pdu, 1 ); + ldap_pvt_thread_mutex_unlock( &op->o_counters->sc_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 ); - -#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: conn %lu exit.\n", op->o_connid, 0, 0 ); -#endif - rc = 0; + rc = LDAP_SUCCESS; error_return:; + if ( op->o_callback ) { + (void)slap_cleanup_play( op, rs ); + } + if ( e_flags ) { slap_sl_free( e_flags, op->o_tmpmemctx ); } - if ( aa ) { - attrs_free( aa ); - } - - if ( op->o_callback ) { - int first; - slap_callback *sc = op->o_callback, - *sc_next = op->o_callback; - - 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 == NULL ) { - sc = NULL; - } - } - first = 0; - } - - op->o_callback = sc; + 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 @@ -1447,57 +1308,29 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) BerElement *ber = (BerElement *) &berbuf; int rc = 0; int bytes; + char *edn = rs->sr_entry ? rs->sr_entry->e_name.bv_val : "(null)"; 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 ) { - int first; - 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; + rc = slap_response_play( op, rs ); + if ( rc != SLAP_CB_CONTINUE ) { + goto rel; } - - 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 + edn, 0, 0 ); 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; } @@ -1505,46 +1338,26 @@ 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 + edn, 0, 0 ); 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 + edn, 0, 0 ); rc = 1; goto rel; } @@ -1581,14 +1394,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) @@ -1598,49 +1405,51 @@ slap_send_search_reference( Operation *op, SlapReply *rs ) goto rel; } + rc = 0; + if ( rs->sr_flags & REP_ENTRY_MUSTRELEASE ) { + assert( rs->sr_entry != NULL ); + 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 = 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 ); + if ( bytes < 0 ) { + rc = LDAP_UNAVAILABLE; + } else { + ldap_pvt_thread_mutex_lock( &op->o_counters->sc_mutex ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_bytes, (unsigned long)bytes ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_refs, 1 ); + ldap_pvt_mp_add_ulong( op->o_counters->sc_pdu, 1 ); + ldap_pvt_thread_mutex_unlock( &op->o_counters->sc_mutex ); + } #ifdef LDAP_CONNECTIONLESS } #endif + if ( rs->sr_ref != NULL ) { + int r; - 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 ); + for ( r = 0; !BER_BVISNULL( &rs->sr_ref[ r ] ); r++ ) { + Statslog( LDAP_DEBUG_STATS2, "%s REF #%d \"%s\"\n", + op->o_log_prefix, r, rs->sr_ref[0].bv_val, + 0, 0 ); + } + + } else { + Statslog( LDAP_DEBUG_STATS2, "%s REF \"(null)\"\n", + op->o_log_prefix, 0, 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: if ( op->o_callback ) { - int first; - slap_callback *sc = op->o_callback, - *sc_next = op->o_callback; - - 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 == NULL ) { - sc = NULL; - } - } - first = 0; - } - - op->o_callback = sc; + (void)slap_cleanup_play( op, rs ); } return rc; @@ -1651,8 +1460,7 @@ str2result( char *s, int *code, char **matched, - char **info -) + char **info ) { int rc; char *c; @@ -1662,13 +1470,8 @@ str2result( *info = NULL; if ( strncasecmp( s, "RESULT", STRLENOF( "RESULT" ) ) != 0 ) { -#ifdef NEW_LOGGING - LDAP_LOG( OPERATION, INFO, - "str2result: (%s), expecting \"RESULT\"\n", s, 0, 0 ); -#else Debug( LDAP_DEBUG_ANY, "str2result (%s) expecting \"RESULT\"\n", s, 0, 0 ); -#endif return( -1 ); } @@ -1684,9 +1487,43 @@ str2result( } if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) { - if ( c != NULL ) { - *code = atoi( c ); + char *next = NULL; + long retcode; + + if ( c == NULL ) { + Debug( LDAP_DEBUG_ANY, "str2result (%s) missing value\n", + s, 0, 0 ); + rc = -1; + continue; } + + while ( isspace( (unsigned char) c[ 0 ] ) ) c++; + if ( c[ 0 ] == '\0' ) { + Debug( LDAP_DEBUG_ANY, "str2result (%s) missing or empty value\n", + s, 0, 0 ); + rc = -1; + continue; + } + + retcode = strtol( c, &next, 10 ); + if ( next == NULL || next == c ) { + Debug( LDAP_DEBUG_ANY, "str2result (%s) unable to parse value\n", + s, 0, 0 ); + rc = -1; + continue; + } + + while ( isspace( (unsigned char) next[ 0 ] ) ) next++; + if ( next[ 0 ] != '\0' ) { + Debug( LDAP_DEBUG_ANY, "str2result (%s) extra cruft after value\n", + s, 0, 0 ); + rc = -1; + continue; + } + + /* FIXME: what if it's larger that max int? */ + *code = (int)retcode; + } else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) { if ( c != NULL ) { *matched = c; @@ -1696,12 +1533,8 @@ str2result( *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; } @@ -1722,49 +1555,45 @@ 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 + Debug( LDAP_DEBUG_ANY, "%s slap_read_controls: (%s) %s\n", + op->o_log_prefix, oid->bv_val, e->e_dn ); 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_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx ); + 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 ); ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx ); /* create new operation */ myop = *op; - myop.o_bd = NULL; + /* FIXME: o_bd needed for ACL */ + myop.o_bd = op->o_bd; myop.o_res_ber = ber; + myop.o_callback = NULL; + myop.ors_slimit = 1; rc = slap_send_search_entry( &myop, rs ); if( rc ) return rc; rc = ber_flatten2( ber, &c.ldctl_value, 0 ); - if( rc == LBER_ERROR ) return LDAP_OTHER; + if( rc == -1 ) return LDAP_OTHER; c.ldctl_oid = oid->bv_val; c.ldctl_iscritical = 0; - if ( ctrl == 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 ); + slap_sl_free( (*ctrl)->ldctl_value.bv_val, op->o_tmpmemctx ); } **ctrl = c; @@ -1817,3 +1646,22 @@ slap_map_api2result( SlapReply *rs ) } } + +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, slap_bv_all_operational_attrs ) + ? SLAP_OPATTRS_YES : SLAP_OPATTRS_NO; + flags |= an_find( an, slap_bv_all_user_attrs ) + ? SLAP_USERATTRS_YES : SLAP_USERATTRS_NO; + } + + return flags; +} +