Fix prev commit

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index dfa96b9c185510c301cbda35c97dec0944a4562d..39ca34f4b17eae260057f353906d94d74c88d9f4 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -245,7 +245,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 ) {
@@ -262,16 +263,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 */
@@ -281,22 +281,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;
 
@@ -314,10 +313,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 ) {
@@ -334,20 +334,12 @@ do_search(
         * if we don't hold it.
         */
 
-       /* Sync / LCUP controls override manageDSAit */
+       /* Sync control overrides manageDSAit */
 
        if ( manageDSAit != SLAP_NO_CONTROL ) {
-#ifdef LDAP_CLIENT_UPDATE
-               if ( op->o_clientupdate_type & SLAP_LCUP_SYNC ) {
-                       be_manageDSAit = SLAP_NO_CONTROL;
-               } else
-#endif
-#ifdef LDAP_SYNC
                if ( op->o_sync_mode & SLAP_SYNC_REFRESH ) {
                        be_manageDSAit = SLAP_NO_CONTROL;
-               } else
-#endif
-               {
+               } else {
                        be_manageDSAit = manageDSAit;
                }
        } else {
@@ -380,14 +372,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) */
@@ -399,22 +393,13 @@ 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_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 );