Merge auth config items added from XAuth backends to IKE_SA
authorMartin Willi <martin@revosec.ch>
Thu, 26 Jul 2012 10:07:48 +0000 (12:07 +0200)
committerMartin Willi <martin@revosec.ch>
Thu, 26 Jul 2012 10:07:48 +0000 (12:07 +0200)
src/libcharon/sa/ikev1/tasks/xauth.c

index 12dd127..446445a 100644 (file)
@@ -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);
 }