From 9191946a63dac2ff4ee3ce2ec732cbf699193d3d Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 26 Jul 2012 12:07:48 +0200 Subject: Merge auth config items added from XAuth backends to IKE_SA --- src/libcharon/sa/ikev1/tasks/xauth.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/libcharon/sa/ikev1/tasks/xauth.c') 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); } -- cgit v1.2.3