int scope,
int deref,
ID *ids );
-#ifdef LDAP_CONTROL_PAGEDRESULTS
static void send_pagerequest_response(
Connection *conn,
Operation *op,
ID lastid,
- int nentries );
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
+ int nentries,
+ int tentries );
int
bdb_search(
struct berval realbase = { 0, NULL };
int nentries = 0;
int manageDSAit;
-#ifdef LDAP_CONTROL_PAGEDRESULTS
int pagedresults;
+ int tentries = 0;
ID lastid = NOID;
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
#ifdef LDAP_CLIENT_UPDATE
Filter lcupf, csnfnot, csnfeq, csnfand, csnfge;
manageDSAit = get_manageDSAit( op );
-
-#ifdef LDAP_CONTROL_PAGEDRESULTS
pagedresults = get_pagedresults( op );
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
rc = LOCK_ID (bdb->bi_dbenv, &locker );
switch(rc) {
/* if requested limit higher than hard limit, abort */
} else if ( tlimit > limit->lms_t_hard ) {
/* no hard limit means use soft instead */
- if ( limit->lms_t_hard == 0 && tlimit > limit->lms_t_soft ) {
+ if ( limit->lms_t_hard == 0
+ && limit->lms_t_soft > -1
+ && tlimit > limit->lms_t_soft ) {
tlimit = limit->lms_t_soft;
/* positive hard limit means abort */
} else if ( limit->lms_t_hard > 0 ) {
send_search_result( conn, op,
- LDAP_UNWILLING_TO_PERFORM,
+ LDAP_ADMINLIMIT_EXCEEDED,
NULL, NULL, NULL, NULL, 0 );
rc = 0;
goto done;
/* if no limit is required, use soft limit */
if ( slimit <= 0 ) {
- slimit = limit->lms_s_soft;
+ if ( pagedresults && limit->lms_s_pr != 0 ) {
+ slimit = limit->lms_s_pr;
+ } else {
+ slimit = limit->lms_s_soft;
+ }
/* if requested limit higher than hard limit, abort */
} else if ( slimit > limit->lms_s_hard ) {
/* no hard limit means use soft instead */
- if ( limit->lms_s_hard == 0 && slimit > limit->lms_s_soft ) {
+ if ( limit->lms_s_hard == 0
+ && limit->lms_s_soft > -1
+ && slimit > limit->lms_s_soft ) {
slimit = limit->lms_s_soft;
/* positive hard limit means abort */
} else if ( limit->lms_s_hard > 0 ) {
send_search_result( conn, op,
- LDAP_UNWILLING_TO_PERFORM,
+ LDAP_ADMINLIMIT_EXCEEDED,
NULL, NULL, NULL, NULL, 0 );
rc = 0;
goto done;
}
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
+ if ( isroot || !limit->lms_s_pr_hide ) {
+ tentries = BDB_IDL_N(candidates);
+ }
+
if ( pagedresults ) {
if ( op->o_pagedresults_state.ps_cookie == 0 ) {
id = 0;
"bdb_search: no paged results candidates\n",
0, 0, 0 );
#endif
- send_pagerequest_response( conn, op, lastid, 0 );
+ send_pagerequest_response( conn, op, lastid, 0, 0 );
rc = 1;
goto done;
}
goto loop_begin;
}
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
#ifdef LDAP_CLIENT_UPDATE
if ( op->o_clientupdate_type & SLAP_LCUP_SYNC ) {
int scopeok = 0;
-#ifdef LDAP_CONTROL_PAGEDRESULTS
loop_begin:
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
-
/* check for abandon */
if ( op->o_abandon ) {
rc = 0;
v2refs, NULL, nentries );
goto done;
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
+
if ( pagedresults ) {
if ( nentries >= op->o_pagedresults_size ) {
- send_pagerequest_response( conn, op, lastid, nentries );
+ send_pagerequest_response( conn, op, lastid, nentries, tentries );
goto done;
}
lastid = id;
}
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
if (e) {
int result;
int res;
const char *text = NULL;
LDAPControl *ctrls[2];
- struct berval *bv;
+ char berbuf[LBER_ELEMENT_SIZEOF];
+ BerElement *ber = (BerElement *)berbuf;
- BerElement *ber = ber_alloc_t( LBER_USE_DER );
-
- if ( ber == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: ber_alloc_t failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_search: ber_alloc_t failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc=LDAP_OTHER,
- NULL, "internal error", NULL, NULL );
- goto done;
- }
+ ber_init2( ber, 0, LBER_USE_DER );
entry_count++;
ctrls[0]->ldctl_oid = LDAP_CONTROL_ENTRY_UPDATE;
ctrls[0]->ldctl_iscritical = op->o_clientupdate;
- ret = ber_flatten( ber, &bv );
-
+ ret = ber_flatten2( ber, &ctrls[0]->ldctl_value, 0 );
if ( ret < 0 ) {
+ ber_free_buf( ber );
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: ber_flatten failed\n",
+ "bdb_search: ber_flatten2 failed\n",
0, 0, 0 );
#else
Debug( LDAP_DEBUG_TRACE,
- "bdb_search: ber_flatten failed\n",
+ "bdb_search: ber_flatten2 failed\n",
0, 0, 0 );
#endif
send_ldap_result( conn, op, rc=LDAP_OTHER,
goto done;
}
- ber_dupbv( &ctrls[0]->ldctl_value, bv );
-
result = send_search_entry( be, conn, op,
e, attrs, attrsonly, ctrls);
- ch_free( ctrls[0]->ldctl_value.bv_val );
+ ber_free_buf( ber );
ch_free( ctrls[0] );
- ber_free( ber, 1 );
- ber_bvfree( bv );
} else
#endif /* LDAP_CLIENT_UPDATE */
{
if ( op->o_clientupdate_type & SLAP_LCUP_SYNC ) {
int ret;
LDAPControl *ctrls[2];
- BerElement *ber = ber_alloc_t( LBER_USE_DER );
- struct berval *bv;
+ char berbuf[LBER_ELEMENT_SIZEOF];
+ BerElement *ber = (BerElement *)berbuf;
- if ( ber == NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: ber_alloc_t failed\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE, "bdb_search: ber_alloc_t failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_result( conn, op, rc=LDAP_OTHER,
- NULL, "internal error", NULL, NULL );
- goto done;
- }
+ ber_init2( ber, NULL, LBER_USE_DER );
ctrls[0] = ch_malloc ( sizeof ( LDAPControl ) );
ctrls[1] = NULL;
ctrls[0]->ldctl_oid = LDAP_CONTROL_CLIENT_UPDATE_DONE;
ctrls[0]->ldctl_iscritical = op->o_clientupdate;
- ret = ber_flatten( ber, &bv );
+ ret = ber_flatten2( ber, &ctrls[0]->ldctl_value, 0 );
if ( ret < 0 ) {
+ ber_free_buf( ber );
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: ber_flatten failed\n", 0, 0, 0 );
+ "bdb_search: ber_flatten2 failed\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "bdb_search: ber_flatten failed\n",
+ Debug( LDAP_DEBUG_TRACE, "bdb_search: ber_flatten2 failed\n",
0, 0, 0 );
#endif
send_ldap_result( conn, op, rc=LDAP_OTHER,
goto done;
}
- ber_dupbv( &ctrls[0]->ldctl_value, bv );
-
send_search_result( conn, op,
v2refs == NULL ? LDAP_SUCCESS : LDAP_REFERRAL,
NULL, NULL, v2refs, ctrls, nentries );
ch_free( latest_entrycsn_bv.bv_val );
latest_entrycsn_bv.bv_val = NULL;
- ch_free( ctrls[0]->ldctl_value.bv_val );
ch_free( ctrls[0] );
- ber_free( ber, 1 );
- ber_bvfree( bv );
+ ber_free_buf( ber );
} else
#endif /* LDAP_CLIENT_UPDATE */
{
return rc;
}
+static void search_stack_free( void *key, void *data)
+{
+ ch_free(data);
+}
+
+static void *search_stack(
+ BackendDB *be,
+ Operation *op
+)
+{
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+ void *ret = NULL;
+
+ if ( op->o_threadctx ) {
+ ldap_pvt_thread_pool_getkey( op->o_threadctx, search_stack,
+ &ret, NULL );
+ } else {
+ ret = bdb->bi_search_stack;
+ }
+
+ if ( !ret ) {
+ ret = ch_malloc( bdb->bi_search_stack_depth * BDB_IDL_UM_SIZE * sizeof( ID ) );
+ if ( op->o_threadctx ) {
+ ldap_pvt_thread_pool_setkey( op->o_threadctx, search_stack,
+ ret, search_stack_free );
+ } else {
+ bdb->bi_search_stack = ret;
+ }
+ }
+ return ret;
+}
+
static int search_candidates(
BackendDB *be,
Operation *op,
int deref,
ID *ids )
{
+ struct bdb_info *bdb = (struct bdb_info *) be->be_private;
int rc, depth = 1;
Filter f, scopef, rf, xf;
ID *stack;
#endif
/* Allocate IDL stack, plus 1 more for former tmp */
- stack = ch_malloc( (depth + 1) * BDB_IDL_UM_SIZE * sizeof( ID ) );
+ if ( depth+1 > bdb->bi_search_stack_depth ) {
+ stack = ch_malloc( (depth + 1) * BDB_IDL_UM_SIZE * sizeof( ID ) );
+ } else {
+ stack = search_stack( be, op );
+ }
rc = bdb_filter_candidates( be, &f, ids, stack, stack+BDB_IDL_UM_SIZE );
- ch_free( stack );
+ if ( depth+1 > bdb->bi_search_stack_depth ) {
+ ch_free( stack );
+ }
if( rc ) {
#ifdef NEW_LOGGING
return rc;
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
static void
send_pagerequest_response(
Connection *conn,
Operation *op,
ID lastid,
- int nentries )
+ int nentries,
+ int tentries )
{
LDAPControl ctrl, *ctrls[2];
- BerElement *ber;
- struct berval *bvalp, cookie = { 0, NULL };
+ char berbuf[LBER_ELEMENT_SIZEOF];
+ BerElement *ber = (BerElement *)berbuf;
+ struct berval cookie = { 0, NULL };
PagedResultsCookie respcookie;
#ifdef NEW_LOGGING
LDAP_LOG ( OPERATION, ENTRY,
"send_pagerequest_response: lastid: (0x%08lx) "
"nentries: (0x%081x)\n",
- lastid, nentries );
+ lastid, nentries, NULL );
#else
Debug(LDAP_DEBUG_ARGS, "send_pagerequest_response: lastid: (0x%08lx) "
"nentries: (0x%081x)\n", lastid, nentries, NULL );
ctrls[0] = &ctrl;
ctrls[1] = NULL;
- if (( ber = ber_alloc_t(LBER_USE_DER)) == NULL ) {
- goto done;
- }
+ ber_init2( ber, NULL, LBER_USE_DER );
respcookie = ( PagedResultsCookie )lastid;
conn->c_pagedresults_state.ps_cookie = respcookie;
* FIXME: we should consider sending an estimate of the entries
* left, after appropriate security check is done
*/
- ber_printf( ber, "{iO}", 0, &cookie );
+ ber_printf( ber, "{iO}", tentries, &cookie );
- if ( ber_flatten( ber, &bvalp ) == LBER_ERROR ) {
+ if ( ber_flatten2( ber, &ctrls[0]->ldctl_value, 0 ) == LBER_ERROR ) {
goto done;
}
ctrls[0]->ldctl_oid = LDAP_CONTROL_PAGEDRESULTS;
- ctrls[0]->ldctl_value = ( *bvalp );
ctrls[0]->ldctl_iscritical = 0;
send_search_result( conn, op,
NULL, NULL, NULL, ctrls, nentries );
done:
- if ( ctrls[0]->ldctl_value.bv_val ) {
- ch_free( ctrls[0]->ldctl_value.bv_val );
- }
+ (void) ber_free_buf( ber );
}
-#endif /* LDAP_CONTROL_PAGEDRESULTS */
projects / openldap / blobdiff