ITS#3773 additional fix

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 30532922b9522a66837d07b8453bf5dbd5927bb0..a162b20068be6af2607b28996036f4123a27a173 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,7 +1,7 @@
 /* $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
@@ -30,7 +30,6 @@
 #include <ac/string.h>
 #include <ac/socket.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 
@@ -148,7 +147,7 @@ do_search(
                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 );
 
@@ -165,7 +164,8 @@ do_search(
                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 ) {
@@ -190,9 +190,9 @@ do_search(
 
                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;
@@ -200,8 +200,8 @@ do_search(
                                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;
                        }
@@ -214,8 +214,8 @@ do_search(
                        *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 );
                }
        }
 
@@ -223,12 +223,6 @@ do_search(
        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 );
        }
@@ -350,17 +344,7 @@ fe_op_search( Operation *op, SlapReply *rs )
         * 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 ) {
@@ -369,7 +353,9 @@ fe_op_search( Operation *op, SlapReply *rs )
 
                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 );