apparently Oracle does not support AS in joins (ITS#2642)

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

diff --git a/servers/slapd/back-sql/init.c b/servers/slapd/back-sql/init.c
index dd0e8320d95917a51b9d5b5989de01d47b0bb3d4..2e0c2829660c8330c8e30d6dd916a2602e26f907 100644 (file)
--- a/servers/slapd/back-sql/init.c
+++ b/servers/slapd/back-sql/init.c
@@ -23,7 +23,7 @@
 #ifdef SLAPD_SQL_DYNAMIC
 
 int
-backsql_LTX_init_module(
+init_module(
        int             argc, 
        char            *argv[] )
 {
@@ -215,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 "
@@ -412,7 +415,7 @@ backsql_db_open(
        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 ",
+                       "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 = bb.bb_val.bv_val;