summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Kozlov <xeb@mail.ru>2010-11-15 21:14:18 +0300
committerDmitry Kozlov <xeb@mail.ru>2010-11-15 21:14:18 +0300
commit02cdfe60b703299caeb10dc49607101e40520eba (patch)
tree871f88b187771a1079705c66d1e8abd18bcbcba6
parent1cfae5217776e8f527b9529e19e22730c5977d66 (diff)
downloadaccel-ppp-02cdfe60b703299caeb10dc49607101e40520eba.tar.gz
accel-ppp-02cdfe60b703299caeb10dc49607101e40520eba.zip
ppp: fixed incorrect session termination if authentication failed
-rw-r--r--accel-pptpd/ppp/ppp.c2
-rw-r--r--accel-pptpd/radius/acct.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/accel-pptpd/ppp/ppp.c b/accel-pptpd/ppp/ppp.c
index ceefc1ea..a26e6446 100644
--- a/accel-pptpd/ppp/ppp.c
+++ b/accel-pptpd/ppp/ppp.c
@@ -397,7 +397,7 @@ void __export ppp_layer_finished(struct ppp_t *ppp, struct ppp_layer_data_t *d)
list_for_each_entry(n, &ppp->layers, entry) {
list_for_each_entry(d, &n->items, entry) {
- if (!d->finished)
+ if (d->starting && !d->finished)
return;
}
}
diff --git a/accel-pptpd/radius/acct.c b/accel-pptpd/radius/acct.c
index e0561822..cc0fdea9 100644
--- a/accel-pptpd/radius/acct.c
+++ b/accel-pptpd/radius/acct.c
@@ -119,8 +119,8 @@ static void rad_acct_timeout(struct triton_timer_t *t)
dt = ts - req->rpd->acct_timestamp;
if (dt > conf_acct_timeout) {
- log_ppp_warn("radius: acct: no response, terminating session...\n");
- ppp_terminate(req->rpd->ppp, 0, TERM_NAS_ERROR);
+ log_ppp_warn("radius:acct: no response, terminating session...\n");
+ ppp_terminate(req->rpd->ppp, TERM_NAS_ERROR, 0);
return;
}
if (dt > conf_acct_timeout / 2) {