From c5ed3dda5b561a7d52c50e3747e2e65d9cbffa53 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Sat, 17 Jan 2004 19:00:04 +0000 Subject: [PATCH] Sync with (old) HEAD --- servers/slapd/back-sql/Makefile.in | 2 +- servers/slapd/back-sql/entry-id.c | 60 +- servers/slapd/back-sql/modify.c | 94 +-- .../rdbms_depend/pgsql/testdb_metadata.sql | 11 +- servers/slapd/back-sql/schema-map.c | 297 +++++---- servers/slapd/back-sql/schema-map.h | 52 +- servers/slapd/back-sql/search.c | 573 ++++++++++-------- servers/slapd/back-sql/sql-wrap.c | 7 +- servers/slapd/back-sql/util.h | 42 +- 9 files changed, 647 insertions(+), 491 deletions(-) diff --git a/servers/slapd/back-sql/Makefile.in b/servers/slapd/back-sql/Makefile.in index 574ccf0d2f..e67192ec49 100644 --- a/servers/slapd/back-sql/Makefile.in +++ b/servers/slapd/back-sql/Makefile.in @@ -30,7 +30,7 @@ MOD_DEFS = $(@BUILD_SQL@_DEFS) shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) -UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) +UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) $(SLAPD_SQL_LIBS) LIBBASE = back_sql diff --git a/servers/slapd/back-sql/entry-id.c b/servers/slapd/back-sql/entry-id.c index 7a8c839ed8..19f3cdac77 100644 --- a/servers/slapd/back-sql/entry-id.c +++ b/servers/slapd/back-sql/entry-id.c @@ -279,7 +279,7 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) { backsql_at_map_rec *at = v_at; backsql_srch_info *bsi = v_bsi; - backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private; + backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private; RETCODE rc; SQLHSTMT sth; BACKSQL_ROW_NTS row; @@ -290,18 +290,18 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) Debug( LDAP_DEBUG_TRACE, "==>backsql_get_attr_vals(): " "oc='%s' attr='%s' keyval=%ld\n", - BACKSQL_OC_NAME( bsi->oc ), at->ad->ad_cname.bv_val, - bsi->c_eid->keyval ); + BACKSQL_OC_NAME( bsi->bsi_oc ), at->bam_ad->ad_cname.bv_val, + bsi->bsi_c_eid->keyval ); - rc = backsql_Prepare( bsi->dbh, &sth, at->query, 0 ); + rc = backsql_Prepare( bsi->bsi_dbh, &sth, at->bam_query, 0 ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): " - "error preparing query: %s\n", at->query, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc ); + "error preparing query: %s\n", at->bam_query, 0, 0 ); + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); return 1; } - rc = backsql_BindParamID( sth, 1, &bsi->c_eid->keyval ); + rc = backsql_BindParamID( sth, 1, &bsi->bsi_c_eid->keyval ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): " "error binding key value parameter\n", 0, 0, 0 ); @@ -312,8 +312,8 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) if ( ! BACKSQL_SUCCESS( rc ) ) { Debug( LDAP_DEBUG_TRACE, "backsql_get_attr_values(): " "error executing attribute query '%s'\n", - at->query, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc ); + at->bam_query, 0, 0 ); + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); SQLFreeStmt( sth, SQL_DROP ); return 1; } @@ -336,9 +336,9 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) */ bv.bv_len = strlen( row.cols[ i ] ); #endif - backsql_entry_addattr( bsi->e, + backsql_entry_addattr( bsi->bsi_e, &row.col_names[ i ], &bv, - bsi->op->o_tmpmemctx ); + bsi->bsi_op->o_tmpmemctx ); #ifdef BACKSQL_TRACE Debug( LDAP_DEBUG_TRACE, "prec=%d\n", @@ -356,6 +356,10 @@ backsql_get_attr_vals( void *v_at, void *v_bsi ) SQLFreeStmt( sth, SQL_DROP ); Debug( LDAP_DEBUG_TRACE, "<==backsql_get_attr_vals()\n", 0, 0, 0 ); + if ( at->bam_next ) { + return backsql_get_attr_vals( at->bam_next, v_bsi ); + } + return 1; } @@ -370,50 +374,52 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid ) Debug( LDAP_DEBUG_TRACE, "==>backsql_id2entry()\n", 0, 0, 0 ); rc = dnPrettyNormal( NULL, &eid->dn, &e->e_name, &e->e_nname, - bsi->op->o_tmpmemctx ); + bsi->bsi_op->o_tmpmemctx ); if ( rc != LDAP_SUCCESS ) { return NULL; } - bsi->oc = backsql_id2oc( bsi->op->o_bd->be_private, eid->oc_id ); - bsi->e = e; - bsi->c_eid = eid; + bsi->bsi_oc = backsql_id2oc( bsi->bsi_op->o_bd->be_private, eid->oc_id ); + bsi->bsi_e = e; + bsi->bsi_c_eid = eid; e->e_attrs = NULL; e->e_private = NULL; e->e_id = eid->id; - if ( bsi->attrs != NULL ) { + if ( bsi->bsi_attrs != NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): " "custom attribute list\n", 0, 0, 0 ); - for ( i = 0; bsi->attrs[ i ].an_name.bv_val; i++ ) { - AttributeName *attr = &bsi->attrs[ i ]; + for ( i = 0; bsi->bsi_attrs[ i ].an_name.bv_val; i++ ) { + AttributeName *attr = &bsi->bsi_attrs[ i ]; if ( attr->an_desc == ad_oc ) { continue; } - at = backsql_ad2at( bsi->oc, attr->an_desc ); + at = backsql_ad2at( bsi->bsi_oc, attr->an_desc ); if ( at != NULL ) { backsql_get_attr_vals( at, bsi ); + } else { Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): " "attribute '%s' is not defined " "for objectlass '%s'\n", attr->an_name.bv_val, - BACKSQL_OC_NAME( bsi->oc ), 0 ); + BACKSQL_OC_NAME( bsi->bsi_oc ), 0 ); } } } else { Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(): " "retrieving all attributes\n", 0, 0, 0 ); - avl_apply( bsi->oc->attrs, backsql_get_attr_vals, + avl_apply( bsi->bsi_oc->bom_attrs, backsql_get_attr_vals, bsi, 0, AVL_INORDER ); } - if ( attr_merge_normalize_one( bsi->e, ad_oc, &bsi->oc->oc->soc_cname, - bsi->op->o_tmpmemctx ) ) { + if ( attr_merge_normalize_one( bsi->bsi_e, ad_oc, + &bsi->bsi_oc->bom_oc->soc_cname, + bsi->bsi_op->o_tmpmemctx ) ) { entry_free( e ); return NULL; } @@ -426,7 +432,7 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid ) struct berval soc; int rc; - bv[ 0 ] = bsi->oc->oc->soc_cname; + bv[ 0 ] = bsi->bsi_oc->bom_oc->soc_cname; bv[ 1 ].bv_val = NULL; rc = structural_class( bv, &soc, NULL, @@ -437,10 +443,10 @@ backsql_id2entry( backsql_srch_info *bsi, Entry *e, backsql_entryID *eid ) } if ( ( bsi->bsi_flags | BSQL_SF_ALL_OPER ) - || an_find( bsi->attrs, &AllOper ) ) { - rc = attr_merge_normalize_one( bsi->e, + || an_find( bsi->bsi_attrs, &AllOper ) ) { + rc = attr_merge_normalize_one( bsi->bsi_e, slap_schema.si_ad_structuralObjectClass, - &soc, bsi->op->o_tmpmemctx ); + &soc, bsi->bsi_op->o_tmpmemctx ); if ( rc != LDAP_SUCCESS ) { entry_free( e ); return NULL; diff --git a/servers/slapd/back-sql/modify.c b/servers/slapd/back-sql/modify.c index 2238d1a7ba..3901a7b907 100644 --- a/servers/slapd/back-sql/modify.c +++ b/servers/slapd/back-sql/modify.c @@ -124,15 +124,15 @@ backsql_modify_internal( Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "replacing values for attribute '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); - if ( at->add_proc == NULL ) { + if ( at->bam_add_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "add procedure is not defined " "for attribute '%s' " "- unable to perform replacements\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); if ( BACKSQL_FAIL_IF_NO_MAPPING( bi ) ) { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; @@ -144,13 +144,13 @@ backsql_modify_internal( break; } - if ( at->delete_proc == NULL ) { + if ( at->bam_delete_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "delete procedure is not defined " "for attribute '%s' " "- adding only\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); if ( BACKSQL_FAIL_IF_NO_MAPPING( bi ) ) { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; @@ -163,7 +163,7 @@ backsql_modify_internal( } del_all: - rc = backsql_Prepare( dbh, &asth, at->query, 0 ); + rc = backsql_Prepare( dbh, &asth, at->bam_query, 0 ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " @@ -222,7 +222,7 @@ del_all: rc = SQLFetch( asth ); for ( ; BACKSQL_SUCCESS( rc ); rc = SQLFetch( asth ) ) { for ( i = 0; i < row.ncols; i++ ) { - if ( BACKSQL_IS_DEL( at->expect_return ) ) { + if ( BACKSQL_IS_DEL( at->bam_expect_return ) ) { pno = 1; SQLBindParameter(sth, 1, SQL_PARAM_OUTPUT, @@ -232,7 +232,7 @@ del_all: } else { pno = 0; } - po = ( BACKSQL_IS_DEL( at->param_order ) ) > 0; + po = ( BACKSQL_IS_DEL( at->bam_param_order ) ) > 0; SQLBindParameter( sth, pno + 1 + po, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, @@ -251,9 +251,9 @@ del_all: Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "executing '%s'\n", - at->delete_proc, 0, 0 ); + at->bam_delete_proc, 0, 0 ); rc = SQLExecDirect( sth, - at->delete_proc, SQL_NTS ); + at->bam_delete_proc, SQL_NTS ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " @@ -278,19 +278,19 @@ del_all: backsql_FreeRow( &row ); SQLFreeStmt( asth, SQL_DROP ); } - + /* * PASSTHROUGH - to add new attributes -- do NOT add break */ case LDAP_MOD_ADD: case SLAP_MOD_SOFTADD: add_only:; - if ( at->add_proc == NULL ) { + if ( at->bam_add_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "add procedure is not defined " "for attribute '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); if ( BACKSQL_FAIL_IF_NO_MAPPING( bi ) ) { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; @@ -304,11 +304,11 @@ add_only:; Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "adding new values for attribute '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); for ( i = 0, at_val = c_mod->sm_bvalues; at_val->bv_val != NULL; i++, at_val++ ) { - if ( BACKSQL_IS_ADD( at->expect_return ) ) { + if ( BACKSQL_IS_ADD( at->bam_expect_return ) ) { pno = 1; SQLBindParameter( sth, 1, SQL_PARAM_OUTPUT, @@ -317,7 +317,7 @@ add_only:; } else { pno = 0; } - po = ( BACKSQL_IS_ADD( at->param_order ) ) > 0; + po = ( BACKSQL_IS_ADD( at->bam_param_order ) ) > 0; SQLBindParameter( sth, pno + 1 + po, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, @@ -336,8 +336,8 @@ add_only:; Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "executing '%s'\n", - at->add_proc, 0, 0 ); - rc = SQLExecDirect( sth, at->add_proc, + at->bam_add_proc, 0, 0 ); + rc = SQLExecDirect( sth, at->bam_add_proc, SQL_NTS ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, @@ -361,12 +361,12 @@ add_only:; break; case LDAP_MOD_DELETE: - if ( at->delete_proc == NULL ) { + if ( at->bam_delete_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "delete procedure is not defined " "for attribute '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); if ( BACKSQL_FAIL_IF_NO_MAPPING( bi ) ) { rs->sr_err = LDAP_UNWILLING_TO_PERFORM; @@ -384,18 +384,18 @@ add_only:; "no values given to delete " "for attribute '%s' " "-- deleting all values\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); goto del_all; } Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "deleting values for attribute '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); for ( i = 0, at_val = c_mod->sm_bvalues; at_val->bv_val != NULL; i++, at_val++ ) { - if ( BACKSQL_IS_DEL( at->expect_return ) ) { + if ( BACKSQL_IS_DEL( at->bam_expect_return ) ) { pno = 1; SQLBindParameter( sth, 1, SQL_PARAM_OUTPUT, @@ -404,7 +404,7 @@ add_only:; } else { pno = 0; } - po = ( BACKSQL_IS_DEL( at->param_order ) ) > 0; + po = ( BACKSQL_IS_DEL( at->bam_param_order ) ) > 0; SQLBindParameter( sth, pno + 1 + po, SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, @@ -422,8 +422,8 @@ add_only:; Debug( LDAP_DEBUG_TRACE, "backsql_modify_internal(): " "executing '%s'\n", - at->delete_proc, 0, 0 ); - rc = SQLExecDirect( sth, at->delete_proc, + at->bam_delete_proc, 0, 0 ); + rc = SQLExecDirect( sth, at->bam_delete_proc, SQL_NTS ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, @@ -946,7 +946,7 @@ backsql_add( Operation *op, SlapReply *rs ) return 1; } - if ( oc->create_proc == NULL ) { + if ( oc->bom_create_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "create procedure is not defined for this objectclass " "- aborting\n", 0, 0, 0 ); @@ -956,7 +956,7 @@ backsql_add( Operation *op, SlapReply *rs ) return 1; } else if ( BACKSQL_CREATE_NEEDS_SELECT( bi ) - && oc->create_keyval == NULL ) { + && oc->bom_create_keyval == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "create procedure needs select procedure, " "but none is defined - aborting\n", 0, 0, 0 ); @@ -1064,14 +1064,14 @@ backsql_add( Operation *op, SlapReply *rs ) return 1; } - if ( BACKSQL_IS_ADD( oc->expect_return ) ) { + if ( BACKSQL_IS_ADD( oc->bom_expect_return ) ) { SQLBindParameter( sth, 1, SQL_PARAM_OUTPUT, SQL_C_ULONG, SQL_INTEGER, 0, 0, &new_keyval, 0, 0 ); } Debug( LDAP_DEBUG_TRACE, "backsql_add(): executing '%s'\n", - oc->create_proc, 0, 0 ); - rc = SQLExecDirect( sth, oc->create_proc, SQL_NTS ); + oc->bom_create_proc, 0, 0 ); + rc = SQLExecDirect( sth, oc->bom_create_proc, SQL_NTS ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "create_proc execution failed\n", 0, 0, 0 ); @@ -1086,7 +1086,7 @@ backsql_add( Operation *op, SlapReply *rs ) SQLTransact( SQL_NULL_HENV, dbh, SQL_ROLLBACK ); } - if ( !BACKSQL_IS_ADD( oc->expect_return ) ) { + if ( !BACKSQL_IS_ADD( oc->bom_expect_return ) ) { SWORD ncols; SQLINTEGER value_len; @@ -1104,7 +1104,7 @@ backsql_add( Operation *op, SlapReply *rs ) } #endif /* BACKSQL_REALLOC_STMT */ - rc = SQLExecDirect( sth, oc->create_keyval, SQL_NTS ); + rc = SQLExecDirect( sth, oc->bom_create_keyval, SQL_NTS ); if ( rc != SQL_SUCCESS ) { rs->sr_err = LDAP_OTHER; rs->sr_text = "SQL-backend error"; @@ -1226,7 +1226,7 @@ backsql_add( Operation *op, SlapReply *rs ) continue; } - if ( at_rec->add_proc == NULL ) { + if ( at_rec->bam_add_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "add procedure is not defined " "for attribute '%s'\n", @@ -1244,7 +1244,7 @@ backsql_add( Operation *op, SlapReply *rs ) } #ifdef BACKSQL_REALLOC_STMT - rc = backsql_Prepare( dbh, &sth, at_rec->add_proc, 0 ); + rc = backsql_Prepare( dbh, &sth, at_rec->bam_add_proc, 0 ); if ( rc != SQL_SUCCESS ) { if ( BACKSQL_FAIL_IF_NO_MAPPING( bi ) ) { @@ -1258,7 +1258,7 @@ backsql_add( Operation *op, SlapReply *rs ) } #endif /* BACKSQL_REALLOC_STMT */ - if ( BACKSQL_IS_ADD( at_rec->expect_return ) ) { + if ( BACKSQL_IS_ADD( at_rec->bam_expect_return ) ) { pno = 1; SQLBindParameter( sth, 1, SQL_PARAM_OUTPUT, SQL_C_ULONG, SQL_INTEGER, @@ -1267,7 +1267,7 @@ backsql_add( Operation *op, SlapReply *rs ) pno = 0; } - po = ( BACKSQL_IS_ADD( at_rec->param_order ) ) > 0; + po = ( BACKSQL_IS_ADD( at_rec->bam_param_order ) ) > 0; currpos = pno + 1 + po; SQLBindParameter( sth, currpos, SQL_PARAM_INPUT, SQL_C_ULONG, @@ -1283,7 +1283,7 @@ backsql_add( Operation *op, SlapReply *rs ) * to build the entry */ if ( at->a_desc == slap_schema.si_ad_objectClass ) { - if ( bvmatch( at_val, &oc->oc->soc_cname ) ) { + if ( bvmatch( at_val, &oc->bom_oc->soc_cname ) ) { continue; } } @@ -1298,14 +1298,14 @@ backsql_add( Operation *op, SlapReply *rs ) #ifdef SECURITY_PARANOID Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "executing '%s', id=%ld\n", - at_rec->add_proc, new_keyval, 0 ); + at_rec->bam_add_proc, new_keyval, 0 ); #else Debug( LDAP_DEBUG_TRACE, "backsql_add(): " "executing '%s' with val='%s', id=%ld\n", - at_rec->add_proc, at_val->bv_val, new_keyval ); + at_rec->bam_add_proc, at_val->bv_val, new_keyval ); #endif #ifndef BACKSQL_REALLOC_STMT - rc = SQLExecDirect( sth, at_rec->add_proc, SQL_NTS ); + rc = SQLExecDirect( sth, at_rec->bam_add_proc, SQL_NTS ); #else /* BACKSQL_REALLOC_STMT */ rc = SQLExecute( sth ); #endif /* BACKSQL_REALLOC_STMT */ @@ -1343,7 +1343,7 @@ backsql_add( Operation *op, SlapReply *rs ) backsql_BindParamStr( sth, 1, op->oq_add.rs_e->e_name.bv_val, BACKSQL_MAX_DN_LEN ); SQLBindParameter( sth, 2, SQL_PARAM_INPUT, SQL_C_LONG, SQL_INTEGER, - 0, 0, &oc->id, 0, 0 ); + 0, 0, &oc->bom_id, 0, 0 ); SQLBindParameter( sth, 3, SQL_PARAM_INPUT, SQL_C_LONG, SQL_INTEGER, 0, 0, &parent_id.id, 0, 0 ); SQLBindParameter( sth, 4, SQL_PARAM_INPUT, SQL_C_LONG, SQL_INTEGER, @@ -1352,7 +1352,7 @@ backsql_add( Operation *op, SlapReply *rs ) Debug( LDAP_DEBUG_TRACE, "backsql_add(): executing '%s' for dn '%s'\n", bi->insentry_query, op->oq_add.rs_e->e_name.bv_val, 0 ); Debug( LDAP_DEBUG_TRACE, " for oc_map_id=%ld, parent_id=%ld, " - "keyval=%ld\n", oc->id, parent_id.id, new_keyval ); + "keyval=%ld\n", oc->bom_id, parent_id.id, new_keyval ); #ifndef BACKSQL_REALLOC_STMT rc = SQLExecDirect( sth, bi->insentry_query, SQL_NTS ); #else /* BACKSQL_REALLOC_STMT */ @@ -1472,7 +1472,7 @@ backsql_delete( Operation *op, SlapReply *rs ) return 1; } - if ( oc->delete_proc == NULL ) { + if ( oc->bom_delete_proc == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_delete(): " "delete procedure is not defined " "for this objectclass - aborting\n", 0, 0, 0 ); @@ -1483,7 +1483,7 @@ backsql_delete( Operation *op, SlapReply *rs ) } SQLAllocStmt( dbh, &sth ); - if ( BACKSQL_IS_DEL( oc->expect_return ) ) { + if ( BACKSQL_IS_DEL( oc->bom_expect_return ) ) { pno = 1; SQLBindParameter( sth, 1, SQL_PARAM_OUTPUT, SQL_C_ULONG, SQL_INTEGER, 0, 0, &rc, 0, 0 ); @@ -1495,8 +1495,8 @@ backsql_delete( Operation *op, SlapReply *rs ) SQL_C_ULONG, SQL_INTEGER, 0, 0, &e_id.keyval, 0, 0 ); Debug( LDAP_DEBUG_TRACE, "backsql_delete(): executing '%s'\n", - oc->delete_proc, 0, 0 ); - rc = SQLExecDirect( sth, oc->delete_proc, SQL_NTS ); + oc->bom_delete_proc, 0, 0 ); + rc = SQLExecDirect( sth, oc->bom_delete_proc, SQL_NTS ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_delete(): " "delete_proc execution failed\n", 0, 0, 0 ); diff --git a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql index bd82a582a5..d42175906e 100644 --- a/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql +++ b/servers/slapd/back-sql/rdbms_depend/pgsql/testdb_metadata.sql @@ -18,17 +18,12 @@ insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where, insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (5,2,'documentTitle','documents.title','documents',NULL,NULL,NULL,3,0); --- insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) --- values (6,2,'documentAuthor','persons.name','persons,documents,authors_docs', --- 'persons.id=authors_docs.pers_id AND documents.id=authors_docs.doc_id', --- NULL,NULL,3,0); - +insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (6,2,'documentAuthor','documentAuthor.dn','ldap_entries AS documentAuthor,documents,authors_docs,persons','documentAuthor.keyval=persons.id AND documentAuthor.oc_map_id=1 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id',NULL,NULL,3,0); + insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (7,3,'o','institutes.name','institutes',NULL,NULL,NULL,3,0); -insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (8,1,'documentIdentifier','ldap_entries.dn','ldap_entries,documents,authors_docs,persons','ldap_entries.keyval=documents.id AND ldap_entries.oc_map_id=2 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id',NULL,NULL,3,0); +insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (8,1,'documentIdentifier','documentIdentifier.dn','ldap_entries AS documentIdentifier,documents,authors_docs,persons','documentIdentifier.keyval=documents.id AND documentIdentifier.oc_map_id=2 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id',NULL,NULL,3,0); -insert into ldap_attr_mappings (id,oc_map_id,name,sel_expr,from_tbls,join_where,add_proc,delete_proc,param_order,expect_return) values (9,2,'documentAuthor','ldap_entries.dn','ldap_entries,documents,authors_docs,persons','ldap_entries.keyval=persons.id AND ldap_entries.oc_map_id=1 AND authors_docs.doc_id=documents.id AND authors_docs.pers_id=persons.id',NULL,NULL,3,0); - -- entries insert into ldap_entries (id,dn,oc_map_id,parent,keyval) values (1,'o=sql,c=RU',3,0,1); diff --git a/servers/slapd/back-sql/schema-map.c b/servers/slapd/back-sql/schema-map.c index 9c2d62280f..f73114b3ed 100644 --- a/servers/slapd/back-sql/schema-map.c +++ b/servers/slapd/back-sql/schema-map.c @@ -33,6 +33,8 @@ #include "schema-map.h" #include "util.h" +#define BACKSQL_DUPLICATE (-1) + /* * Uses the pointer to the ObjectClass structure */ @@ -40,14 +42,16 @@ static int backsql_cmp_oc( const void *v_m1, const void *v_m2 ) { const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2; - return SLAP_PTRCMP( m1->oc, m2->oc ); + + return SLAP_PTRCMP( m1->bom_oc, m2->bom_oc ); } static int backsql_cmp_oc_id( const void *v_m1, const void *v_m2 ) { const backsql_oc_map_rec *m1 = v_m1, *m2 = v_m2; - return ( m1->id < m2->id ? -1 : ( m1->id > m2->id ? 1 : 0 ) ); + + return ( m1->bom_id < m2->bom_id ? -1 : ( m1->bom_id > m2->bom_id ? 1 : 0 ) ); } /* @@ -57,7 +61,22 @@ static int backsql_cmp_attr( const void *v_m1, const void *v_m2 ) { const backsql_at_map_rec *m1 = v_m1, *m2 = v_m2; - return SLAP_PTRCMP( m1->ad, m2->ad ); + + return SLAP_PTRCMP( m1->bam_ad, m2->bam_ad ); +} + +int +backsql_dup_attr( void *v_m1, void *v_m2 ) +{ + backsql_at_map_rec *m1 = v_m1, *m2 = v_m2; + + assert( m1->bam_ad == m2->bam_ad ); + + for ( ; m1->bam_next ; m1 = m1->bam_next ); + m1->bam_next = m2; + m2->bam_next = NULL; + + return BACKSQL_DUPLICATE; } static int @@ -69,24 +88,24 @@ backsql_make_attr_query( backsql_strfcat( &bb, "lblblblbcbl", (ber_len_t)sizeof( "SELECT " ) - 1, "SELECT ", - &at_map->sel_expr, + &at_map->bam_sel_expr, (ber_len_t)sizeof( " AS " ) - 1, " AS ", - &at_map->ad->ad_cname, + &at_map->bam_ad->ad_cname, (ber_len_t)sizeof( " FROM " ) - 1, " FROM ", - &at_map->from_tbls, + &at_map->bam_from_tbls, (ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ", - &oc_map->keytbl, + &oc_map->bom_keytbl, '.', - &oc_map->keycol, + &oc_map->bom_keycol, (ber_len_t)sizeof( "=?" ) - 1, "=?" ); - if ( at_map->join_where.bv_val != NULL ) { + if ( at_map->bam_join_where.bv_val != NULL ) { backsql_strfcat( &bb, "lb", (ber_len_t)sizeof( " AND ") - 1, " AND ", - &at_map->join_where ); + &at_map->bam_join_where ); } - at_map->query = bb.bb_val.bv_val; + at_map->bam_query = bb.bb_val.bv_val; return 0; } @@ -100,20 +119,21 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) struct berbuf bb; - snprintf( s, sizeof( s ), "%ld", oc_map->id ); + snprintf( s, sizeof( s ), "%ld", oc_map->bom_id ); slen = strlen( s ); at_map = (backsql_at_map_rec *)ch_calloc(1, sizeof( backsql_at_map_rec ) ); - at_map->ad = slap_schema.si_ad_objectClass; - ber_str2bv( "ldap_entry_objclasses.oc_name", 0, 1, &at_map->sel_expr ); + at_map->bam_ad = slap_schema.si_ad_objectClass; + ber_str2bv( "ldap_entry_objclasses.oc_name", 0, 1, + &at_map->bam_sel_expr ); ber_str2bv( "ldap_entry_objclasses,ldap_entries", 0, 1, - &at_map->from_tbls ); + &at_map->bam_from_tbls ); - bb.bb_len = at_map->from_tbls.bv_len + 1; - bb.bb_val = at_map->from_tbls; - backsql_merge_from_clause( &bb, &oc_map->keytbl ); - at_map->from_tbls = bb.bb_val; + bb.bb_len = at_map->bam_from_tbls.bv_len + 1; + bb.bb_val = at_map->bam_from_tbls; + backsql_merge_from_clause( &bb, &oc_map->bom_keytbl ); + at_map->bam_from_tbls = bb.bb_val; bb.bb_val.bv_val = NULL; bb.bb_val.bv_len = 0; @@ -121,33 +141,40 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) backsql_strfcat( &bb, "lbcbll", (ber_len_t)sizeof( "ldap_entries.id=ldap_entry_objclasses.entry_id and ldap_entries.keyval=" ) - 1, "ldap_entries.id=ldap_entry_objclasses.entry_id and ldap_entries.keyval=", - &oc_map->keytbl, + &oc_map->bom_keytbl, '.', - &oc_map->keycol, + &oc_map->bom_keycol, (ber_len_t)sizeof( " and ldap_entries.oc_map_id=" ) - 1, " and ldap_entries.oc_map_id=", slen, s ); - at_map->join_where = bb.bb_val; - at_map->add_proc = NULL; - at_map->delete_proc = NULL; - at_map->param_order = 0; - at_map->expect_return = 0; + at_map->bam_oc = oc_map->bom_oc; + at_map->bam_join_where = bb.bb_val; + at_map->bam_add_proc = NULL; + at_map->bam_delete_proc = NULL; + at_map->bam_param_order = 0; + at_map->bam_expect_return = 0; + at_map->bam_next = NULL; backsql_make_attr_query( oc_map, at_map ); - avl_insert( &oc_map->attrs, at_map, backsql_cmp_attr, NULL ); + if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) { + Debug( LDAP_DEBUG_TRACE, "backsql_add_sysmaps(): " + "duplicate attribute \"%s\" in objectClass \"%s\" map\n", + at_map->bam_ad->ad_cname.bv_val, + oc_map->bom_oc->soc_cname.bv_val, 0 ); + } at_map = (backsql_at_map_rec *)ch_calloc( 1, sizeof( backsql_at_map_rec ) ); - at_map->ad = slap_schema.si_ad_ref; - ber_str2bv( "ldap_referrals.url", 0, 1, &at_map->sel_expr ); - ber_str2bv( "ldap_referrals,ldap_entries", 0, 1, &at_map->from_tbls ); + at_map->bam_ad = slap_schema.si_ad_ref; + ber_str2bv( "ldap_referrals.url", 0, 1, &at_map->bam_sel_expr ); + ber_str2bv( "ldap_referrals,ldap_entries", 0, 1, &at_map->bam_from_tbls ); bb.bb_val.bv_val = NULL; bb.bb_val.bv_len = 0; - bb.bb_len = at_map->from_tbls.bv_len + 1; - backsql_merge_from_clause( &bb, &oc_map->keytbl ); - at_map->from_tbls = bb.bb_val; + bb.bb_len = at_map->bam_from_tbls.bv_len + 1; + backsql_merge_from_clause( &bb, &oc_map->bom_keytbl ); + at_map->bam_from_tbls = bb.bb_val; bb.bb_val.bv_val = NULL; bb.bb_val.bv_len = 0; @@ -155,21 +182,28 @@ backsql_add_sysmaps( backsql_oc_map_rec *oc_map ) backsql_strfcat( &bb, "lbcbll", (ber_len_t)sizeof( "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=" ) - 1, "ldap_entries.id=ldap_referrals.entry_id and ldap_entries.keyval=", - &oc_map->keytbl, + &oc_map->bom_keytbl, '.', - &oc_map->keycol, + &oc_map->bom_keycol, (ber_len_t)sizeof( " and ldap_entries.oc_map_id=" ) - 1, " and ldap_entries.oc_map_id=", slen, s ); - at_map->join_where = bb.bb_val; - at_map->add_proc = NULL; - at_map->delete_proc = NULL; - at_map->param_order = 0; - at_map->expect_return = 0; + at_map->bam_oc = NULL; + at_map->bam_join_where = bb.bb_val; + at_map->bam_add_proc = NULL; + at_map->bam_delete_proc = NULL; + at_map->bam_param_order = 0; + at_map->bam_expect_return = 0; + at_map->bam_next = NULL; backsql_make_attr_query( oc_map, at_map ); - avl_insert( &oc_map->attrs, at_map, backsql_cmp_attr, NULL ); + if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) { + Debug( LDAP_DEBUG_TRACE, "backsql_add_sysmaps(): " + "duplicate attribute \"%s\" in objectClass \"%s\" map\n", + at_map->bam_ad->ad_cname.bv_val, + oc_map->bom_oc->soc_cname.bv_val, 0 ); + } return 1; } @@ -250,30 +284,30 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ) oc_map = (backsql_oc_map_rec *)ch_calloc( 1, sizeof( backsql_oc_map_rec ) ); - oc_map->id = strtol( oc_row.cols[ 0 ], NULL, 0 ); + oc_map->bom_id = strtol( oc_row.cols[ 0 ], NULL, 0 ); - oc_map->oc = oc_find( oc_row.cols[ 1 ] ); - if ( oc_map->oc == NULL ) { + oc_map->bom_oc = oc_find( oc_row.cols[ 1 ] ); + if ( oc_map->bom_oc == NULL ) { Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "objectClass '%s' is not defined in schema\n", oc_row.cols[ 1 ], 0, 0 ); return LDAP_OTHER; /* undefined objectClass ? */ } - ber_str2bv( oc_row.cols[ 2 ], 0, 1, &oc_map->keytbl ); - ber_str2bv( oc_row.cols[ 3 ], 0, 1, &oc_map->keycol ); - oc_map->create_proc = ( oc_row.value_len[ 4 ] < 0 ) ? NULL + ber_str2bv( oc_row.cols[ 2 ], 0, 1, &oc_map->bom_keytbl ); + ber_str2bv( oc_row.cols[ 3 ], 0, 1, &oc_map->bom_keycol ); + oc_map->bom_create_proc = ( oc_row.value_len[ 4 ] < 0 ) ? NULL : ch_strdup( oc_row.cols[ 4 ] ); colnum = 5; if ( BACKSQL_CREATE_NEEDS_SELECT( si ) ) { colnum = 6; - oc_map->create_keyval = ( oc_row.value_len[ 5 ] < 0 ) + oc_map->bom_create_keyval = ( oc_row.value_len[ 5 ] < 0 ) ? NULL : ch_strdup( oc_row.cols[ 5 ] ); } - oc_map->delete_proc = ( oc_row.value_len[ colnum ] < 0 ) ? NULL + oc_map->bom_delete_proc = ( oc_row.value_len[ colnum ] < 0 ) ? NULL : ch_strdup( oc_row.cols[ colnum ] ); - oc_map->expect_return = strtol( oc_row.cols[ colnum + 1 ], + oc_map->bom_expect_return = strtol( oc_row.cols[ colnum + 1 ], NULL, 0 ); /* @@ -281,30 +315,40 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ) * instructions in {create|delete}_proc */ - oc_map->attrs = NULL; - avl_insert( &si->oc_by_oc, oc_map, backsql_cmp_oc, NULL ); - avl_insert( &si->oc_by_id, oc_map, backsql_cmp_oc_id, NULL ); - oc_id = oc_map->id; + oc_map->bom_attrs = NULL; + if ( avl_insert( &si->oc_by_oc, oc_map, backsql_cmp_oc, avl_dup_error ) == -1 ) { + Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): " + "duplicate objectClass \"%s\" in objectClass map\n", + oc_map->bom_oc->soc_cname.bv_val, 0, 0 ); + return LDAP_OTHER; + } + if ( avl_insert( &si->oc_by_id, oc_map, backsql_cmp_oc_id, avl_dup_error ) == -1 ) { + Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): " + "duplicate objectClass \"%s\" in objectClass by ID map\n", + oc_map->bom_oc->soc_cname.bv_val, 0, 0 ); + return LDAP_OTHER; + } + oc_id = oc_map->bom_id; Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "objectClass '%s': keytbl='%s' keycol='%s'\n", BACKSQL_OC_NAME( oc_map ), - oc_map->keytbl.bv_val, oc_map->keycol.bv_val ); - if ( oc_map->create_proc ) { + oc_map->bom_keytbl.bv_val, oc_map->bom_keycol.bv_val ); + if ( oc_map->bom_create_proc ) { Debug( LDAP_DEBUG_TRACE, "create_proc='%s'\n", - oc_map->create_proc, 0, 0 ); + oc_map->bom_create_proc, 0, 0 ); } - if ( oc_map->create_keyval ) { + if ( oc_map->bom_create_keyval ) { Debug( LDAP_DEBUG_TRACE, "create_keyval='%s'\n", - oc_map->create_keyval, 0, 0 ); + oc_map->bom_create_keyval, 0, 0 ); } - if ( oc_map->delete_proc ) { + if ( oc_map->bom_delete_proc ) { Debug( LDAP_DEBUG_TRACE, "delete_proc='%s'\n", - oc_map->delete_proc, 0, 0 ); + oc_map->bom_delete_proc, 0, 0 ); } Debug( LDAP_DEBUG_TRACE, "expect_return: " "add=%d, del=%d; attributes:\n", - BACKSQL_IS_ADD( oc_map->expect_return ), - BACKSQL_IS_DEL( oc_map->expect_return ), 0 ); + BACKSQL_IS_ADD( oc_map->bom_expect_return ), + BACKSQL_IS_DEL( oc_map->bom_expect_return ), 0 ); Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "autoadding 'objectClass' and 'ref' mappings\n", @@ -342,7 +386,7 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ) at_map = (backsql_at_map_rec *)ch_calloc( 1, sizeof( backsql_at_map_rec ) ); rc = slap_str2ad( at_row.cols[ 0 ], - &at_map->ad, &text ); + &at_map->bam_ad, &text ); if ( rc != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "attribute '%s' for objectClass '%s' " @@ -351,44 +395,50 @@ backsql_load_schema_map( backsql_info *si, SQLHDBC dbh ) BACKSQL_OC_NAME( oc_map ), text ); return LDAP_CONSTRAINT_VIOLATION; } - - ber_str2bv( at_row.cols[ 1 ], 0, 1, &at_map->sel_expr ); + + ber_str2bv( at_row.cols[ 1 ], 0, 1, &at_map->bam_sel_expr ); if ( at_row.value_len[ 8 ] < 0 ) { - at_map->sel_expr_u.bv_val = NULL; - at_map->sel_expr_u.bv_len = 0; + at_map->bam_sel_expr_u.bv_val = NULL; + at_map->bam_sel_expr_u.bv_len = 0; } else { ber_str2bv( at_row.cols[ 8 ], 0, 1, - &at_map->sel_expr_u ); + &at_map->bam_sel_expr_u ); } ber_str2bv( at_row.cols[ 2 ], 0, 0, &bv ); backsql_merge_from_clause( &bb, &bv ); - at_map->from_tbls = bb.bb_val; + at_map->bam_from_tbls = bb.bb_val; if ( at_row.value_len[ 3 ] < 0 ) { - at_map->join_where.bv_val = NULL; - at_map->join_where.bv_len = 0; + at_map->bam_join_where.bv_val = NULL; + at_map->bam_join_where.bv_len = 0; } else { ber_str2bv( at_row.cols[ 3 ], 0, 1, - &at_map->join_where ); + &at_map->bam_join_where ); } - at_map->add_proc = NULL; + at_map->bam_add_proc = NULL; if ( at_row.value_len[ 4 ] > 0 ) { - at_map->add_proc = ch_strdup( at_row.cols[4] ); + at_map->bam_add_proc = ch_strdup( at_row.cols[4] ); } - at_map->delete_proc = NULL; + at_map->bam_delete_proc = NULL; if ( at_row.value_len[ 5 ] > 0 ) { - at_map->delete_proc - = ch_strdup( at_row.cols[ 5 ] ); + at_map->bam_delete_proc = ch_strdup( at_row.cols[ 5 ] ); } - at_map->param_order = strtol( at_row.cols[ 6 ], + at_map->bam_param_order = strtol( at_row.cols[ 6 ], NULL, 0 ); - at_map->expect_return = strtol( at_row.cols[ 7 ], + at_map->bam_expect_return = strtol( at_row.cols[ 7 ], NULL, 0 ); backsql_make_attr_query( oc_map, at_map ); Debug( LDAP_DEBUG_TRACE, "load_schema_map(): " "preconstructed query '%s'\n", - at_map->query, 0, 0 ); - avl_insert( &oc_map->attrs, at_map, backsql_cmp_attr, NULL ); + at_map->bam_query, 0, 0 ); + at_map->bam_next = NULL; + if ( avl_insert( &oc_map->bom_attrs, at_map, backsql_cmp_attr, backsql_dup_attr ) == BACKSQL_DUPLICATE ) { + Debug( LDAP_DEBUG_TRACE, "backsql_load_schema_map(): " + "duplicate attribute \"%s\" " + "in objectClass \"%s\" map\n", + at_map->bam_ad->ad_cname.bv_val, + oc_map->bom_oc->soc_cname.bv_val, 0 ); + } } backsql_FreeRow( &at_row ); SQLFreeStmt( at_sth, SQL_CLOSE ); @@ -412,7 +462,7 @@ backsql_oc2oc( backsql_info *si, ObjectClass *oc ) objclass, 0, 0 ); #endif /* BACKSQL_TRACE */ - tmp.oc = oc; + tmp.bom_oc = oc; res = (backsql_oc_map_rec *)avl_find( si->oc_by_oc, &tmp, backsql_cmp_oc ); #ifdef BACKSQL_TRACE if ( res != NULL ) { @@ -439,8 +489,8 @@ backsql_name2oc( backsql_info *si, struct berval *oc_name ) objclass, 0, 0 ); #endif /* BACKSQL_TRACE */ - tmp.oc = oc_bvfind( oc_name ); - if ( tmp.oc == NULL ) { + tmp.bom_oc = oc_bvfind( oc_name ); + if ( tmp.bom_oc == NULL ) { return NULL; } @@ -449,7 +499,7 @@ backsql_name2oc( backsql_info *si, struct berval *oc_name ) if ( res != NULL ) { Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): " "found name='%s', id=%d\n", - BACKSQL_OC_NAME( res ), res->id, 0 ); + BACKSQL_OC_NAME( res ), res->bom_id, 0 ); } else { Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): " "not found\n", 0, 0, 0 ); @@ -469,7 +519,7 @@ backsql_id2oc( backsql_info *si, unsigned long id ) "searching for objectclass with id='%d'\n", id, 0, 0 ); #endif /* BACKSQL_TRACE */ - tmp.id = id; + tmp.bom_id = id; res = (backsql_oc_map_rec *)avl_find( si->oc_by_id, &tmp, backsql_cmp_oc_id ); @@ -477,7 +527,7 @@ backsql_id2oc( backsql_info *si, unsigned long id ) if ( res != NULL ) { Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): " "found name='%s', id=%d\n", - BACKSQL_OC_NAME( res ), res->id, 0 ); + BACKSQL_OC_NAME( res ), res->bom_id, 0 ); } else { Debug( LDAP_DEBUG_TRACE, "<==oc_with_name(): " "not found\n", 0, 0, 0 ); @@ -498,15 +548,16 @@ backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad ) attr, BACKSQL_OC_NAME( objclass ), 0 ); #endif /* BACKSQL_TRACE */ - tmp.ad = ad; - res = (backsql_at_map_rec *)avl_find( objclass->attrs, &tmp, + tmp.bam_ad = ad; + res = (backsql_at_map_rec *)avl_find( objclass->bom_attrs, &tmp, backsql_cmp_attr ); #ifdef BACKSQL_TRACE if ( res != NULL ) { Debug( LDAP_DEBUG_TRACE, "<==backsql_ad2at(): " "found name='%s', sel_expr='%s'\n", - res->ad->ad_cname.bv_val, res->sel_expr.bv_val, 0 ); + res->bam_ad->ad_cname.bv_val, + res->bam_sel_expr.bv_val, 0 ); } else { Debug( LDAP_DEBUG_TRACE, "<==backsql_ad2at(): " "not found\n", 0, 0, 0 ); @@ -516,6 +567,7 @@ backsql_ad2at( backsql_oc_map_rec* objclass, AttributeDescription *ad ) return res; } +#if 0 /* * Deprecated */ @@ -531,18 +583,18 @@ backsql_name2at( backsql_oc_map_rec* objclass, struct berval *attr ) attr, BACKSQL_OC_NAME( objclass ), 0 ); #endif /* BACKSQL_TRACE */ - if ( slap_bv2ad( attr, &tmp.ad, &text ) != LDAP_SUCCESS ) { + if ( slap_bv2ad( attr, &tmp.bam_ad, &text ) != LDAP_SUCCESS ) { return NULL; } - res = (backsql_at_map_rec *)avl_find( objclass->attrs, &tmp, + res = (backsql_at_map_rec *)avl_find( objclass->bom_attrs, &tmp, backsql_cmp_attr ); #ifdef BACKSQL_TRACE if ( res != NULL ) { Debug( LDAP_DEBUG_TRACE, "<==backsql_name2at(): " "found name='%s', sel_expr='%s'\n", - res->name, res->sel_expr.bv_val, 0 ); + res->bam_name, res->bam_sel_expr.bv_val, 0 ); } else { Debug( LDAP_DEBUG_TRACE, "<==backsql_name2at(): " "not found\n", 0, 0, 0 ); @@ -551,33 +603,39 @@ backsql_name2at( backsql_oc_map_rec* objclass, struct berval *attr ) return res; } +#endif static void backsql_free_attr( void *v_at ) { - backsql_at_map_rec *at = v_at; + backsql_at_map_rec *at = v_at; + Debug( LDAP_DEBUG_TRACE, "==>free_attr(): '%s'\n", - at->ad->ad_cname.bv_val, 0, 0 ); - ch_free( at->sel_expr.bv_val ); - if ( at->from_tbls.bv_val != NULL ) { - ch_free( at->from_tbls.bv_val ); + at->bam_ad->ad_cname.bv_val, 0, 0 ); + ch_free( at->bam_sel_expr.bv_val ); + if ( at->bam_from_tbls.bv_val != NULL ) { + ch_free( at->bam_from_tbls.bv_val ); } - if ( at->join_where.bv_val != NULL ) { - ch_free( at->join_where.bv_val ); + if ( at->bam_join_where.bv_val != NULL ) { + ch_free( at->bam_join_where.bv_val ); } - if ( at->add_proc != NULL ) { - ch_free( at->add_proc ); + if ( at->bam_add_proc != NULL ) { + ch_free( at->bam_add_proc ); } - if ( at->delete_proc != NULL ) { - ch_free( at->delete_proc ); + if ( at->bam_delete_proc != NULL ) { + ch_free( at->bam_delete_proc ); } - if ( at->query ) { - ch_free( at->query ); + if ( at->bam_query ) { + ch_free( at->bam_query ); } /* TimesTen */ - if ( at->sel_expr_u.bv_val ) { - ch_free( at->sel_expr_u.bv_val ); + if ( at->bam_sel_expr_u.bv_val ) { + ch_free( at->bam_sel_expr_u.bv_val ); + } + + if ( at->bam_next ) { + backsql_free_attr( at->bam_next ); } ch_free( at ); @@ -588,20 +646,21 @@ backsql_free_attr( void *v_at ) static void backsql_free_oc( void *v_oc ) { - backsql_oc_map_rec *oc = v_oc; + backsql_oc_map_rec *oc = v_oc; + Debug( LDAP_DEBUG_TRACE, "==>free_oc(): '%s'\n", BACKSQL_OC_NAME( oc ), 0, 0 ); - avl_free( oc->attrs, backsql_free_attr ); - ch_free( oc->keytbl.bv_val ); - ch_free( oc->keycol.bv_val ); - if ( oc->create_proc != NULL ) { - ch_free( oc->create_proc ); + avl_free( oc->bom_attrs, backsql_free_attr ); + ch_free( oc->bom_keytbl.bv_val ); + ch_free( oc->bom_keycol.bv_val ); + if ( oc->bom_create_proc != NULL ) { + ch_free( oc->bom_create_proc ); } - if ( oc->create_keyval != NULL ) { - ch_free( oc->create_keyval ); + if ( oc->bom_create_keyval != NULL ) { + ch_free( oc->bom_create_keyval ); } - if ( oc->delete_proc != NULL ) { - ch_free( oc->delete_proc ); + if ( oc->bom_delete_proc != NULL ) { + ch_free( oc->bom_delete_proc ); } ch_free( oc ); diff --git a/servers/slapd/back-sql/schema-map.h b/servers/slapd/back-sql/schema-map.h index b9c8aa4625..f9add2d7c8 100644 --- a/servers/slapd/back-sql/schema-map.h +++ b/servers/slapd/back-sql/schema-map.h @@ -21,58 +21,66 @@ #ifndef __BACKSQL_SCHEMA_MAP_H__ #define __BACKSQL_SCHEMA_MAP_H__ -typedef struct { +typedef struct backsql_oc_map_rec { /* * Structure of corresponding LDAP objectClass definition */ - ObjectClass *oc; -#define BACKSQL_OC_NAME(ocmap) ((ocmap)->oc->soc_cname.bv_val) + ObjectClass *bom_oc; +#define BACKSQL_OC_NAME(ocmap) ((ocmap)->bom_oc->soc_cname.bv_val) - struct berval keytbl; - struct berval keycol; + struct berval bom_keytbl; + struct berval bom_keycol; /* expected to return keyval of newly created entry */ - char *create_proc; + char *bom_create_proc; /* in case create_proc does not return the keyval of the newly * created row */ - char *create_keyval; + char *bom_create_keyval; /* supposed to expect keyval as parameter and delete * all the attributes as well */ - char *delete_proc; + char *bom_delete_proc; /* flags whether delete_proc is a function (whether back-sql * should bind first parameter as output for return code) */ - int expect_return; - unsigned long id; - Avlnode *attrs; + int bom_expect_return; + unsigned long bom_id; + Avlnode *bom_attrs; } backsql_oc_map_rec; -typedef struct { +typedef struct backsql_at_map_rec { /* Description of corresponding LDAP attribute type */ - AttributeDescription *ad; - struct berval from_tbls; - struct berval join_where; - struct berval sel_expr; + AttributeDescription *bam_ad; + /* ObjectClass if bam_ad is objectClass */ + ObjectClass *bam_oc; + + struct berval bam_from_tbls; + struct berval bam_join_where; + struct berval bam_sel_expr; /* supposed to expect 2 binded values: entry keyval * and attr. value to add, like "add_name(?,?,?)" */ - char *add_proc; + char *bam_add_proc; /* supposed to expect 2 binded values: entry keyval * and attr. value to delete */ - char *delete_proc; + char *bam_delete_proc; /* for optimization purposes attribute load query * is preconstructed from parts on schemamap load time */ - char *query; + char *bam_query; /* following flags are bitmasks (first bit used for add_proc, * second - for delete_proc) */ /* order of parameters for procedures above; * 1 means "data then keyval", 0 means "keyval then data" */ - int param_order; + int bam_param_order; /* flags whether one or more of procedures is a function * (whether back-sql should bind first parameter as output * for return code) */ - int expect_return; + int bam_expect_return; /* TimesTen */ - struct berval sel_expr_u; + struct berval bam_sel_expr_u; + + /* next mapping for attribute */ + struct backsql_at_map_rec *bam_next; } backsql_at_map_rec; +#define BACKSQL_AT_MAP_REC_INIT { NULL, NULL, BER_BVC(""), BER_BVC(""), BER_BVNULL, NULL, NULL, NULL, 0, 0, BER_BVNULL, NULL } + /* defines to support bitmasks above */ #define BACKSQL_ADD 0x1 #define BACKSQL_DEL 0x2 diff --git a/servers/slapd/back-sql/search.c b/servers/slapd/back-sql/search.c index 5b5248886f..7266bd3dfb 100644 --- a/servers/slapd/back-sql/search.c +++ b/servers/slapd/back-sql/search.c @@ -39,13 +39,16 @@ static int backsql_process_filter( backsql_srch_info *bsi, Filter *f ); +static int backsql_process_filter_attr( backsql_srch_info *bsi, Filter *f, + backsql_at_map_rec *at ); + static int backsql_attrlist_add( backsql_srch_info *bsi, AttributeDescription *ad ) { int n_attrs = 0; AttributeName *an = NULL; - if ( bsi->attrs == NULL ) { + if ( bsi->bsi_attrs == NULL ) { return 1; } @@ -53,13 +56,13 @@ backsql_attrlist_add( backsql_srch_info *bsi, AttributeDescription *ad ) * clear the list (retrieve all attrs) */ if ( ad == NULL ) { - ch_free( bsi->attrs ); - bsi->attrs = NULL; + ch_free( bsi->bsi_attrs ); + bsi->bsi_attrs = NULL; return 1; } - for ( ; bsi->attrs[ n_attrs ].an_name.bv_val; n_attrs++ ) { - an = &bsi->attrs[ n_attrs ]; + for ( ; bsi->bsi_attrs[ n_attrs ].an_name.bv_val; n_attrs++ ) { + an = &bsi->bsi_attrs[ n_attrs ]; Debug( LDAP_DEBUG_TRACE, "==>backsql_attrlist_add(): " "attribute '%s' is in list\n", @@ -76,7 +79,7 @@ backsql_attrlist_add( backsql_srch_info *bsi, AttributeDescription *ad ) Debug( LDAP_DEBUG_TRACE, "==>backsql_attrlist_add(): " "adding '%s' to list\n", ad->ad_cname.bv_val, 0, 0 ); - an = (AttributeName *)ch_realloc( bsi->attrs, + an = (AttributeName *)ch_realloc( bsi->bsi_attrs, sizeof( AttributeName ) * ( n_attrs + 2 ) ); if ( an == NULL ) { return -1; @@ -87,7 +90,7 @@ backsql_attrlist_add( backsql_srch_info *bsi, AttributeDescription *ad ) an[ n_attrs + 1 ].an_name.bv_val = NULL; an[ n_attrs + 1 ].an_name.bv_len = 0; - bsi->attrs = an; + bsi->bsi_attrs = an; return 1; } @@ -107,26 +110,26 @@ backsql_init_search( { AttributeName *p; - bsi->base_dn = base; - bsi->scope = scope; - bsi->slimit = slimit; - bsi->tlimit = tlimit; - bsi->filter = filter; - bsi->dbh = dbh; - bsi->op = op; + bsi->bsi_base_dn = base; + bsi->bsi_scope = scope; + bsi->bsi_slimit = slimit; + bsi->bsi_tlimit = tlimit; + bsi->bsi_filter = filter; + bsi->bsi_dbh = dbh; + bsi->bsi_op = op; bsi->bsi_flags = 0; /* * handle "*" */ if ( attrs == NULL || an_find( attrs, &AllUser ) ) { - bsi->attrs = NULL; + bsi->bsi_attrs = NULL; } else { - bsi->attrs = (AttributeName *)ch_calloc( 1, + bsi->bsi_attrs = (AttributeName *)ch_calloc( 1, sizeof( AttributeName ) ); - bsi->attrs[ 0 ].an_name.bv_val = NULL; - bsi->attrs[ 0 ].an_name.bv_len = 0; + bsi->bsi_attrs[ 0 ].an_name.bv_val = NULL; + bsi->bsi_attrs[ 0 ].an_name.bv_len = 0; for ( p = attrs; p->an_name.bv_val; p++ ) { /* @@ -144,24 +147,25 @@ backsql_init_search( } } - bsi->abandon = 0; - bsi->id_list = NULL; - bsi->n_candidates = 0; - bsi->stoptime = stoptime; - bsi->sel.bb_val.bv_val = NULL; - bsi->sel.bb_val.bv_len = 0; - bsi->sel.bb_len = 0; - bsi->from.bb_val.bv_val = NULL; - bsi->from.bb_val.bv_len = 0; - bsi->from.bb_len = 0; - bsi->join_where.bb_val.bv_val = NULL; - bsi->join_where.bb_val.bv_len = 0; - bsi->join_where.bb_len = 0; - bsi->flt_where.bb_val.bv_val = NULL; - bsi->flt_where.bb_val.bv_len = 0; - bsi->flt_where.bb_len = 0; - - bsi->status = LDAP_SUCCESS; + bsi->bsi_abandon = 0; + bsi->bsi_id_list = NULL; + bsi->bsi_n_candidates = 0; + bsi->bsi_stoptime = stoptime; + bsi->bsi_sel.bb_val.bv_val = NULL; + bsi->bsi_sel.bb_val.bv_len = 0; + bsi->bsi_sel.bb_len = 0; + bsi->bsi_from.bb_val.bv_val = NULL; + bsi->bsi_from.bb_val.bv_len = 0; + bsi->bsi_from.bb_len = 0; + bsi->bsi_join_where.bb_val.bv_val = NULL; + bsi->bsi_join_where.bb_val.bv_len = 0; + bsi->bsi_join_where.bb_len = 0; + bsi->bsi_flt_where.bb_val.bv_val = NULL; + bsi->bsi_flt_where.bb_val.bv_len = 0; + bsi->bsi_flt_where.bb_len = 0; + bsi->bsi_filter_oc = NULL; + + bsi->bsi_status = LDAP_SUCCESS; } static int @@ -173,7 +177,7 @@ backsql_process_filter_list( backsql_srch_info *bsi, Filter *f, int op ) return 0; } - backsql_strfcat( &bsi->flt_where, "c", '(' /* ) */ ); + backsql_strfcat( &bsi->bsi_flt_where, "c", '(' /* ) */ ); while ( 1 ) { res = backsql_process_filter( bsi, f ); @@ -192,20 +196,20 @@ backsql_process_filter_list( backsql_srch_info *bsi, Filter *f, int op ) switch ( op ) { case LDAP_FILTER_AND: - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( " AND " ) - 1, " AND " ); break; case LDAP_FILTER_OR: - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( " OR " ) - 1, " OR " ); break; } } - backsql_strfcat( &bsi->flt_where, "c", /* ( */ ')' ); + backsql_strfcat( &bsi->bsi_flt_where, "c", /* ( */ ')' ); return 1; } @@ -215,19 +219,22 @@ backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f ) { int i; backsql_at_map_rec *at; - backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private; + backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private; int casefold = 0; if ( !f ) { return 0; } +#if 0 /* always uppercase strings by now */ if ( SLAP_MR_ASSOCIATED( f->f_sub_desc->ad_type->sat_substr, - bi->bi_caseIgnoreMatch ) ) { + bi->bi_caseIgnoreMatch ) ) +#endif + { casefold = 1; } - at = backsql_ad2at( bsi->oc, f->f_sub_desc ); + at = backsql_ad2at( bsi->bsi_oc, f->f_sub_desc ); assert( at ); @@ -237,49 +244,49 @@ backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f ) * SQL filters are more liberal. */ - backsql_strfcat( &bsi->flt_where, "c", '(' /* ) */ ); + backsql_strfcat( &bsi->bsi_flt_where, "c", '(' /* ) */ ); /* TimesTen */ - Debug( LDAP_DEBUG_TRACE, "expr: '%s' '%s'\n", at->sel_expr.bv_val, - at->sel_expr_u.bv_val ? at->sel_expr_u.bv_val : "", 0 ); + Debug( LDAP_DEBUG_TRACE, "expr: '%s' '%s'\n", at->bam_sel_expr.bv_val, + at->bam_sel_expr_u.bv_val ? at->bam_sel_expr_u.bv_val : "", 0 ); if ( casefold && bi->upper_func.bv_val ) { /* * If a pre-upper-cased version of the column exists, use it */ - if ( at->sel_expr_u.bv_val ) { - backsql_strfcat( &bsi->flt_where, + if ( at->bam_sel_expr_u.bv_val ) { + backsql_strfcat( &bsi->bsi_flt_where, "bl", - &at->sel_expr_u, + &at->bam_sel_expr_u, (ber_len_t)sizeof( " LIKE '" ) - 1, " LIKE '" ); } else { - backsql_strfcat( &bsi->flt_where, + backsql_strfcat( &bsi->bsi_flt_where, "bcbcl", &bi->upper_func, '(', - &at->sel_expr, + &at->bam_sel_expr, ')', (ber_len_t)sizeof( " LIKE '" ) - 1, " LIKE '" ); } } else { - backsql_strfcat( &bsi->flt_where, "bl", - &at->sel_expr, + backsql_strfcat( &bsi->bsi_flt_where, "bl", + &at->bam_sel_expr, (ber_len_t)sizeof( " LIKE '" ) - 1, " LIKE '" ); } if ( f->f_sub_initial.bv_val != NULL ) { size_t start; - start = bsi->flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, "b", + start = bsi->bsi_flt_where.bb_val.bv_len; + backsql_strfcat( &bsi->bsi_flt_where, "b", &f->f_sub_initial ); if ( casefold && bi->upper_func.bv_val ) { - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } } - backsql_strfcat( &bsi->flt_where, "c", '%' ); + backsql_strfcat( &bsi->bsi_flt_where, "c", '%' ); if ( f->f_sub_any != NULL ) { for ( i = 0; f->f_sub_any[ i ].bv_val != NULL; i++ ) { @@ -292,8 +299,8 @@ backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f ) 0, 0 ); #endif /* BACKSQL_TRACE */ - start = bsi->flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, + start = bsi->bsi_flt_where.bb_val.bv_len; + backsql_strfcat( &bsi->bsi_flt_where, "bc", &f->f_sub_any[ i ], '%' ); @@ -301,23 +308,23 @@ backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f ) /* * Note: toupper('%') = '%' */ - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } } if ( f->f_sub_final.bv_val != NULL ) { size_t start; - start = bsi->flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, "b", + start = bsi->bsi_flt_where.bb_val.bv_len; + backsql_strfcat( &bsi->bsi_flt_where, "b", &f->f_sub_final ); if ( casefold && bi->upper_func.bv_val ) { - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } } } - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( /* (' */ "')" ) - 1, /* ( */ "')" ); return 1; @@ -326,18 +333,10 @@ backsql_process_sub_filter( backsql_srch_info *bsi, Filter *f ) static int backsql_process_filter( backsql_srch_info *bsi, Filter *f ) { - backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private; backsql_at_map_rec *at; - backsql_at_map_rec oc_attr = { - slap_schema.si_ad_objectClass, BER_BVC(""), BER_BVC(""), - BER_BVNULL, NULL, NULL, NULL }; AttributeDescription *ad = NULL; int done = 0; - int casefold = 0; int rc = 0; - struct berval *filter_value = NULL; - MatchingRule *matching_rule = NULL; - struct berval ordering = BER_BVC("<="); Debug( LDAP_DEBUG_TRACE, "==>backsql_process_filter()\n", 0, 0, 0 ); if ( f == NULL || f->f_choice == SLAPD_FILTER_COMPUTED ) { @@ -358,11 +357,11 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) break; case LDAP_FILTER_NOT: - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( "NOT (" /* ) */ ) - 1, "NOT (" /* ) */ ); rc = backsql_process_filter( bsi, f->f_not ); - backsql_strfcat( &bsi->flt_where, "c", /* ( */ ')' ); + backsql_strfcat( &bsi->bsi_flt_where, "c", /* ( */ ')' ); done = 1; break; @@ -392,14 +391,44 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) */ if ( ad == slap_schema.si_ad_objectClass || ad == slap_schema.si_ad_structuralObjectClass ) { - struct berbuf bb = BB_NULL; + /* + * If the filter is LDAP_FILTER_PRESENT, then it's done; + * otherwise, let's see if we are lucky: filtering + * for "structural" objectclass or ancestor... + */ + switch ( f->f_choice ) { + case LDAP_FILTER_EQUALITY: + { + ObjectClass *oc = oc_bvfind( &f->f_av_value ); + + if ( oc == NULL ) { + bsi->bsi_status = LDAP_OTHER; + goto impossible; + } - at = &oc_attr; - backsql_strfcat( &bb, "cbc", - '\'', - &bsi->oc->oc->soc_cname, - '\'' ); - at->sel_expr = bb.bb_val; + /* + * objectClass inheritance: + * - a search for "person" will also return "inetOrgPerson" + * - a search for "top" will return everything + */ + if ( is_object_subclass( oc, bsi->bsi_oc->bom_oc ) ) { + goto filter_oc_success; + } + + break; + } + + case LDAP_FILTER_PRESENT: +filter_oc_success:; + backsql_strfcat( &bsi->bsi_flt_where, "l", + (ber_len_t)sizeof( "1=1" ) - 1, "1=1" ); + bsi->bsi_status = LDAP_SUCCESS; + goto done; + + default: + bsi->bsi_status = LDAP_OTHER; + goto impossible; + } } else if ( ad == slap_schema.si_ad_hasSubordinates || ad == NULL ) { /* @@ -416,7 +445,7 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) * selecting if there are descendants of the * candidate. */ - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( "1=1" ) - 1, "1=1" ); if ( ad == slap_schema.si_ad_hasSubordinates ) { /* @@ -434,38 +463,76 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) backsql_attrlist_add( bsi, NULL ); } goto done; - - } else { - at = backsql_ad2at( bsi->oc, ad ); } + /* look for attribute (also if objectClass but not structural one) */ + at = backsql_ad2at( bsi->bsi_oc, ad ); + if ( at == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_process_filter(): " "attribute '%s' is not defined for objectclass '%s'\n", - ad->ad_cname.bv_val, BACKSQL_OC_NAME( bsi->oc ), 0 ); - backsql_strfcat( &bsi->flt_where, "l", + ad->ad_cname.bv_val, BACKSQL_OC_NAME( bsi->bsi_oc ), 0 ); + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( "1=0" ) - 1, "1=0" ); + bsi->bsi_status = LDAP_UNDEFINED_TYPE; goto impossible; } - backsql_merge_from_clause( &bsi->from, &at->from_tbls ); + backsql_strfcat( &bsi->bsi_flt_where, "c", '(' ); +next:; + if ( backsql_process_filter_attr( bsi, f, at ) == -1 ) { + return -1; + } + + if ( at->bam_next ) { + backsql_strfcat( &bsi->bsi_flt_where, "l", + sizeof( " OR " ) - 1, " OR " ); + at = at->bam_next; + goto next; + } + backsql_strfcat( &bsi->bsi_flt_where, "c", ')' ); + +done:; + Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter()\n", 0, 0, 0 ); + return 1; + +impossible:; + Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter() returns -1\n", + 0, 0, 0 ); + return -1; +} + +static int +backsql_process_filter_attr( backsql_srch_info *bsi, Filter *f, backsql_at_map_rec *at ) +{ + backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private; + int casefold = 0; + struct berval *filter_value = NULL; + MatchingRule *matching_rule = NULL; + struct berval ordering = BER_BVC("<="); + + Debug( LDAP_DEBUG_TRACE, "==>backsql_process_filter_attr(%s)\n", + at->bam_ad->ad_cname.bv_val, 0, 0 ); + + backsql_merge_from_clause( &bsi->bsi_from, &at->bam_from_tbls ); + /* * need to add this attribute to list of attrs to load, - * so that we could do test_filter() later + * so that we can do test_filter() later */ - backsql_attrlist_add( bsi, ad ); + backsql_attrlist_add( bsi, at->bam_ad ); - if ( at->join_where.bv_val != NULL - && strstr( bsi->join_where.bb_val.bv_val, at->join_where.bv_val ) == NULL ) { - backsql_strfcat( &bsi->join_where, "lb", + if ( at->bam_join_where.bv_val != NULL + && strstr( bsi->bsi_join_where.bb_val.bv_val, at->bam_join_where.bv_val ) == NULL ) { + backsql_strfcat( &bsi->bsi_join_where, "lb", (ber_len_t)sizeof( " AND " ) - 1, " AND ", - &at->join_where ); + &at->bam_join_where ); } switch ( f->f_choice ) { case LDAP_FILTER_EQUALITY: filter_value = &f->f_av_value; - matching_rule = ad->ad_type->sat_equality; + matching_rule = at->bam_ad->ad_type->sat_equality; goto equality_match; @@ -476,8 +543,11 @@ backsql_process_filter( backsql_srch_info *bsi, Filter *f ) matching_rule = f->f_mr_rule; equality_match:; +#if 0 /* always uppercase strings by now */ if ( SLAP_MR_ASSOCIATED( matching_rule, - bi->bi_caseIgnoreMatch ) ) { + bi->bi_caseIgnoreMatch ) ) +#endif + { casefold = 1; } @@ -490,35 +560,35 @@ equality_match:; if ( casefold && bi->upper_func.bv_val ) { size_t start; - if ( at->sel_expr_u.bv_val ) { - backsql_strfcat( &bsi->flt_where, "cbl", - '(', - &at->sel_expr_u, + if ( at->bam_sel_expr_u.bv_val ) { + backsql_strfcat( &bsi->bsi_flt_where, "cbl", + '(', /* ) */ + &at->bam_sel_expr_u, (ber_len_t)sizeof( "='" ) - 1, "='" ); } else { - backsql_strfcat( &bsi->flt_where, "cbcbl", + backsql_strfcat( &bsi->bsi_flt_where, "cbcbl", '(' /* ) */ , &bi->upper_func, '(' /* ) */ , - &at->sel_expr, + &at->bam_sel_expr, (ber_len_t)sizeof( /* ( */ ")='" ) - 1, /* ( */ ")='" ); } - start = bsi->flt_where.bb_val.bv_len; + start = bsi->bsi_flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, "bl", + backsql_strfcat( &bsi->bsi_flt_where, "bl", filter_value, (ber_len_t)sizeof( /* (' */ "')" ) - 1, /* (' */ "')" ); - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } else { - backsql_strfcat( &bsi->flt_where, "cblbl", + backsql_strfcat( &bsi->bsi_flt_where, "cblbl", '(', - &at->sel_expr, + &at->bam_sel_expr, (ber_len_t)sizeof( "='" ) - 1, "='", filter_value, (ber_len_t)sizeof( /* (' */ "')" ) - 1, @@ -532,8 +602,11 @@ equality_match:; /* fall thru to next case */ case LDAP_FILTER_LE: - if ( SLAP_MR_ASSOCIATED( ad->ad_type->sat_ordering, - bi->bi_caseIgnoreMatch ) ) { +#if 0 /* always uppercase strings by now */ + if ( SLAP_MR_ASSOCIATED( at->bam_ad->ad_type->sat_ordering, + bi->bi_caseIgnoreMatch ) ) +#endif + { casefold = 1; } @@ -543,36 +616,36 @@ equality_match:; if ( casefold && bi->upper_func.bv_val ) { size_t start; - if ( at->sel_expr_u.bv_val ) { - backsql_strfcat( &bsi->flt_where, "cbbc", + if ( at->bam_sel_expr_u.bv_val ) { + backsql_strfcat( &bsi->bsi_flt_where, "cbbc", '(', - &at->sel_expr_u, + &at->bam_sel_expr_u, &ordering, '\'' ); } else { - backsql_strfcat( &bsi->flt_where, "cbcbcbc", + backsql_strfcat( &bsi->bsi_flt_where, "cbcbcbc", '(' /* ) */ , &bi->upper_func, '(' /* ) */ , - &at->sel_expr, + &at->bam_sel_expr, /* ( */ ')', &ordering, '\'' ); } - start = bsi->flt_where.bb_val.bv_len; + start = bsi->bsi_flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, "bl", + backsql_strfcat( &bsi->bsi_flt_where, "bl", filter_value, (ber_len_t)sizeof( /* (' */ "')" ) - 1, /* (' */ "')" ); - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } else { - backsql_strfcat( &bsi->flt_where, "cbbcbl", + backsql_strfcat( &bsi->bsi_flt_where, "cbbcbl", '(' /* ) */ , - &at->sel_expr, + &at->bam_sel_expr, &ordering, '\'', &f->f_av_value, @@ -582,10 +655,12 @@ equality_match:; break; case LDAP_FILTER_PRESENT: - backsql_strfcat( &bsi->flt_where, "lbl", - (ber_len_t)sizeof( "NOT (" ) - 1, "NOT (", - &at->sel_expr, - (ber_len_t)sizeof( " IS NULL)" ) - 1, " IS NULL)" ); + backsql_strfcat( &bsi->bsi_flt_where, "lbl", + (ber_len_t)sizeof( "NOT (" /* ) */) - 1, + "NOT (", /* ) */ + &at->bam_sel_expr, + (ber_len_t)sizeof( /* ( */ " IS NULL)" ) - 1, + /* ( */ " IS NULL)" ); break; case LDAP_FILTER_SUBSTRINGS: @@ -604,35 +679,35 @@ equality_match:; if ( bi->upper_func.bv_val ) { size_t start; - if ( at->sel_expr_u.bv_val ) { - backsql_strfcat( &bsi->flt_where, "cbl", - '(', - &at->sel_expr_u, + if ( at->bam_sel_expr_u.bv_val ) { + backsql_strfcat( &bsi->bsi_flt_where, "cbl", + '(', /* ) */ + &at->bam_sel_expr_u, (ber_len_t)sizeof( " LIKE '%" ) - 1, " LIKE '%" ); } else { - backsql_strfcat( &bsi->flt_where, "cbcbl", + backsql_strfcat( &bsi->bsi_flt_where, "cbcbl", '(' /* ) */ , &bi->upper_func, '(' /* ) */ , - &at->sel_expr, + &at->bam_sel_expr, (ber_len_t)sizeof( /* ( */ ") LIKE '%" ) - 1, /* ( */ ") LIKE '%" ); } - start = bsi->flt_where.bb_val.bv_len; + start = bsi->bsi_flt_where.bb_val.bv_len; - backsql_strfcat( &bsi->flt_where, "bl", + backsql_strfcat( &bsi->bsi_flt_where, "bl", &f->f_av_value, (ber_len_t)sizeof( /* (' */ "%')" ) - 1, /* (' */ "%')" ); - ldap_pvt_str2upper( &bsi->flt_where.bb_val.bv_val[ start ] ); + ldap_pvt_str2upper( &bsi->bsi_flt_where.bb_val.bv_val[ start ] ); } else { - backsql_strfcat( &bsi->flt_where, "cblbl", - '(', - &at->sel_expr, + backsql_strfcat( &bsi->bsi_flt_where, "cblbl", + '(', /* ) */ + &at->bam_sel_expr, (ber_len_t)sizeof( " LIKE '%" ) - 1, " LIKE '%", &f->f_av_value, @@ -644,33 +719,22 @@ equality_match:; default: /* unhandled filter type; should not happen */ assert( 0 ); - backsql_strfcat( &bsi->flt_where, "l", + backsql_strfcat( &bsi->bsi_flt_where, "l", (ber_len_t)sizeof( "1=1" ) - 1, "1=1" ); break; } -done: - if ( oc_attr.sel_expr.bv_val != NULL ) { - free( oc_attr.sel_expr.bv_val ); - } - - Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter()\n", 0, 0, 0 ); - return 1; + Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter_attr(%s)\n", + at->bam_ad->ad_cname.bv_val, 0, 0 ); -impossible: - if ( oc_attr.sel_expr.bv_val != NULL ) { - free( oc_attr.sel_expr.bv_val ); - } - Debug( LDAP_DEBUG_TRACE, "<==backsql_process_filter() returns -1\n", - 0, 0, 0 ); - return -1; + return 1; } static int backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) { - backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private; + backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private; int rc; assert( query ); @@ -678,62 +742,62 @@ backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) query->bv_len = 0; Debug( LDAP_DEBUG_TRACE, "==>backsql_srch_query()\n", 0, 0, 0 ); - bsi->sel.bb_val.bv_val = NULL; - bsi->sel.bb_val.bv_len = 0; - bsi->sel.bb_len = 0; - bsi->from.bb_val.bv_val = NULL; - bsi->from.bb_val.bv_len = 0; - bsi->from.bb_len = 0; - bsi->join_where.bb_val.bv_val = NULL; - bsi->join_where.bb_val.bv_len = 0; - bsi->join_where.bb_len = 0; - bsi->flt_where.bb_val.bv_val = NULL; - bsi->flt_where.bb_val.bv_len = 0; - bsi->flt_where.bb_len = 0; - - backsql_strfcat( &bsi->sel, "lbcbc", + bsi->bsi_sel.bb_val.bv_val = NULL; + bsi->bsi_sel.bb_val.bv_len = 0; + bsi->bsi_sel.bb_len = 0; + bsi->bsi_from.bb_val.bv_val = NULL; + bsi->bsi_from.bb_val.bv_len = 0; + bsi->bsi_from.bb_len = 0; + bsi->bsi_join_where.bb_val.bv_val = NULL; + bsi->bsi_join_where.bb_val.bv_len = 0; + bsi->bsi_join_where.bb_len = 0; + bsi->bsi_flt_where.bb_val.bv_val = NULL; + bsi->bsi_flt_where.bb_val.bv_len = 0; + bsi->bsi_flt_where.bb_len = 0; + + backsql_strfcat( &bsi->bsi_sel, "lbcbc", (ber_len_t)sizeof( "SELECT DISTINCT ldap_entries.id," ) - 1, "SELECT DISTINCT ldap_entries.id,", - &bsi->oc->keytbl, + &bsi->bsi_oc->bom_keytbl, '.', - &bsi->oc->keycol, + &bsi->bsi_oc->bom_keycol, ',' ); if ( bi->strcast_func.bv_val ) { - backsql_strfcat( &bsi->sel, "blbl", + backsql_strfcat( &bsi->bsi_sel, "blbl", &bi->strcast_func, (ber_len_t)sizeof( "('" /* ') */ ) - 1, "('" /* ') */ , - &bsi->oc->oc->soc_cname, + &bsi->bsi_oc->bom_oc->soc_cname, (ber_len_t)sizeof( /* (' */ "')" ) - 1, /* (' */ "')" ); } else { - backsql_strfcat( &bsi->sel, "cbc", + backsql_strfcat( &bsi->bsi_sel, "cbc", '\'', - &bsi->oc->oc->soc_cname, + &bsi->bsi_oc->bom_oc->soc_cname, '\'' ); } - backsql_strfcat( &bsi->sel, "l", + backsql_strfcat( &bsi->bsi_sel, "l", (ber_len_t)sizeof( " AS objectClass,ldap_entries.dn AS dn" ) - 1, " AS objectClass,ldap_entries.dn AS dn" ); - backsql_strfcat( &bsi->from, "lb", + backsql_strfcat( &bsi->bsi_from, "lb", (ber_len_t)sizeof( " FROM ldap_entries," ) - 1, " FROM ldap_entries,", - &bsi->oc->keytbl ); + &bsi->bsi_oc->bom_keytbl ); - backsql_strfcat( &bsi->join_where, "lbcbl", + backsql_strfcat( &bsi->bsi_join_where, "lbcbl", (ber_len_t)sizeof( " WHERE " ) - 1, " WHERE ", - &bsi->oc->keytbl, + &bsi->bsi_oc->bom_keytbl, '.', - &bsi->oc->keycol, + &bsi->bsi_oc->bom_keycol, (ber_len_t)sizeof( "=ldap_entries.keyval AND ldap_entries.oc_map_id=? AND " ) - 1, "=ldap_entries.keyval AND ldap_entries.oc_map_id=? AND " ); - switch ( bsi->scope ) { + switch ( bsi->bsi_scope ) { case LDAP_SCOPE_BASE: if ( bi->upper_func.bv_val ) { - backsql_strfcat( &bsi->join_where, "blbcb", + backsql_strfcat( &bsi->bsi_join_where, "blbcb", &bi->upper_func, (ber_len_t)sizeof( "(ldap_entries.dn)=" ) - 1, "(ldap_entries.dn)=", @@ -741,21 +805,21 @@ backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) '?', &bi->upper_func_close ); } else { - backsql_strfcat( &bsi->join_where, "l", + backsql_strfcat( &bsi->bsi_join_where, "l", (ber_len_t)sizeof( "ldap_entries.dn=?" ) - 1, "ldap_entries.dn=?" ); } break; case LDAP_SCOPE_ONELEVEL: - backsql_strfcat( &bsi->join_where, "l", + backsql_strfcat( &bsi->bsi_join_where, "l", (ber_len_t)sizeof( "ldap_entries.parent=?" ) - 1, "ldap_entries.parent=?" ); break; case LDAP_SCOPE_SUBTREE: if ( bi->upper_func.bv_val ) { - backsql_strfcat( &bsi->join_where, "blbcb", + backsql_strfcat( &bsi->bsi_join_where, "blbcb", &bi->upper_func, (ber_len_t)sizeof( "(ldap_entries.dn) LIKE " ) - 1, "(ldap_entries.dn) LIKE ", @@ -763,7 +827,7 @@ backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) '?', &bi->upper_func_close ); } else { - backsql_strfcat( &bsi->join_where, "l", + backsql_strfcat( &bsi->bsi_join_where, "l", (ber_len_t)sizeof( "ldap_entries.dn LIKE ?" ) - 1, "ldap_entries.dn LIKE ?" ); } @@ -774,16 +838,16 @@ backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) assert( 0 ); } - rc = backsql_process_filter( bsi, bsi->filter ); + rc = backsql_process_filter( bsi, bsi->bsi_filter ); if ( rc > 0 ) { struct berbuf bb = BB_NULL; backsql_strfcat( &bb, "bbblb", - &bsi->sel.bb_val, - &bsi->from.bb_val, - &bsi->join_where.bb_val, + &bsi->bsi_sel.bb_val, + &bsi->bsi_from.bb_val, + &bsi->bsi_join_where.bb_val, (ber_len_t)sizeof( " AND " ) - 1, " AND ", - &bsi->flt_where.bb_val ); + &bsi->bsi_flt_where.bb_val ); *query = bb.bb_val; @@ -796,18 +860,18 @@ backsql_srch_query( backsql_srch_info *bsi, struct berval *query ) query->bv_val = NULL; } - free( bsi->sel.bb_val.bv_val ); - bsi->sel.bb_val.bv_len = 0; - bsi->sel.bb_len = 0; - free( bsi->from.bb_val.bv_val ); - bsi->from.bb_val.bv_len = 0; - bsi->from.bb_len = 0; - free( bsi->join_where.bb_val.bv_val ); - bsi->join_where.bb_val.bv_len = 0; - bsi->join_where.bb_len = 0; - free( bsi->flt_where.bb_val.bv_val ); - bsi->flt_where.bb_val.bv_len = 0; - bsi->flt_where.bb_len = 0; + free( bsi->bsi_sel.bb_val.bv_val ); + bsi->bsi_sel.bb_val.bv_len = 0; + bsi->bsi_sel.bb_len = 0; + free( bsi->bsi_from.bb_val.bv_val ); + bsi->bsi_from.bb_val.bv_len = 0; + bsi->bsi_from.bb_len = 0; + free( bsi->bsi_join_where.bb_val.bv_val ); + bsi->bsi_join_where.bb_val.bv_len = 0; + bsi->bsi_join_where.bb_len = 0; + free( bsi->bsi_flt_where.bb_val.bv_val ); + bsi->bsi_flt_where.bb_val.bv_len = 0; + bsi->bsi_flt_where.bb_len = 0; Debug( LDAP_DEBUG_TRACE, "<==backsql_srch_query() returns %s\n", query->bv_val ? query->bv_val : "NULL", 0, 0 ); @@ -820,7 +884,7 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) { backsql_oc_map_rec *oc = v_oc; backsql_srch_info *bsi = v_bsi; - backsql_info *bi = (backsql_info *)bsi->op->o_bd->be_private; + backsql_info *bi = (backsql_info *)bsi->bsi_op->o_bd->be_private; struct berval query; SQLHSTMT sth; RETCODE rc; @@ -830,79 +894,92 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) int i; int j; - int n_candidates = bsi->n_candidates; + int n_candidates = bsi->bsi_n_candidates; - bsi->status = LDAP_SUCCESS; + bsi->bsi_status = LDAP_SUCCESS; - Debug( LDAP_DEBUG_TRACE, "==>backsql_oc_get_candidates(): oc='%s'\n", + Debug( LDAP_DEBUG_TRACE, "==>backsql_oc_get_candidates(): oc='%s'\n", BACKSQL_OC_NAME( oc ), 0, 0 ); - if ( bsi->n_candidates == -1 ) { + if ( bsi->bsi_n_candidates == -1 ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "unchecked limit has been overcome\n", 0, 0, 0 ); /* should never get here */ assert( 0 ); - bsi->status = LDAP_ADMINLIMIT_EXCEEDED; + bsi->bsi_status = LDAP_ADMINLIMIT_EXCEEDED; return BACKSQL_STOP; } - bsi->oc = oc; + bsi->bsi_oc = oc; res = backsql_srch_query( bsi, &query ); if ( res ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error while constructing query for objectclass '%s'\n", - oc->oc->soc_cname.bv_val, 0, 0 ); + oc->bom_oc->soc_cname.bv_val, 0, 0 ); /* * FIXME: need to separate errors from legally * impossible filters */ - bsi->status = LDAP_SUCCESS; - return BACKSQL_CONTINUE; + switch ( bsi->bsi_status ) { + case LDAP_SUCCESS: + case LDAP_UNDEFINED_TYPE: + case LDAP_NO_SUCH_OBJECT: + /* we are conservative... */ + default: + bsi->bsi_status = LDAP_SUCCESS; + /* try next */ + return BACKSQL_CONTINUE; + + case LDAP_ADMINLIMIT_EXCEEDED: + case LDAP_OTHER: + /* don't try any more */ + return BACKSQL_STOP; + } } if ( query.bv_val == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "could not construct query for objectclass '%s'\n", - oc->oc->soc_cname.bv_val, 0, 0 ); - bsi->status = LDAP_SUCCESS; + oc->bom_oc->soc_cname.bv_val, 0, 0 ); + bsi->bsi_status = LDAP_SUCCESS; return BACKSQL_CONTINUE; } Debug( LDAP_DEBUG_TRACE, "Constructed query: %s\n", query.bv_val, 0, 0 ); - rc = backsql_Prepare( bsi->dbh, &sth, query.bv_val, 0 ); + rc = backsql_Prepare( bsi->bsi_dbh, &sth, query.bv_val, 0 ); free( query.bv_val ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error preparing query\n", 0, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc ); - bsi->status = LDAP_OTHER; + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } - Debug( LDAP_DEBUG_TRACE, "id: '%ld'\n", bsi->oc->id, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "id: '%ld'\n", bsi->bsi_oc->bom_id, 0, 0 ); - if ( backsql_BindParamID( sth, 1, &bsi->oc->id ) != SQL_SUCCESS ) { + if ( backsql_BindParamID( sth, 1, &bsi->bsi_oc->bom_id ) != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error binding objectclass id parameter\n", 0, 0, 0 ); - bsi->status = LDAP_OTHER; + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } - switch ( bsi->scope ) { + switch ( bsi->bsi_scope ) { case LDAP_SCOPE_BASE: Debug( LDAP_DEBUG_TRACE, "(base)dn: '%s'\n", - bsi->base_dn->bv_val, 0, 0 ); + bsi->bsi_base_dn->bv_val, 0, 0 ); - rc = backsql_BindParamStr( sth, 2, bsi->base_dn->bv_val, + rc = backsql_BindParamStr( sth, 2, bsi->bsi_base_dn->bv_val, BACKSQL_MAX_DN_LEN ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error binding base_dn parameter\n", 0, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); - bsi->status = LDAP_OTHER; + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } break; @@ -920,7 +997,7 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) * We do not accept DNs longer than BACKSQL_MAX_DN_LEN; * however this should be handled earlier */ - assert( bsi->base_dn->bv_len <= BACKSQL_MAX_DN_LEN ); + assert( bsi->bsi_base_dn->bv_len <= BACKSQL_MAX_DN_LEN ); /* * Sets the parameters for the SQL built earlier @@ -937,17 +1014,17 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) */ if ( BACKSQL_HAS_LDAPINFO_DN_RU( bi ) ) { temp_base_dn[ 0 ] = '\0'; - for ( i = 0, j = bsi->base_dn->bv_len - 1; + for ( i = 0, j = bsi->bsi_base_dn->bv_len - 1; j >= 0; i++, j--) { - temp_base_dn[ i ] = bsi->base_dn->bv_val[ j ]; + temp_base_dn[ i ] = bsi->bsi_base_dn->bv_val[ j ]; } temp_base_dn[ i ] = '%'; temp_base_dn[ i + 1 ] = '\0'; } else { temp_base_dn[ 0 ] = '%'; - AC_MEMCPY( &temp_base_dn[ 1 ], bsi->base_dn->bv_val, - bsi->base_dn->bv_len + 1 ); + AC_MEMCPY( &temp_base_dn[ 1 ], bsi->bsi_base_dn->bv_val, + bsi->bsi_base_dn->bv_len + 1 ); } ldap_pvt_str2upper( temp_base_dn ); @@ -960,9 +1037,9 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error binding base_dn parameter (2)\n", 0, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); - bsi->status = LDAP_OTHER; + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } break; @@ -970,13 +1047,13 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) case LDAP_SCOPE_ONELEVEL: res = backsql_dn2id( bi, &base_id, - bsi->dbh, bsi->base_dn ); + bsi->bsi_dbh, bsi->bsi_base_dn ); if ( res != LDAP_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "could not retrieve base_dn id%s\n", res == LDAP_NO_SUCH_OBJECT ? ": no such entry" : "", 0, 0 ); - bsi->status = res; + bsi->bsi_status = res; return BACKSQL_CONTINUE; } @@ -988,7 +1065,7 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error binding base id parameter\n", 0, 0, 0 ); - bsi->status = LDAP_OTHER; + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } break; @@ -998,9 +1075,9 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) if ( !BACKSQL_SUCCESS( rc ) ) { Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "error executing query\n", 0, 0, 0 ); - backsql_PrintErrors( bi->db_env, bsi->dbh, sth, rc ); + backsql_PrintErrors( bi->db_env, bsi->bsi_dbh, sth, rc ); SQLFreeStmt( sth, SQL_DROP ); - bsi->status = LDAP_OTHER; + bsi->bsi_status = LDAP_OTHER; return BACKSQL_CONTINUE; } @@ -1011,17 +1088,17 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) sizeof( backsql_entryID ) ); c_id->id = strtol( row.cols[ 0 ], NULL, 0 ); c_id->keyval = strtol( row.cols[ 1 ], NULL, 0 ); - c_id->oc_id = bsi->oc->id; + c_id->oc_id = bsi->bsi_oc->bom_id; ber_str2bv( row.cols[ 3 ], 0, 1, &c_id->dn ); - c_id->next = bsi->id_list; - bsi->id_list = c_id; - bsi->n_candidates--; + c_id->next = bsi->bsi_id_list; + bsi->bsi_id_list = c_id; + bsi->bsi_n_candidates--; Debug( LDAP_DEBUG_TRACE, "backsql_oc_get_candidates(): " "added entry id=%ld, keyval=%ld dn='%s'\n", c_id->id, c_id->keyval, row.cols[ 3 ] ); - if ( bsi->n_candidates == -1 ) { + if ( bsi->bsi_n_candidates == -1 ) { break; } } @@ -1029,9 +1106,9 @@ backsql_oc_get_candidates( void *v_oc, void *v_bsi ) SQLFreeStmt( sth, SQL_DROP ); Debug( LDAP_DEBUG_TRACE, "<==backsql_oc_get_candidates(): %d\n", - n_candidates - bsi->n_candidates, 0, 0 ); + n_candidates - bsi->bsi_n_candidates, 0, 0 ); - return ( bsi->n_candidates == -1 ? BACKSQL_STOP : BACKSQL_CONTINUE ); + return ( bsi->bsi_n_candidates == -1 ? BACKSQL_STOP : BACKSQL_CONTINUE ); } int @@ -1167,12 +1244,12 @@ backsql_search( Operation *op, SlapReply *rs ) * of entries matching LDAP query filter and scope (or at least * candidates), and get the IDs */ - srch_info.n_candidates = ( isroot ? -2 : limit->lms_s_unchecked == -1 + srch_info.bsi_n_candidates = ( isroot ? -2 : limit->lms_s_unchecked == -1 ? -2 : limit->lms_s_unchecked ); avl_apply( bi->oc_by_oc, backsql_oc_get_candidates, &srch_info, BACKSQL_STOP, AVL_INORDER ); if ( !isroot && limit->lms_s_unchecked != -1 ) { - if ( srch_info.n_candidates == -1 ) { + if ( srch_info.bsi_n_candidates == -1 ) { rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED; send_ldap_result( op, rs ); goto done; @@ -1184,7 +1261,7 @@ backsql_search( Operation *op, SlapReply *rs ) * mentioned in attrs and filter), test it against full filter * and then send to client */ - for ( eid = srch_info.id_list; eid != NULL; + for ( eid = srch_info.bsi_id_list; eid != NULL; eid = backsql_free_entryID( eid, 1 ) ) { Attribute *hasSubordinate = NULL, *a = NULL; @@ -1233,7 +1310,7 @@ backsql_search( Operation *op, SlapReply *rs ) ber_bvarray_free( refs ); } - if (!rs->sr_ref) { + if ( !rs->sr_ref ) { rs->sr_text = "bad_referral object"; } @@ -1344,7 +1421,7 @@ end_of_search:; rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS : LDAP_REFERRAL; } else { - rs->sr_err = srch_info.status; + rs->sr_err = srch_info.bsi_status; } send_ldap_result( op, rs ); @@ -1354,7 +1431,7 @@ end_of_search:; } done:; - ch_free( srch_info.attrs ); + ch_free( srch_info.bsi_attrs ); Debug( LDAP_DEBUG_TRACE, "<==backsql_search()\n", 0, 0, 0 ); return 0; diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c index f44ffe8dda..414aeafc54 100644 --- a/servers/slapd/back-sql/sql-wrap.c +++ b/servers/slapd/back-sql/sql-wrap.c @@ -396,13 +396,18 @@ backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc ) Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " "SQLGetInfo() failed:\n", 0, 0, 0 ); backsql_PrintErrors( si->db_env, dbc->dbh, SQL_NULL_HENV, rc ); + return rc; } /* end TimesTen */ Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(): " "connected, adding to tree\n", 0, 0, 0 ); ldap_pvt_thread_mutex_lock( &si->dbconn_mutex ); - avl_insert( &si->db_conns, dbc, backsql_cmp_connid, NULL ); + if ( avl_insert( &si->db_conns, dbc, backsql_cmp_connid, avl_dup_error ) ) { + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " + "duplicate connection ID\n", 0, 0, 0 ); + return LDAP_OTHER; + } ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex ); Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn()\n", 0, 0, 0 ); diff --git a/servers/slapd/back-sql/util.h b/servers/slapd/back-sql/util.h index f3095db0a5..5282c1ae43 100644 --- a/servers/slapd/back-sql/util.h +++ b/servers/slapd/back-sql/util.h @@ -40,29 +40,35 @@ int backsql_entry_addattr( Entry *e, struct berval *at_name, struct berval *at_val, void *memctx ); typedef struct backsql_srch_info { - Operation *op; + Operation *bsi_op; int bsi_flags; #define BSQL_SF_ALL_OPER 0x0001 #define BSQL_SF_FILTER_HASSUBORDINATE 0x0002 - struct berval *base_dn; - int scope; - Filter *filter; - int slimit, tlimit; - time_t stoptime; - - backsql_entryID *id_list, *c_eid; - int n_candidates; - int abandon; - int status; - - backsql_oc_map_rec *oc; - struct berbuf sel, from, join_where, flt_where; - SQLHDBC dbh; - AttributeName *attrs; - - Entry *e; + struct berval *bsi_base_dn; + int bsi_scope; + Filter *bsi_filter; + int bsi_slimit, + bsi_tlimit; + time_t bsi_stoptime; + + backsql_entryID *bsi_id_list, + *bsi_c_eid; + int bsi_n_candidates; + int bsi_abandon; + int bsi_status; + + backsql_oc_map_rec *bsi_oc; + struct berbuf bsi_sel, + bsi_from, + bsi_join_where, + bsi_flt_where; + ObjectClass *bsi_filter_oc; + SQLHDBC bsi_dbh; + AttributeName *bsi_attrs; + + Entry *bsi_e; } backsql_srch_info; void backsql_init_search( backsql_srch_info *bsi, -- 2.39.5