X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=816df11c40041e09535737d48ae5f8bc0e8d92a3;hb=12d5c6bba210de4a03363567be1c19a37f8e806b;hp=6c30fe2b2220988c7f71525d8b8e3057cb24cbe2;hpb=0e46e4a7af51eaf31845b373a86ea97349f04756;p=openldap
diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 6c30fe2b22..816df11c40 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,10 +1,18 @@
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * .
*/
-/* Portions
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
@@ -43,6 +51,7 @@ do_search(
struct berval base = { 0, NULL };
ber_len_t siz, off, i;
int manageDSAit;
+ int be_manageDSAit;
#ifdef LDAP_SLAPI
char **attrs = NULL;
#endif
@@ -158,7 +167,7 @@ do_search(
/* attributes */
siz = sizeof(AttributeName);
- off = 0;
+ off = offsetof(AttributeName,an_name);
if ( ber_scanf( op->o_ber, "{M}}", &op->ors_attrs, &siz, off ) == LBER_ERROR ) {
send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding attrs error" );
rs->sr_err = SLAPD_DISCONNECT;
@@ -211,9 +220,11 @@ do_search(
char abuf[BUFSIZ/2], *ptr = abuf;
int len = 0, alen;
+ sprintf(abuf, "scope=%d deref=%d", op->ors_scope, op->ors_deref);
Statslog( LDAP_DEBUG_STATS,
- "conn=%lu op=%lu SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
- op->o_connid, op->o_opid, op->o_req_dn.bv_val, op->ors_scope, op->ors_filterstr.bv_val );
+ "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 );
for ( i = 0; iors_attrs[i].an_name.bv_len;
@@ -223,7 +234,7 @@ do_search(
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 );
- len = 0;
+ len = 0;
ptr = abuf;
}
if (len) {
@@ -242,7 +253,8 @@ do_search(
manageDSAit = get_manageDSAit( op );
- if ( op->ors_scope == LDAP_SCOPE_BASE ) {
+ /* fake while loop to allow breaking out */
+ while ( op->ors_scope == LDAP_SCOPE_BASE ) {
Entry *entry = NULL;
if ( op->o_req_ndn.bv_len == 0 ) {
@@ -259,16 +271,15 @@ do_search(
}
#ifdef LDAP_SLAPI
- attrs = anlist2charray( op, op->ors_attrs );
- initSearchPlugin( op, attrs, manageDSAit );
- rs->sr_err = doPreSearchPluginFNs( op );
- if ( rs->sr_err == LDAP_SUCCESS ) {
+ if ( op->o_pb ) {
+ attrs = anlist2charray( op, op->ors_attrs );
+ initSearchPlugin( op, attrs, manageDSAit );
+ rs->sr_err = doPreSearchPluginFNs( op );
+ if ( rs->sr_err ) break;
doSearchRewriteFNs( op );
-#endif /* LDAP_SLAPI */
- rs->sr_err = root_dse_info( op->o_conn, &entry, &rs->sr_text );
-#ifdef LDAP_SLAPI
}
#endif /* LDAP_SLAPI */
+ rs->sr_err = root_dse_info( op->o_conn, &entry, &rs->sr_text );
} else if ( bvmatch( &op->o_req_ndn, &global_schemandn ) ) {
/* check restrictions */
@@ -278,22 +289,21 @@ do_search(
}
#ifdef LDAP_SLAPI
- attrs = anlist2charray( op, op->ors_attrs );
- initSearchPlugin( op, attrs, manageDSAit );
- rs->sr_err = doPreSearchPluginFNs( op );
- if ( rs->sr_err == LDAP_SUCCESS ) {
+ if ( op->o_pb ) {
+ attrs = anlist2charray( op, op->ors_attrs );
+ initSearchPlugin( op, attrs, manageDSAit );
+ rs->sr_err = doPreSearchPluginFNs( op );
+ if ( rs->sr_err ) break;
doSearchRewriteFNs( op );
-#endif /* LDAP_SLAPI */
- rs->sr_err = schema_info( &entry, &rs->sr_text );
-#ifdef LDAP_SLAPI
}
#endif /* LDAP_SLAPI */
+ rs->sr_err = schema_info( &entry, &rs->sr_text );
}
if( rs->sr_err != LDAP_SUCCESS ) {
send_ldap_result( op, rs );
#ifdef LDAP_SLAPI
- doPostSearchPluginFNs( op );
+ if ( op->o_pb ) doPostSearchPluginFNs( op );
#endif /* LDAP_SLAPI */
goto return_results;
@@ -311,10 +321,11 @@ do_search(
rs->sr_err = LDAP_SUCCESS;
send_ldap_result( op, rs );
#ifdef LDAP_SLAPI
- doPostSearchPluginFNs( op );
+ if ( op->o_pb ) doPostSearchPluginFNs( op );
#endif /* LDAP_SLAPI */
goto return_results;
}
+ break;
}
if( !op->o_req_ndn.bv_len && default_search_nbase.bv_len ) {
@@ -330,7 +341,20 @@ do_search(
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- if ( (op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 )) == NULL ) {
+
+ /* 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;
+ }
+
+ if ( (op->o_bd = select_backend( &op->o_req_ndn, be_manageDSAit, 1 )) == NULL ) {
rs->sr_ref = referral_rewrite( default_referral,
NULL, &op->o_req_dn, op->ors_scope );
@@ -356,14 +380,16 @@ do_search(
}
#ifdef LDAP_SLAPI
- attrs = anlist2charray( op, op->ors_attrs );
- initSearchPlugin( op, attrs, manageDSAit );
- rs->sr_err = doPreSearchPluginFNs( op );
- if ( rs->sr_err != LDAP_SUCCESS ) {
- goto return_results;
- }
+ if ( op->o_pb ) {
+ attrs = anlist2charray( op, op->ors_attrs );
+ initSearchPlugin( op, attrs, manageDSAit );
+ rs->sr_err = doPreSearchPluginFNs( op );
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ goto return_results;
+ }
- doSearchRewriteFNs( op );
+ doSearchRewriteFNs( op );
+ }
#endif /* LDAP_SLAPI */
/* actually do the search and send the result(s) */
@@ -375,22 +401,16 @@ do_search(
}
#ifdef LDAP_SLAPI
- doPostSearchPluginFNs( op );
+ if ( op->o_pb ) doPostSearchPluginFNs( op );
#endif /* LDAP_SLAPI */
return_results:;
-#ifdef LDAP_CLIENT_UPDATE
- if ( ( op->o_clientupdate_type & SLAP_LCUP_PERSIST ) )
- return rs->sr_err;
-#endif
-#if defined(LDAP_CLIENT_UPDATE) && defined(LDAP_SYNC)
- else
-#endif
-#ifdef LDAP_SYNC
if ( ( op->o_sync_mode & SLAP_SYNC_PERSIST ) )
return rs->sr_err;
-#endif
+
+ if ( ( op->o_sync_slog_size != -1 ) )
+ return rs->sr_err;
if( op->o_req_dn.bv_val != NULL) sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
if( op->o_req_ndn.bv_val != NULL) sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
@@ -448,7 +468,7 @@ static int doPreSearchPluginFNs( Operation *op )
int rc;
rc = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_SEARCH_FN, op->o_pb );
- if ( rc != 0 ) {
+ if ( rc < 0 ) {
/*
* A preoperation plugin failure will abort the
* entire operation.
@@ -460,8 +480,10 @@ static int doPreSearchPluginFNs( Operation *op )
Debug(LDAP_DEBUG_TRACE, "doPreSearchPluginFNs: search preoperation plugin "
"returned %d.\n", rc, 0, 0);
#endif
- if ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0)
+ if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE, (void *)&rc ) != 0 ) ||
+ rc == LDAP_SUCCESS ) {
rc = LDAP_OTHER;
+ }
} else {
rc = LDAP_SUCCESS;
}
@@ -472,36 +494,44 @@ static int doPreSearchPluginFNs( Operation *op )
static int doSearchRewriteFNs( Operation *op )
{
if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_COMPUTE_SEARCH_REWRITER_FN, op->o_pb ) == 0 ) {
- Filter *f;
+ int rc;
/*
* The plugin can set the SLAPI_SEARCH_FILTER.
* SLAPI_SEARCH_STRFILER is not normative.
*/
- slapi_pblock_get( op->o_pb, SLAPI_SEARCH_FILTER, (void *)&f );
- if ( f != op->ors_filter ) {
- /* Plugin modified filter. Is pointer comparison safe? */
- /*
- * This is inefficient but it is not possible to expose the
- * new memory allocation API through SLAPI.
- *
- * Further, the plugin should be responsible for freeing
- * the original filter, but there is no way to communicate
- * the memory context through the SLAPI filter free API.
- */
- op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
- filter2bv_x( op, f, &op->ors_filterstr );
- filter_free_x( op, op->ors_filter );
- op->ors_filter = str2filter_x( op, op->ors_filterstr.bv_val );
+ slapi_pblock_get( op->o_pb, SLAPI_SEARCH_FILTER, (void *)&op->ors_filter );
+ op->o_tmpfree( op->ors_filterstr.bv_val, op->o_tmpmemctx );
+ filter2bv_x( op, op->ors_filter, &op->ors_filterstr );
+
+ /*
+ * Also permit other search parameters to be reset. One thing
+ * this doesn't (yet) deal with is plugins that change a root
+ * DSE search to a non-root DSE search...
+ */
+ slapi_pblock_get( op->o_pb, SLAPI_SEARCH_TARGET, (void **)&op->o_req_dn.bv_val );
+ op->o_req_dn.bv_len = strlen( op->o_req_dn.bv_val );
+
+ if( op->o_req_ndn.bv_val != NULL) {
+ sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
+ }
+ rc = dnNormalize( 0, NULL, NULL, &op->o_req_dn, &op->o_req_ndn,
+ op->o_tmpmemctx );
+ if ( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ slapi_pblock_get( op->o_pb, SLAPI_SEARCH_SCOPE, (void **)&op->ors_scope );
+ slapi_pblock_get( op->o_pb, SLAPI_SEARCH_DEREF, (void **)&op->ors_deref );
+
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ARGS,
- "doSearchRewriteFNs: after compute_rewrite_search filter: %s\n",
- op->ors_filterstr.bv_len ? op->ors_filterstr.bv_val : "empty", 0, 0 );
+ LDAP_LOG( OPERATION, ARGS,
+ "doSearchRewriteFNs: after compute_rewrite_search filter: %s\n",
+ op->ors_filterstr.bv_len ? op->ors_filterstr.bv_val : "empty", 0, 0 );
#else
- Debug( LDAP_DEBUG_ARGS, " after compute_rewrite_search filter: %s\n",
- op->ors_filterstr.bv_len ? op->ors_filterstr.bv_val : "empty", 0, 0 );
+ Debug( LDAP_DEBUG_ARGS, " after compute_rewrite_search filter: %s\n",
+ op->ors_filterstr.bv_len ? op->ors_filterstr.bv_val : "empty", 0, 0 );
#endif
- }
}
return LDAP_SUCCESS;
@@ -509,7 +539,7 @@ static int doSearchRewriteFNs( Operation *op )
static void doPostSearchPluginFNs( Operation *op )
{
- if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_SEARCH_FN, op->o_pb ) != 0 ) {
+ if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_SEARCH_FN, op->o_pb ) < 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, INFO, "doPostSearchPluginFNs: search postoperation plugins "
"failed\n", 0, 0, 0 );