From: Martin Willi <martin@revosec.ch>
Date: Tue, 6 Mar 2012 10:00:00 +0000 (+0100)
Subject: By default include radattr RADIUS attribute in any IKE_AUTH exchange
X-Git-Tag: 4.6.3~106
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bb0b20318660b1a44dca628e00ed61f933e77acc;p=thirdparty%2Fstrongswan.git

By default include radattr RADIUS attribute in any IKE_AUTH exchange
---

diff --git a/src/libcharon/plugins/radattr/radattr_listener.c b/src/libcharon/plugins/radattr/radattr_listener.c
index 2f1b18fe31..188dcb1b67 100644
--- a/src/libcharon/plugins/radattr/radattr_listener.c
+++ b/src/libcharon/plugins/radattr/radattr_listener.c
@@ -104,7 +104,8 @@ static void print_radius_attributes(private_radattr_listener_t *this,
 static void add_radius_attribute(private_radattr_listener_t *this,
 								 ike_sa_t *ike_sa, message_t *message)
 {
-	if (this->dir && message->get_message_id(message) == this->mid)
+	if (this->dir &&
+		(this->mid == -1 || message->get_message_id(message) == this->mid))
 	{
 		identification_t *id;
 		auth_cfg_t *auth;
@@ -212,7 +213,7 @@ radattr_listener_t *radattr_listener_create()
 		.dir = lib->settings->get_str(lib->settings,
 									  "charon.plugins.radattr.dir", NULL),
 		.mid = lib->settings->get_int(lib->settings,
-									  "charon.plugins.radattr.message_id", 2),
+									  "charon.plugins.radattr.message_id", -1),
 	);
 
 	return &this->public;