summaryrefslogtreecommitdiff
path: root/accel-pppd/radius
diff options
context:
space:
mode:
Diffstat (limited to 'accel-pppd/radius')
-rw-r--r--accel-pppd/radius/CMakeLists.txt2
-rw-r--r--accel-pppd/radius/acct.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/accel-pppd/radius/CMakeLists.txt b/accel-pppd/radius/CMakeLists.txt
index 0c1789ef..566f3f9e 100644
--- a/accel-pppd/radius/CMakeLists.txt
+++ b/accel-pppd/radius/CMakeLists.txt
@@ -15,7 +15,7 @@ ADD_DEFINITIONS(-DDICTIONARY="${CMAKE_INSTALL_PREFIX}/share/accel-ppp/radius/dic
ADD_LIBRARY(radius SHARED ${sources})
INSTALL(TARGETS radius
- LIBRARY DESTINATION lib/accel-ppp
+ LIBRARY DESTINATION lib${LIB_SUFFIX}/accel-ppp
)
FILE(GLOB dict "${CMAKE_CURRENT_SOURCE_DIR}/dict/*")
INSTALL(FILES ${dict} DESTINATION share/accel-ppp/radius)
diff --git a/accel-pppd/radius/acct.c b/accel-pppd/radius/acct.c
index 9a832a9c..43e5549a 100644
--- a/accel-pppd/radius/acct.c
+++ b/accel-pppd/radius/acct.c
@@ -202,6 +202,12 @@ static void rad_acct_interim_update(struct triton_timer_t *t)
req_set_RA(rpd->acct_req, rpd->acct_req->serv->secret);
__rad_req_send(rpd->acct_req);
+ /* The above call may set rpd->acct_req to NULL in the following chain of events:
+ 1. __rad_req_send fails (on rad_server_realloc) and calls ppp_terminate;
+ 2. As a result, an EV_PPP_FINISHING event is fired;
+ 3. ppp_finishing calls rad_acct_stop that cleans up the request. */
+ if (!rpd->acct_req)
+ return;
__sync_add_and_fetch(&rpd->acct_req->serv->stat_interim_sent, 1);