/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <ac/string.h>
#include <ac/socket.h>
-#include "ldap_pvt.h"
#include "lutil.h"
#include "slap.h"
#ifdef LDAP_SLAPI
#include "slapi/slapi.h"
-static char **anlist2charray( Operation *op, AttributeName *an );
static void init_search_pblock( Operation *op, char **attrs, int managedsait );
static int call_search_preop_plugins( Operation *op );
static int call_search_rewrite_plugins( Operation *op );
goto return_results;
}
filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
-
+
Debug( LDAP_DEBUG_ARGS, " filter: %s\n",
!BER_BVISEMPTY( &op->ors_filterstr ) ? op->ors_filterstr.bv_val : "empty", 0, 0 );
op->ors_attrs[i].an_desc = NULL;
op->ors_attrs[i].an_oc = NULL;
op->ors_attrs[i].an_oc_exclude = 0;
- slap_bv2ad(&op->ors_attrs[i].an_name, &op->ors_attrs[i].an_desc, &dummy);
+ slap_bv2ad(&op->ors_attrs[i].an_name,
+ &op->ors_attrs[i].an_desc, &dummy);
}
if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
sprintf(abuf, "scope=%d deref=%d", op->ors_scope, op->ors_deref);
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu SRCH base=\"%s\" %s filter=\"%s\"\n",
- op->o_connid, op->o_opid, op->o_req_dn.bv_val, abuf,
- op->ors_filterstr.bv_val );
+ "%s SRCH base=\"%s\" %s filter=\"%s\"\n",
+ op->o_log_prefix, op->o_req_dn.bv_val, abuf,
+ op->ors_filterstr.bv_val, 0 );
for ( i = 0; i<siz; i++ ) {
alen = op->ors_attrs[i].an_name.bv_len;
alen = sizeof(abuf)-1;
}
if (len && (len + 1 + alen >= sizeof(abuf))) {
- Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu SRCH attr=%s\n",
- op->o_connid, op->o_opid, abuf, 0, 0 );
+ Statslog( LDAP_DEBUG_STATS, "%s SRCH attr=%s\n",
+ op->o_log_prefix, abuf, 0, 0, 0 );
len = 0;
ptr = abuf;
}
*ptr = '\0';
}
if (len) {
- Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu SRCH attr=%s\n",
- op->o_connid, op->o_opid, abuf, 0, 0 );
+ Statslog( LDAP_DEBUG_STATS, "%s SRCH attr=%s\n",
+ op->o_log_prefix, abuf, 0, 0, 0 );
}
}
rs->sr_err = frontendDB->be_search( op, rs );
return_results:;
- if ( ( op->o_sync_mode & SLAP_SYNC_PERSIST ) ) {
- return rs->sr_err;
- }
- if ( ( op->o_sync_slog_size != -1 ) ) {
- return rs->sr_err;
- }
if ( !BER_BVISNULL( &op->o_req_dn ) ) {
slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
}
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
- attrs = anlist2charray( op, op->ors_attrs );
+ attrs = anlist2charray_x( op->ors_attrs, 0, op->o_tmpmemctx );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err ) break;
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
- attrs = anlist2charray( op, op->ors_attrs );
+ attrs = anlist2charray_x( op->ors_attrs, 0, op->o_tmpmemctx );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err ) break;
* if we don't hold it.
*/
- /* Sync control overrides manageDSAit */
-
- if ( manageDSAit != SLAP_NO_CONTROL ) {
- if ( op->o_sync_mode & SLAP_SYNC_REFRESH ) {
- be_manageDSAit = SLAP_NO_CONTROL;
- } else {
- be_manageDSAit = manageDSAit;
- }
- } else {
- be_manageDSAit = manageDSAit;
- }
+ be_manageDSAit = manageDSAit;
op->o_bd = select_backend( &op->o_req_ndn, be_manageDSAit, 1 );
if ( op->o_bd == NULL ) {
if (!rs->sr_ref) rs->sr_ref = default_referral;
rs->sr_err = LDAP_REFERRAL;
+ op->o_bd = frontendDB;
send_ldap_result( op, rs );
+ op->o_bd = NULL;
if (rs->sr_ref != default_referral)
ber_bvarray_free( rs->sr_ref );
#ifdef LDAP_SLAPI
if ( op->o_pb ) {
- attrs = anlist2charray( op, op->ors_attrs );
+ attrs = anlist2charray_x( op->ors_attrs, 0, op->o_tmpmemctx );
init_search_pblock( op, attrs, manageDSAit );
rs->sr_err = call_search_preop_plugins( op );
if ( rs->sr_err != LDAP_SUCCESS ) {
#ifdef LDAP_SLAPI
-static char **anlist2charray( Operation *op, AttributeName *an )
-{
- char **attrs;
- int i;
-
- if ( an != NULL ) {
- for ( i = 0; !BER_BVISNULL( &an[i].an_name ); i++ )
- ;
- attrs = (char **)op->o_tmpalloc( (i + 1) * sizeof(char *), op->o_tmpmemctx );
- for ( i = 0; !BER_BVISNULL( &an[i].an_name ); i++ ) {
- attrs[i] = an[i].an_name.bv_val;
- }
- attrs[i] = NULL;
- } else {
- attrs = NULL;
- }
-
- return attrs;
-}
-
static void init_search_pblock( Operation *op,
char **attrs, int managedsait )
{