Changes from HEAD for beta

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index c033b1fe7be8f853182118b66883ad88f3727b63..71c8960611aece6f804d8c6345d578054410cf80 100644 (file)
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -212,9 +212,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; i<siz; i++ ) {
                        alen = op->ors_attrs[i].an_name.bv_len;
@@ -224,7 +226,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) {
@@ -332,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 {
@@ -402,17 +396,8 @@ do_search(
 
 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 );