#include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-
-static int call_pre_result_plugins( Operation *, SlapReply * );
-static int call_pre_referral_plugins( Operation *, SlapReply * );
-static int call_pre_entry_plugins( Operation *, SlapReply *, int * );
-#endif /* LDAP_SLAPI */
-
const struct berval slap_dummy_bv = BER_BVNULL;
int slap_null_cb( Operation *op, SlapReply *rs )
err, sock_errstr(err), 0 );
if ( err != EWOULDBLOCK && err != EAGAIN ) {
- connection_closing( conn );
+ connection_closing( conn, "connection lost on write" );
ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
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;
- }
+ for( ; *c != NULL; c++) {
+ rc = send_ldap_control( ber, *c );
+ if( rc == -1 ) return rc;
}
#ifdef LDAP_DEVEL
ber_init2( sber, NULL, LBER_USE_DER );
- ber_printf( sber, "{i}", LDAP_UNWILLING_TO_PERFORM );
+ ber_printf( sber, "{e}", LDAP_UNWILLING_TO_PERFORM );
if( ber_flatten2( ber, &sorted.ldctl_value, 0 ) == -1 ) {
return -1;
}
#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;
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( &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 );
}
}
-#ifdef LDAP_SLAPI
- (void) call_pre_result_plugins( op, rs );
-#endif /* LDAP_SLAPI */
-
if ( op->o_protocol < LDAP_VERSION3 ) {
tmp = v2ref( rs->sr_ref, rs->sr_text );
rs->sr_text = tmp;
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 ( 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
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 ( 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
rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 );
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 );
+ }
}
int
char *edn;
int userattrs;
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;
*sc_next = op->o_callback;
rc = SLAP_CB_CONTINUE;
- for ( sc_next = op->o_callback; sc_next; 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_response ) {
rc = op->o_callback->sc_response( op, rs );
attrsonly = op->ors_attrsonly;
-#ifdef notdef
- rc = call_pre_entry_plugins( op, rs, &attrsonly );
- if ( rc < 0 ) {
- goto error_return;
- }
-#endif /* LDAP_SLAPI */
-
if ( !access_allowed( op, rs->sr_entry, ad_entry, NULL, ACL_READ, NULL )) {
Debug( LDAP_DEBUG_ACL,
"send_search_entry: conn %lu access to entry (%s) not allowed\n",
struct berval bv;
bv.bv_len = entry_flatsize( rs->sr_entry, 0 );
- bv.bv_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx );
+ 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 );
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;
}
/* specific attrs requested */
if ( is_at_operational( desc->ad_type ) ) {
if ( !SLAP_OPATTRS( rs->sr_attr_flags ) &&
- !ad_inlist( desc, rs->sr_attrs ) )
+ !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;
}
}
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;
}
/* specific attrs requested */
if( is_at_operational( desc->ad_type ) ) {
if ( !SLAP_OPATTRS( rs->sr_attr_flags ) &&
- !ad_inlist( desc, rs->sr_attrs ) )
+ !ad_inlist( desc, rs->sr_attrs ) )
{
continue;
}
}
}
-#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 = attrsonly;
- ctx.cac_userattrs = userattrs;
- ctx.cac_opattrs = rs->sr_attr_flags;
- 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 );
"=> send_search_reference: dn=\"%s\"\n",
rs->sr_entry ? rs->sr_entry->e_name.bv_val : "(null)", 0, 0 );
-#ifdef notdef
- rc = call_pre_referral_plugins( op, rs );
- if ( rc < 0 )
- goto rel;
-#endif /* LDAP_SLAPI */
-
if ( rs->sr_entry && ! access_allowed( op, rs->sr_entry,
ad_entry, NULL, ACL_READ, NULL ) )
{
#ifdef LDAP_CONNECTIONLESS
}
#endif
+ if ( rs->sr_ref != NULL ) {
+ int r;
- 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 );
+ 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 );
+ }
Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
myop = *op;
myop.o_bd = NULL;
myop.o_res_ber = ber;
+ myop.o_callback = NULL;
rc = slap_send_search_entry( &myop, rs );
if( rc ) return rc;
return flags;
}
-#ifdef LDAP_SLAPI
-static AttributeName *charray2anlist( Operation *op, char **attrs )
-{
- AttributeName *an;
- int i;
-
- if ( attrs != NULL ) {
- for ( i = 0; attrs[i] != NULL; i++ )
- ;
- an = (AttributeName *)op->o_tmpalloc( (i + 1) * sizeof(AttributeName), op->o_tmpmemctx );
- for ( i = 0; attrs[i] != NULL; i++ ) {
- const char *dummy;
-
- an[i].an_name.bv_val = attrs[i];
- an[i].an_name.bv_len = strlen( attrs[i] );
- an[i].an_oc = NULL;
- an[i].an_oc_exclude = 0;
- slap_bv2ad( &an[i].an_name, &an[i].an_desc, &dummy );
- }
- } else {
- an = NULL;
- }
-
- return an;
-}
-
-/*
- * Call pre-response plugins. To avoid infinite recursion plugins
- * should just set SLAPI_RESULT_CODE rather than sending a
- * result if they wish to change the result. Similarly, pre-entry
- * plugins can either abort sending the entry or change the list
- * of sent attributes, but they can't call send_search_entry().
- */
-
-static int call_pre_entry_plugins( Operation *op, SlapReply *rs, int *pAttributesOnly )
-{
- int rc;
- char **attrs = NULL;
- char **filteredAttributes = NULL;
- Slapi_PBlock *pb;
-
- if ( op->o_callback != NULL || op->o_pb == NULL ) {
- return 0;
- }
-
- /*
- * A new parameter block is allocated to avoid trampling on the
- * operation SLAPI state.
- */
- pb = slapi_pblock_new();
-
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_RESCONTROLS, (void *)rs->sr_ctrls );
- attrs = anlist2charray_x( op->ors_attrs, 0, op->o_tmpmemctx );
- slapi_pblock_set( pb, SLAPI_SEARCH_ATTRS, (void *)attrs );
- slapi_pblock_set( pb, SLAPI_SEARCH_ATTRSONLY, (void *)*pAttributesOnly );
- slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, (void *)rs->sr_entry );
-
- rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_ENTRY_FN, pb );
- if ( rc < 0 ) {
- slapi_pblock_destroy( pb );
- return rc;
- }
-
- slapi_pblock_get( pb, SLAPI_RESCONTROLS, (void **)&rs->sr_ctrls );
- slapi_pblock_get( pb, SLAPI_SEARCH_ATTRS, (void **)&filteredAttributes );
- slapi_pblock_get( pb, SLAPI_SEARCH_ATTRSONLY, (void **)pAttributesOnly );
- slapi_pblock_get( pb, SLAPI_SEARCH_RESULT_ENTRY, (void **)&rs->sr_entry );
-
- if ( filteredAttributes != attrs ) {
- /*
- * Support for filtering attributes; useful for implementing
- * replication providers
- */
- rs->sr_attrs = charray2anlist( op, filteredAttributes );
- slapi_ch_free( (void **)&filteredAttributes );
- }
-
- slapi_pblock_set( pb, SLAPI_RESCONTROLS, NULL );
- slapi_pblock_destroy( pb );
-
- return rc;
-}
-
-static int call_pre_result_plugins( Operation *op, SlapReply *rs )
-{
- int rc;
-
- if ( op->o_callback != NULL || op->o_pb == NULL ) {
- return 0;
- }
-
- slapi_int_pblock_set_operation( op->o_pb, op );
- slapi_pblock_set( op->o_pb, SLAPI_RESCONTROLS, (void *)rs->sr_ctrls );
- 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 );
-
- rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_RESULT_FN, op->o_pb );
- if ( rc < 0 ) {
- return rc;
- }
-
- slapi_pblock_get( op->o_pb, SLAPI_RESCONTROLS, (void **)&rs->sr_ctrls );
- slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void **)&rs->sr_err );
- slapi_pblock_get( op->o_pb, SLAPI_RESULT_TEXT, (void **)&rs->sr_text );
- slapi_pblock_get( op->o_pb, SLAPI_RESULT_MATCHED, (void **)&rs->sr_matched );
-
- slapi_pblock_set( op->o_pb, SLAPI_RESCONTROLS, NULL );
-
- return rc;
-}
-
-static int call_pre_referral_plugins( Operation *op, SlapReply *rs )
-{
- int rc;
- Slapi_PBlock *pb;
-
- if ( op->o_callback != NULL || op->o_pb == NULL ) {
- return 0;
- }
-
- /*
- * A new parameter block is allocated to avoid trampling on the
- * operation SLAPI state.
- */
- pb = slapi_pblock_new();
-
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_RESCONTROLS, (void *)rs->sr_ctrls );
- slapi_pblock_set( pb, SLAPI_SEARCH_RESULT_ENTRY, (void *)rs->sr_entry );
-
- rc = slapi_int_call_plugins( op->o_bd, SLAPI_PLUGIN_PRE_REFERRAL_FN, pb );
- if ( rc < 0 ) {
- return rc;
- }
-
- slapi_pblock_get( pb, SLAPI_RESCONTROLS, (void **)&rs->sr_ctrls );
- slapi_pblock_get( pb, SLAPI_SEARCH_RESULT_ENTRY, (void **)&rs->sr_entry );
-
- slapi_pblock_set( pb, SLAPI_RESCONTROLS, NULL );
- slapi_pblock_destroy( pb );
-
- return rc;
-}
-#endif /* LDAP_SLAPI */
projects / openldap / blobdiff