/* $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
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 );
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 ) {
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 );
}
break;
}
- if( BER_BVISEMPTY( &op->o_req_ndn ) && !BER_BVISEMPTY( &SLAPD_GLOBAL(default_search_nbase) ) ) {
+ if( BER_BVISEMPTY( &op->o_req_ndn ) && !BER_BVISEMPTY( &default_search_nbase ) ) {
slap_sl_free( op->o_req_dn.bv_val, op->o_tmpmemctx );
slap_sl_free( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- ber_dupbv_x( &op->o_req_dn, &SLAPD_GLOBAL(default_search_base), op->o_tmpmemctx );
- ber_dupbv_x( &op->o_req_ndn, &SLAPD_GLOBAL(default_search_nbase), op->o_tmpmemctx );
+ ber_dupbv_x( &op->o_req_dn, &default_search_base, op->o_tmpmemctx );
+ ber_dupbv_x( &op->o_req_ndn, &default_search_nbase, op->o_tmpmemctx );
}
/*
* if we don't hold it.
*/
+#if 0 /* DELETE ME */
/* Sync control overrides manageDSAit */
- if ( manageDSAit != SLAP_NO_CONTROL ) {
+ if ( manageDSAit != SLAP_CONTROL_NONE ) {
if ( op->o_sync_mode & SLAP_SYNC_REFRESH ) {
- be_manageDSAit = SLAP_NO_CONTROL;
+ be_manageDSAit = SLAP_CONTROL_NONE;
} else {
be_manageDSAit = manageDSAit;
}
} 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 ) {
- rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+ rs->sr_ref = referral_rewrite( default_referral,
NULL, &op->o_req_dn, op->ors_scope );
- if (!rs->sr_ref) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+ if (!rs->sr_ref) rs->sr_ref = default_referral;
rs->sr_err = LDAP_REFERRAL;
send_ldap_result( op, rs );
- if (rs->sr_ref != SLAPD_GLOBAL(default_referral))
+ if (rs->sr_ref != default_referral)
ber_bvarray_free( rs->sr_ref );
rs->sr_ref = NULL;
goto return_results;