minor naming cleanup; improvements to DN mapping layer; major docs update

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 6b555b4bf3e9af7cd93ce10fb12f76f6cc93d35d..5da8472fa95b8ccea3df202fff13d4bc73d49d88 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
@@ -164,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 ) {
@@ -222,12 +223,14 @@ do_search(
        rs->sr_err = frontendDB->be_search( op, rs );
 
 return_results:;
+#if 0  /* DELETE ME */
        if ( ( op->o_sync_mode & SLAP_SYNC_PERSIST ) ) {
                return rs->sr_err;
        }
        if ( ( op->o_sync_slog_size != -1 ) ) {
                return rs->sr_err;
        }
+#endif
        if ( !BER_BVISNULL( &op->o_req_dn ) ) {
                slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
        }
@@ -349,6 +352,7 @@ fe_op_search( Operation *op, SlapReply *rs )
         * if we don't hold it.
         */
 
+#if 0  /* DELETE ME */
        /* Sync control overrides manageDSAit */
 
        if ( manageDSAit != SLAP_CONTROL_NONE ) {
@@ -360,6 +364,9 @@ fe_op_search( Operation *op, SlapReply *rs )
        } else {
                be_manageDSAit = manageDSAit;
        }
+#else
+               be_manageDSAit = manageDSAit;
+#endif
 
        op->o_bd = select_backend( &op->o_req_ndn, be_manageDSAit, 1 );
        if ( op->o_bd == NULL ) {