|
 |
68b0ca5 |
--- freeradius-server-2.1.3.orig/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c 2008-12-05 11:37:56.000000000 -0500
|
|
|
68b0ca5 |
+++ freeradius-server-2.1.3/src/modules/rlm_sql/drivers/rlm_sql_unixodbc/sql_unixodbc.c 2009-02-24 09:51:23.000000000 -0500
|
|
|
68b0ca5 |
@@ -166,7 +166,8 @@
|
|
|
68b0ca5 |
*************************************************************************/
|
|
|
68b0ca5 |
static int sql_select_query(SQLSOCK *sqlsocket, SQL_CONFIG *config, char *querystr) {
|
|
|
68b0ca5 |
rlm_sql_unixodbc_sock *unixodbc_sock = sqlsocket->conn;
|
|
|
68b0ca5 |
- SQLINTEGER column, len;
|
|
|
68b0ca5 |
+ SQLINTEGER column;
|
|
|
68b0ca5 |
+ SQLLEN len;
|
|
|
68b0ca5 |
int numfields;
|
|
|
68b0ca5 |
int state;
|
|
|
68b0ca5 |
|
|
|
68b0ca5 |
@@ -184,7 +185,7 @@
|
|
|
68b0ca5 |
|
|
|
68b0ca5 |
for(column=1; column<=numfields; column++) {
|
|
|
68b0ca5 |
SQLColAttributes(unixodbc_sock->stmt_handle,((SQLUSMALLINT) column),SQL_COLUMN_LENGTH,NULL,0,NULL,&len;;
|
|
|
68b0ca5 |
- unixodbc_sock->row[column-1] = (SQLCHAR*)rad_malloc((int)++len);
|
|
|
68b0ca5 |
+ unixodbc_sock->row[column-1] = (char*)rad_malloc((int)++len);
|
|
|
68b0ca5 |
SQLBindCol(unixodbc_sock->stmt_handle, column, SQL_C_CHAR, (SQLCHAR *)unixodbc_sock->row[column-1], len, NULL);
|
|
|
68b0ca5 |
}
|
|
|
68b0ca5 |
return 0;
|
|
|
68b0ca5 |
@@ -440,9 +441,9 @@
|
|
|
68b0ca5 |
static int sql_affected_rows(SQLSOCK *sqlsocket, SQL_CONFIG *config) {
|
|
|
68b0ca5 |
rlm_sql_unixodbc_sock *unixodbc_sock = sqlsocket->conn;
|
|
|
68b0ca5 |
long err_handle;
|
|
|
68b0ca5 |
- int affected_rows;
|
|
|
68b0ca5 |
+ SQLLEN affected_rows;
|
|
|
68b0ca5 |
|
|
|
68b0ca5 |
- err_handle = SQLRowCount(unixodbc_sock->stmt_handle, (SQLINTEGER *)&affected_rows);
|
|
|
68b0ca5 |
+ err_handle = SQLRowCount(unixodbc_sock->stmt_handle, &affected_rows);
|
|
|
68b0ca5 |
if (sql_state(err_handle, sqlsocket, config))
|
|
|
68b0ca5 |
return -1;
|
|
|
68b0ca5 |
|