GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tmp-fix-nas-port' into 'master'

Browse Source 
radius: do not include NAS-Port via rc_aaa()

Closes #269

See merge request openconnect/ocserv!150
This commit is contained in:
Nikos Mavrogiannopoulos
2020-03-20 12:40:08 +00:00
parent e97022e01d cf0bca2cae
commit 8ff144992c
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -11,6 +11,7 @@
- Corrected issue with DTLS-PSK negotiation which prevented it from being - Corrected issue with DTLS-PSK negotiation which prevented it from being
enabled. enabled.
- Improved IPv6 handling of AnyConnect client for Apple ios (#254). - Improved IPv6 handling of AnyConnect client for Apple ios (#254).
- Fixed issue with Radius accounting (#269).
* Version 0.12.6 (released 2019-12-28) * Version 0.12.6 (released 2019-12-28)

6
src/acct/radius.c
View File

@@ -185,7 +185,7 @@ static void radius_acct_session_stats(void *_vctx, unsigned auth_method, const c
append_acct_standard(vctx, vctx->rh, ai, &send); append_acct_standard(vctx, vctx->rh, ai, &send);
append_stats(vctx->rh, &send, stats); append_stats(vctx->rh, &send, stats);
ret = rc_aaa(vctx->rh, ai->id, send, &recvd, NULL, 1, PW_ACCOUNTING_REQUEST); ret = rc_aaa(vctx->rh, 0, send, &recvd, NULL, 0, PW_ACCOUNTING_REQUEST);
if (recvd != NULL) if (recvd != NULL)
rc_avpair_free(recvd); rc_avpair_free(recvd);
@@ -227,7 +227,7 @@ static int radius_acct_open_session(void *_vctx, unsigned auth_method, const com
append_acct_standard(vctx, vctx->rh, ai, &send); append_acct_standard(vctx, vctx->rh, ai, &send);
ret = rc_aaa(vctx->rh, ai->id, send, &recvd, NULL, 1, PW_ACCOUNTING_REQUEST); ret = rc_aaa(vctx->rh, 0, send, &recvd, NULL, 0, PW_ACCOUNTING_REQUEST);
if (recvd != NULL) if (recvd != NULL)
rc_avpair_free(recvd); rc_avpair_free(recvd);
@@ -276,7 +276,7 @@ static void radius_acct_close_session(void *_vctx, unsigned auth_method, const c
append_acct_standard(vctx, vctx->rh, ai, &send); append_acct_standard(vctx, vctx->rh, ai, &send);
append_stats(vctx->rh, &send, stats); append_stats(vctx->rh, &send, stats);
ret = rc_aaa(vctx->rh, ai->id, send, &recvd, NULL, 1, PW_ACCOUNTING_REQUEST); ret = rc_aaa(vctx->rh, 0, send, &recvd, NULL, 0, PW_ACCOUNTING_REQUEST);
if (recvd != NULL) if (recvd != NULL)
rc_avpair_free(recvd); rc_avpair_free(recvd);

2
src/auth/radius.c
View File

@@ -348,7 +348,7 @@ static int radius_auth_pass(void *ctx, const char *pass, unsigned pass_len)
} }
pctx->pass_msg[0] = 0; pctx->pass_msg[0] = 0;
ret = rc_aaa(pctx->vctx->rh, pctx->id, send, &recvd, pctx->pass_msg, 1, PW_ACCESS_REQUEST); ret = rc_aaa(pctx->vctx->rh, 0, send, &recvd, pctx->pass_msg, 0, PW_ACCESS_REQUEST);
if (ret == OK_RC) { if (ret == OK_RC) {
uint32_t ipv4; uint32_t ipv4;