/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
struct berval base = BER_BVNULL;
ber_len_t siz, off, i;
- Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
-
+ Debug( LDAP_DEBUG_TRACE, "%s do_search\n",
+ op->o_log_prefix, 0, 0 );
/*
* Parse the search request. It looks like this:
*
rs->sr_err = dnPrettyNormal( NULL, &base, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
if( rs->sr_err != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY,
- "do_search: invalid dn (%s)\n", base.bv_val, 0, 0 );
+ Debug( LDAP_DEBUG_ANY, "%s do_search: invalid dn (%s)\n",
+ op->o_log_prefix, base.bv_val, 0 );
send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
goto return_results;
}
}
if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
-
+ Debug( LDAP_DEBUG_ANY, "%s do_search: get_ctrls failed\n",
+ op->o_log_prefix, 0, 0 );
goto return_results;
}
{
BackendDB *bd = op->o_bd;
- /* fake while loop to allow breaking out */
- while ( op->ors_scope == LDAP_SCOPE_BASE ) {
+ if ( op->ors_scope == LDAP_SCOPE_BASE ) {
Entry *entry = NULL;
if ( BER_BVISEMPTY( &op->o_req_ndn ) ) {
send_ldap_result( op, rs );
goto return_results;
}
- break;
}
if( BER_BVISEMPTY( &op->o_req_ndn ) && !BER_BVISEMPTY( &default_search_nbase ) ) {