Fix typos in last commit

[openldap] / servers / slapd / back-sql / init.c

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index 1548b7e39ca4d1e9afaad238dcf2a324039e3846..49b86f3a1e6cb3ed214cc118e93604d2cb0e1d19 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -161,11 +161,12 @@ backsql_db_open(
        BackendDB       *bd )
 {
        backsql_info    *si = (backsql_info*)bd->be_private;
-       Connection      tmp;
        SQLHDBC         dbh;
        ber_len_t       idq_len;
-       struct berval   bv;
+       struct berbuf   bb = BB_NULL;
 
+       Operation       otmp;
+               
        Debug( LDAP_DEBUG_TRACE, "==>backsql_db_open(): "
                "testing RDBMS connection\n", 0, 0, 0 );
        if ( si->dbname == NULL ) {
@@ -214,7 +215,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 "
@@ -227,12 +231,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 ) ) {
@@ -246,16 +250,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 ",
@@ -269,11 +270,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",
@@ -281,7 +284,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 ) {
 
@@ -289,7 +292,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)=",
@@ -302,10 +305,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",
@@ -362,9 +367,9 @@ backsql_db_open(
                si->delentry_query = ch_strdup( backsql_def_delentry_query );
        }
 
-
-       tmp.c_connid =- 1;
-       if ( backsql_get_db_conn( bd, &tmp, &dbh ) != LDAP_SUCCESS ) {
+       otmp.o_connid = -1;
+       otmp.o_bd = bd;
+       if ( backsql_get_db_conn( &otmp, &dbh ) != LDAP_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
                        "connection failed, exiting\n", 0, 0, 0 );
                return 1;
@@ -376,23 +381,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)=",
@@ -402,23 +404,23 @@ 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",
+       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 AS 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( bd, &tmp );
+       backsql_free_db_conn( &otmp );
        if ( !BACKSQL_SCHEMA_LOADED( si ) ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_db_open(): "
                        "test failed, schema map not loaded - exiting\n",
@@ -441,12 +443,14 @@ backsql_db_close(
 }
 
 int
-backsql_connection_destroy(
-       BackendDB       *be,
-       Connection      *conn )
+backsql_connection_destroy( Backend *bd, Connection *c )
 {
+       Operation o;
+       o.o_bd = bd;
+       o.o_connid = c->c_connid;
+
        Debug( LDAP_DEBUG_TRACE, "==>backsql_connection_destroy()\n", 0, 0, 0 );
-       backsql_free_db_conn( be, conn );
+       backsql_free_db_conn( &o );
        Debug( LDAP_DEBUG_TRACE, "<==backsql_connection_destroy()\n", 0, 0, 0 );
        return 0;
 }