X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Finit.c;h=c4fb088a518e945b63058645570edefbd12ae93d;hb=9647ccd9456b8781066dbba5a063bf6c6c9dab6d;hp=b946f24c10c8bf43835329dffd568211e55af7c7;hpb=8995d8341f8419047ede1cfdf0684da89495930d;p=openldap diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c index b946f24c10..c4fb088a51 100644 --- a/servers/slapd/back-sql/init.c +++ b/servers/slapd/back-sql/init.c @@ -1,10 +1,21 @@ -/* - * Copyright 1999, Dmitry Kovalev , All rights reserved. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * Redistribution and use in source and binary forms are permitted only - * as authorized by the OpenLDAP Public License. A copy of this - * license is available at http://www.OpenLDAP.org/license.html or - * in file LICENSE in the top-level directory of the distribution. + * Copyright 1999-2003 The OpenLDAP Foundation. + * Portions Copyright 1999 Dmitry Kovalev. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by Dmitry Kovalev for inclusion + * by OpenLDAP Software. */ #include "portable.h" @@ -23,7 +34,7 @@ #ifdef SLAPD_SQL_DYNAMIC int -backsql_LTX_init_module( +init_module( int argc, char *argv[] ) { @@ -37,7 +48,7 @@ backsql_LTX_init_module( return 0; } -#endif /* SLAPD_SHELL_DYNAMIC */ +#endif /* SLAPD_SQL_DYNAMIC */ int sql_back_initialize( @@ -163,7 +174,7 @@ backsql_db_open( backsql_info *si = (backsql_info*)bd->be_private; SQLHDBC dbh; ber_len_t idq_len; - struct berval bv; + struct berbuf bb = BB_NULL; Operation otmp; @@ -215,7 +226,10 @@ backsql_db_open( ber_str2bv( /* (? */ ")", 0, 1, &si->upper_func_close ); } } - + + /* normalize filter values only if necessary */ + si->bi_caseIgnoreMatch = mr_find( "caseIgnoreMatch" ); + if ( si->dbuser == NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): " "user name not specified " @@ -228,12 +242,12 @@ backsql_db_open( * Prepare concat function for subtree search condition */ struct berval concat; - ber_len_t len = 0; struct berval values[] = { { sizeof( "'%'" ) - 1, "'%'" }, { sizeof( "?" ) - 1, "?" }, { 0, NULL } }; + struct berbuf bb = BB_NULL; if ( backsql_prepare_pattern( si->concat_func, values, &concat ) ) { @@ -247,16 +261,13 @@ backsql_db_open( "(use \"subtree_cond\" directive in slapd.conf)\n", 0, 0, 0); - si->subtree_cond.bv_val = NULL; - si->subtree_cond.bv_len = 0; - if ( si->upper_func.bv_val ) { /* * UPPER(ldap_entries.dn) LIKE UPPER(CONCAT('%',?)) */ - backsql_strfcat( &si->subtree_cond, &len, "blbbb", + backsql_strfcat( &bb, "blbbb", &si->upper_func, (ber_len_t)sizeof( "(ldap_entries.dn) LIKE " ) - 1, "(ldap_entries.dn) LIKE ", @@ -270,11 +281,13 @@ backsql_db_open( * ldap_entries.dn LIKE CONCAT('%',?) */ - backsql_strfcat( &si->subtree_cond, &len, "lb", + backsql_strfcat( &bb, "lb", (ber_len_t)sizeof( "ldap_entries.dn LIKE " ) - 1, "ldap_entries.dn LIKE ", &concat ); } + + si->subtree_cond = bb.bb_val; Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): " "setting '%s' as default\n", @@ -282,7 +295,7 @@ backsql_db_open( } if ( si->children_cond.bv_val == NULL ) { - ber_len_t len = 0; + struct berbuf bb = BB_NULL; if ( si->upper_func.bv_val ) { @@ -290,7 +303,7 @@ backsql_db_open( * UPPER(ldap_entries.dn) LIKE UPPER(CONCAT('%,',?)) */ - backsql_strfcat( &si->children_cond, &len, "blbl", + backsql_strfcat( &bb, "blbl", &si->upper_func, (ber_len_t)sizeof( "(ldap_entries.dn)=" ) - 1, "(ldap_entries.dn)=", @@ -303,10 +316,12 @@ backsql_db_open( * ldap_entries.dn LIKE CONCAT('%,',?) */ - backsql_strfcat( &si->children_cond, &len, "l", + backsql_strfcat( &bb, "l", (ber_len_t)sizeof( "ldap_entries.dn=?" ) - 1, "ldap_entries.dn=?"); } + + si->children_cond = bb.bb_val; Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): " "setting '%s' as default\n", @@ -377,23 +392,20 @@ backsql_db_open( si->id_query = NULL; idq_len = 0; - bv.bv_val = NULL; - bv.bv_len = 0; if ( si->upper_func.bv_val == NULL ) { - backsql_strcat( &bv, &idq_len, backsql_id_query, - "dn=?", NULL ); + backsql_strcat( &bb, backsql_id_query, "dn=?", NULL ); } else { if ( BACKSQL_HAS_LDAPINFO_DN_RU( si ) ) { - backsql_strcat( &bv, &idq_len, backsql_id_query, + backsql_strcat( &bb, backsql_id_query, "dn_ru=?", NULL ); } else { if ( BACKSQL_USE_REVERSE_DN( si ) ) { - backsql_strfcat( &bv, &idq_len, "sbl", + backsql_strfcat( &bb, "sbl", backsql_id_query, &si->upper_func, (ber_len_t)sizeof( "(dn)=?" ) - 1, "(dn)=?" ); } else { - backsql_strfcat( &bv, &idq_len, "sblbcb", + backsql_strfcat( &bb, "sblbcb", backsql_id_query, &si->upper_func, (ber_len_t)sizeof( "(dn)=" ) - 1, "(dn)=", @@ -403,21 +415,21 @@ backsql_db_open( } } } - si->id_query = bv.bv_val; + si->id_query = bb.bb_val.bv_val; /* * Prepare children ID selection query */ si->has_children_query = NULL; - idq_len = 0; - bv.bv_val = NULL; - bv.bv_len = 0; - backsql_strfcat( &bv, &idq_len, "sb", - "SELECT COUNT(distinct subordinates.id) FROM ldap_entries,ldap_entries AS subordinates WHERE subordinates.parent=ldap_entries.id AND ", + bb.bb_val.bv_val = NULL; + bb.bb_val.bv_len = 0; + bb.bb_len = 0; + backsql_strfcat( &bb, "sb", + "SELECT COUNT(distinct subordinates.id) FROM ldap_entries,ldap_entries subordinates WHERE subordinates.parent=ldap_entries.id AND ", &si->children_cond ); - si->has_children_query = bv.bv_val; + si->has_children_query = bb.bb_val.bv_val; backsql_free_db_conn( &otmp ); if ( !BACKSQL_SCHEMA_LOADED( si ) ) {