diff options
| author | Martin Willi <martin@revosec.ch> | 2012-07-26 12:07:48 +0200 |
|---|---|---|
| committer | Martin Willi <martin@revosec.ch> | 2012-07-26 12:07:48 +0200 |
| commit | 9191946a63dac2ff4ee3ce2ec732cbf699193d3d (patch) | |
| tree | 341c878afee2b8e2debf8e1ee66513d0f5b9e301 /src/libcharon/sa/ikev1/tasks/xauth.c | |
| parent | 46df61dff7b21b2c3bbe49f352dcb1e1f3c29a72 (diff) | |
| download | strongswan-9191946a63dac2ff4ee3ce2ec732cbf699193d3d.tar.bz2 strongswan-9191946a63dac2ff4ee3ce2ec732cbf699193d3d.tar.xz | |
Merge auth config items added from XAuth backends to IKE_SA
Diffstat (limited to 'src/libcharon/sa/ikev1/tasks/xauth.c')
| -rw-r--r-- | src/libcharon/sa/ikev1/tasks/xauth.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libcharon/sa/ikev1/tasks/xauth.c b/src/libcharon/sa/ikev1/tasks/xauth.c index 12dd12781..446445a55 100644 --- a/src/libcharon/sa/ikev1/tasks/xauth.c +++ b/src/libcharon/sa/ikev1/tasks/xauth.c @@ -190,6 +190,7 @@ static void add_auth_cfg(private_xauth_t *this, identification_t *id, bool local auth = auth_cfg_create(); auth->add(auth, AUTH_RULE_AUTH_CLASS, AUTH_CLASS_XAUTH); auth->add(auth, AUTH_RULE_XAUTH_IDENTITY, id->clone(id)); + 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); } |