X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=4699633403c4bc08a846577bab2b3e535aaefb2a;hb=8558b8808e7e8deba617908eed99a8213f1bc405;hp=68e5f521b9ca4999e550745582f6a15a6137104b;hpb=8067107ed208da22ff1aaa2993eb548819cac737;p=openldap diff --git a/servers/slapd/search.c b/servers/slapd/search.c index 68e5f521b9..4699633403 100644 --- a/servers/slapd/search.c +++ b/servers/slapd/search.c @@ -37,7 +37,7 @@ do_search( struct berval nbase = { 0, NULL }; struct berval fstr = { 0, NULL }; Filter *filter = NULL; - AttributeName *an; + AttributeName *an = NULL; ber_len_t siz, off, i; Backend *be; int rc; @@ -45,8 +45,7 @@ do_search( int manageDSAit; #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, - "do_search: conn %d\n", conn->c_connid )); + LDAP_LOG( OPERATION, ENTRY, "do_search: conn %d\n", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 ); #endif @@ -112,9 +111,9 @@ do_search( rc = dnPrettyNormal( NULL, &base, &pbase, &nbase ); if( rc != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + LDAP_LOG( OPERATION, ERR, "do_search: conn %d invalid dn (%s)\n", - conn->c_connid, base.bv_val )); + conn->c_connid, base.bv_val, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_search: invalid dn (%s)\n", base.bv_val, 0, 0 ); @@ -125,9 +124,10 @@ do_search( } #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "do_search \"%s\" %d %d %d %d %d\n", base.bv_val, scope, - deref, sizelimit, timelimit, attrsonly )); + LDAP_LOG( OPERATION, ARGS, "SRCH \"%s\" %d %d", + base.bv_val, scope, deref ); + LDAP_LOG( OPERATION, ARGS, " %d %d %d\n", + sizelimit, timelimit, attrsonly); #else Debug( LDAP_DEBUG_ARGS, "SRCH \"%s\" %d %d", base.bv_val, scope, deref ); @@ -136,23 +136,26 @@ do_search( #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, LDAP_PROTOCOL_ERROR, text ); } else { - send_ldap_result( conn, op, rc, - NULL, text, NULL, NULL ); + send_ldap_result( conn, op, rc, + NULL, text, NULL, NULL ); } goto return_results; } + 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 )); + LDAP_LOG( OPERATION, ARGS, + "do_search: conn %d filter: %s\n", + conn->c_connid, fstr.bv_len ? fstr.bv_val : "empty", 0 ); #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 */ @@ -172,9 +175,9 @@ do_search( if( (rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) { #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_INFO, + LDAP_LOG( OPERATION, INFO, "do_search: conn %d get_ctrls failed (%d)\n", - conn->c_connid, rc )); + conn->c_connid, rc, 0 ); #else Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 ); #endif @@ -183,8 +186,8 @@ do_search( } #ifdef NEW_LOGGING - LDAP_LOG(( "operation", LDAP_LEVEL_ARGS, - "do_search: conn %d attrs:", conn->c_connid )); + LDAP_LOG( OPERATION, ARGS, + "do_search: conn %d attrs:", conn->c_connid, 0, 0 ); #else Debug( LDAP_DEBUG_ARGS, " attrs:", 0, 0, 0 ); #endif @@ -192,8 +195,8 @@ do_search( if ( siz != 0 ) { for ( i = 0; io_connid, op->o_opid, pbase.bv_val, scope, fstr.bv_val ); manageDSAit = get_manageDSAit( op ); @@ -231,10 +234,8 @@ do_search( } rc = root_dse_info( conn, &entry, &text ); - } -#if defined( SLAPD_SCHEMA_DN ) - else if ( strcasecmp( nbase.bv_val, SLAPD_SCHEMA_DN ) == 0 ) { + } else if ( bvmatch( &nbase, &global_schemandn ) ) { /* check restrictions */ rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ; if( rc != LDAP_SUCCESS ) { @@ -245,7 +246,6 @@ do_search( rc = schema_info( &entry, &text ); } -#endif if( rc != LDAP_SUCCESS ) { send_ldap_result( conn, op, rc, @@ -283,13 +283,13 @@ do_search( * 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; } @@ -314,7 +314,7 @@ do_search( if ( be->be_search ) { (*be->be_search)( be, conn, op, &pbase, &nbase, scope, deref, sizelimit, - timelimit, filter, &fstr, an, attrsonly ); + timelimit, filter, &fstr, an, attrsonly ); } else { send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM, NULL, "operation not supported within namingContext", @@ -322,12 +322,17 @@ do_search( } return_results:; - if( pbase.bv_val != NULL) free( pbase.bv_val ); - if( nbase.bv_val != NULL) free( nbase.bv_val ); +#ifdef LDAP_CLIENT_UPDATE + if ( !( op->o_clientupdate_type & SLAP_LCUP_PERSIST ) ) +#endif /* LDAP_CLIENT_UPDATE */ + { + 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 ); - free(an); + if( fstr.bv_val != NULL) free( fstr.bv_val ); + if( filter != NULL) filter_free( filter ); + if( an != NULL ) free( an ); + } return rc; }