cleanup

diff --git a/configure b/configure
index 0a6492048a3b942a34255ee7783073883dcd7cfa..a616d0c7d9c53c481d8538363e5424e6a16ba7fa 100755 (executable)
--- a/configure
+++ b/configure
@@ -20951,14 +20951,14 @@ fi
 done
 
 
-       echo $ac_n "checking for SQLDriverConnect in -liodbc""... $ac_c" 1>&6
-echo "configure:20956: checking for SQLDriverConnect in -liodbc" >&5
-ac_lib_var=`echo iodbc'_'SQLDriverConnect | sed 'y%./+-:%__p__%'`
+       echo $ac_n "checking for SQLDriverConnect in -lodbc""... $ac_c" 1>&6
+echo "configure:20956: checking for SQLDriverConnect in -lodbc" >&5
+ac_lib_var=`echo odbc'_'SQLDriverConnect | sed 'y%./+-:%__p__%'`
 if eval "test \"\${ac_cv_lib_$ac_lib_var+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   ac_save_LIBS="$LIBS"
-LIBS="-liodbc  $LIBS"
+LIBS="-lodbc  $LIBS"
 cat > conftest.$ac_ext <<EOF
 #line 20964 "configure"
 #include "confdefs.h"
@@ -20986,14 +20986,14 @@ LIBS="$ac_save_LIBS"
 fi
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
   echo "$ac_t""yes" 1>&6
-  have_iodbc=yes
+  have_odbc=yes
 else
   echo "$ac_t""no" 1>&6
-have_iodbc=no
+have_odbc=no
 fi
 
-       if test $have_iodbc = yes ; then
-               ol_link_sql="-liodbc"
+       if test $have_odbc = yes ; then
+               ol_link_sql="-lodbc"
        else
                echo $ac_n "checking for SQLDriverConnect in -lodbc""... $ac_c" 1>&6
 echo "configure:21000: checking for SQLDriverConnect in -lodbc" >&5

diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c
index 7709f817de9cc4da892c1d4339ae8bf60a54c530..292c63c3ce87b2774a997490b72537ad844fad81 100644 (file)
--- a/servers/slapd/back-sql/sql-wrap.c
+++ b/servers/slapd/back-sql/sql-wrap.c
@@ -328,8 +328,10 @@ backsql_open_db_conn( backsql_info *si, unsigned long ldap_cid, backsql_db_conn
                return LDAP_UNAVAILABLE;
        }
 
-       rc = SQLConnect( dbc->dbh, si->dbname, SQL_NTS, si->dbuser, 
-                       SQL_NTS, si->dbpasswd, SQL_NTS );
+       rc = SQLConnect( dbc->dbh,
+                       (SQLCHAR*)si->dbname, SQL_NTS,
+                       (SQLCHAR*)si->dbuser, SQL_NTS,
+                       (SQLCHAR*)si->dbpasswd, SQL_NTS );
        if ( rc != SQL_SUCCESS ) {
                Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: "
                        "SQLConnect() to database \"%s\" as user \"%s\" "

diff --git a/servers/slapd/back-sql/util.c b/servers/slapd/back-sql/util.c
index d70b884da35b823628b49990c925e30c65465de1..f3de6685e707c0cd65e6f0587edcec0fd4a3c470 100644 (file)
--- a/servers/slapd/back-sql/util.c
+++ b/servers/slapd/back-sql/util.c
@@ -59,7 +59,7 @@ char backsql_id_query[] = "SELECT id,keyval,oc_map_id FROM ldap_entries WHERE ";
 char backsql_def_concat_func[] = "CONCAT(?,?)";
 
 /* TimesTen */
-char backsql_check_dn_ru_query[] = "SELECT dn_ru from ldap_entries";
+char backsql_check_dn_ru_query[] = "SELECT dn_ru FROM ldap_entries";
 
 struct berbuf *
 backsql_strcat( struct berbuf *dest, ... )