denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xauth: Call authorize() hook also when xauth-noauth is used

Browse Source 
Fixes #1138.
This commit is contained in:
Tobias Brunner
2015-11-09 14:44:53 +01:00
parent 50e4aeb22f
commit bd5084ae25
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/sa/ikev1/tasks/xauth.c
+8 -2
View File
@@ -271,7 +271,10 @@ static bool add_auth_cfg(private_xauth_t *this, identification_t *id, bool local
auth = auth_cfg_create(); auth = auth_cfg_create();
auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_XAUTH); auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_XAUTH);
auth->add(auth, AUTH_RULE_XAUTH_IDENTITY, id->clone(id)); if (id)
{
auth->add(auth, AUTH_RULE_XAUTH_IDENTITY, id->clone(id));
}
auth->merge(auth, this->ike_sa->get_auth_cfg(this->ike_sa, local), FALSE); auth->merge(auth, this->ike_sa->get_auth_cfg(this->ike_sa, local), FALSE);
this->ike_sa->add_auth_cfg(this->ike_sa, local, auth); this->ike_sa->add_auth_cfg(this->ike_sa, local, auth);
@@ -342,7 +345,10 @@ METHOD(task_t, build_i, status_t,
break; break;
case SUCCESS: case SUCCESS:
DESTROY_IF(cp); DESTROY_IF(cp);
this->status = XAUTH_OK; if (add_auth_cfg(this, NULL, FALSE) && allowed(this))
{
this->status = XAUTH_OK;
}
this->public.task.process = _process_i_status; this->public.task.process = _process_i_status;
return build_i_status(this, message); return build_i_status(this, message);
default: default: