From 272248ce9e9b38cec526a4f68856af3d79569766 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Tue, 29 Oct 2002 02:11:48 +0000 Subject: [PATCH] back-sql attribute handling --- servers/slapd/back-sql/schema-map.c | 2 +- servers/slapd/back-sql/search.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c index a0194561d0..2f9fd207b7 100644 --- a/servers/slapd/back-sql/schema-map.c +++ b/servers/slapd/back-sql/schema-map.c @@ -326,7 +326,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ) Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "attribute '%s' for objectClass '%s' " "is not defined in schema: %s\n", - at_map->ad->ad_cname.bv_val, + at_row.cols[ 0 ], BACKSQL_OC_NAME( oc_map ), text ); return LDAP_CONSTRAINT_VIOLATION; } diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c index 0032f2ffdf..77428ea18c 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -399,7 +399,7 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) */ backsql_strfcat( &bsi->flt_where, &bsi->fwhere_len, "l", (ber_len_t)sizeof( "1=1" ) - 1, "1=1" ); - if ( ad != NULL ) { + if ( ad == slap_schema.si_ad_hasSubordinates ) { /* * We use this flag since we need to parse * the filter anyway; we should have used @@ -407,6 +407,7 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) * filter_has_subordinates() */ bsi->bsi_flags |= BSQL_SF_FILTER_HASSUBORDINATE; + } else { /* * clear attributes to fetch, to require ALL -- 2.39.5