struct berval nbase = { 0, NULL };
struct berval fstr = { 0, NULL };
Filter *filter = NULL;
- AttributeName *an;
- ber_len_t siz, off;
+ AttributeName *an = NULL;
+ ber_len_t siz, off, i;
Backend *be;
int rc;
- int i;
const char *text;
int manageDSAit;
*/
/* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */
- if ( ber_scanf( op->o_ber, "{oiiiib" /*}*/,
+ if ( ber_scanf( op->o_ber, "{miiiib" /*}*/,
&base, &scope, &deref, &sizelimit,
&timelimit, &attrsonly ) == LBER_ERROR )
{
#endif
/* filter - returns a "normalized" version */
- rc = get_filter( conn, op->o_ber, &filter, &fstr, &text );
+ rc = get_filter( conn, op->o_ber, &filter, &text );
if( rc != LDAP_SUCCESS ) {
if( rc == SLAPD_DISCONNECT ) {
send_ldap_disconnect( conn, op,
NULL, text, NULL, NULL );
}
goto return_results;
+
+ } else {
+ filter2bv( filter, &fstr );
}
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
- "do_search: conn %d filter: %s\n", conn->c_connid, fstr.bv_val ));
+ "do_search: conn %d filter: %s\n", conn->c_connid,
+ fstr.bv_len ? fstr.bv_val : "empty" ));
#else
- Debug( LDAP_DEBUG_ARGS, " filter: %s\n", fstr.bv_val, 0, 0 );
+ Debug( LDAP_DEBUG_ARGS, " filter: %s\n",
+ fstr.bv_len ? fstr.bv_val : "empty", 0, 0 );
#endif
-
/* attributes */
siz = sizeof(AttributeName);
off = 0;
- if ( ber_scanf( op->o_ber, "{w}}", &an, &siz, off ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{M}}", &an, &siz, off ) == LBER_ERROR ) {
send_ldap_disconnect( conn, op,
LDAP_PROTOCOL_ERROR, "decoding attrs error" );
rc = SLAPD_DISCONNECT;
}
for ( i=0; i<siz; i++ ) {
an[i].an_desc = NULL;
+ an[i].an_oc = NULL;
slap_bv2ad(&an[i].an_name, &an[i].an_desc, &text);
}
#endif
goto return_results;
- }
-
- rc = LDAP_SUCCESS;
+ }
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
Debug( LDAP_DEBUG_ARGS, " attrs:", 0, 0, 0 );
#endif
-
if ( siz != 0 ) {
for ( i = 0; i<siz; i++ ) {
#ifdef NEW_LOGGING
#else
Debug( LDAP_DEBUG_ARGS, " %s", an[i].an_name.bv_val, 0, 0 );
#endif
-
}
}
#endif
Statslog( LDAP_DEBUG_STATS,
- "conn=%ld op=%d SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
+ "conn=%lu op=%lu SRCH base=\"%s\" scope=%d filter=\"%s\"\n",
op->o_connid, op->o_opid, pbase.bv_val, scope, fstr.bv_val );
manageDSAit = get_manageDSAit( op );
if ( scope == LDAP_SCOPE_BASE ) {
Entry *entry = NULL;
- if ( strcasecmp( nbase.bv_val, LDAP_ROOT_DSE ) == 0 ) {
+ if ( nbase.bv_len == 0 ) {
#ifdef LDAP_CONNECTIONLESS
- /* Ignore LDAPv2 CLDAP DSE queries */
+ /* Ignore LDAPv2 CLDAP Root DSE queries */
if (op->o_protocol==LDAP_VERSION2 && conn->c_is_udp) {
goto return_results;
}
* if we don't hold it.
*/
if ( (be = select_backend( &nbase, manageDSAit, 1 )) == NULL ) {
- BVarray ref = referral_rewrite( default_referral,
+ BerVarray ref = referral_rewrite( default_referral,
NULL, &pbase, scope );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- bvarray_free( ref );
+ ber_bvarray_free( ref );
goto return_results;
}
timelimit, filter, &fstr, an, attrsonly );
} else {
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "operation not supported within namingContext", NULL, NULL );
+ NULL, "operation not supported within namingContext",
+ NULL, NULL );
}
return_results:;
- free( base.bv_val );
if( pbase.bv_val != NULL) free( pbase.bv_val );
if( nbase.bv_val != NULL) free( nbase.bv_val );
if( fstr.bv_val != NULL) free( fstr.bv_val );
if( filter != NULL) filter_free( filter );
- for (i = 0; i<siz; i++ ) {
- free(an[i].an_name.bv_val);
- }
- free(an);
+ if( an != NULL ) free( an );
return rc;
}