projects
/
freeradius.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'freeradius/v3.0.x' into tr-upgrade
[freeradius.git]
/
src
/
modules
/
rlm_sql
/
drivers
/
rlm_sql_oracle
/
rlm_sql_oracle.c
diff --git
a/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
b/src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
index
14aeaf7
..
1d2c027
100644
(file)
--- a/
src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
+++ b/
src/modules/rlm_sql/drivers/rlm_sql_oracle/rlm_sql_oracle.c
@@
-104,10
+104,8
@@
static int sql_check_error(rlm_sql_handle_t *handle, rlm_sql_config_t *config)
}
}
}
}
-static int
sql_socket_destructor(void *c
)
+static int
_sql_socket_destructor(rlm_sql_oracle_conn_t *conn
)
{
{
- rlm_sql_oracle_conn_t *conn = c;
-
if (conn->ctx) {
OCILogoff(conn->ctx, conn->error);
}
if (conn->ctx) {
OCILogoff(conn->ctx, conn->error);
}
@@
-140,7
+138,7
@@
static sql_rcode_t sql_socket_init(rlm_sql_handle_t *handle, rlm_sql_config_t *c
rlm_sql_oracle_conn_t *conn;
MEM(conn = handle->conn = talloc_zero(handle, rlm_sql_oracle_conn_t));
rlm_sql_oracle_conn_t *conn;
MEM(conn = handle->conn = talloc_zero(handle, rlm_sql_oracle_conn_t));
- talloc_set_destructor(
(void *) conn,
sql_socket_destructor);
+ talloc_set_destructor(
conn, _
sql_socket_destructor);
/*
* Initialises the oracle environment
/*
* Initialises the oracle environment