mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-06 10:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Pierangelo Masarati 2004-08-24 15:16:06 +00:00
parent e4f9fcf63b
commit aae3c074f1
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configure vendored
View File

@ -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

6
servers/slapd/back-sql/sql-wrap.c
View File

@ -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\" "

2
servers/slapd/back-sql/util.c
View File

@ -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, ... )