From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 19 Mar 2013 09:57:17 +0000 (+0100)
Subject: Make sure that xauth-noauth is not used accidentally
X-Git-Tag: 5.0.3rc1~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c34e15ee41b99d87b802f8dff431bc3bcadb9ac;p=thirdparty%2Fstrongswan.git

Make sure that xauth-noauth is not used accidentally

It has to be selected explicitly with rightauth2=xauth-noauth.
---

diff --git a/src/libcharon/sa/xauth/xauth_manager.c b/src/libcharon/sa/xauth/xauth_manager.c
index f0602a6734..5709dc6526 100644
--- a/src/libcharon/sa/xauth/xauth_manager.c
+++ b/src/libcharon/sa/xauth/xauth_manager.c
@@ -112,8 +112,11 @@ METHOD(xauth_manager_t, create_instance, xauth_method_t*,
 	enumerator = this->methods->create_enumerator(this->methods);
 	while (enumerator->enumerate(enumerator, &entry))
 	{
-		if (role == entry->role &&
-			(!name || streq(name, entry->name)))
+		if (!name && streq(entry->name, "noauth"))
+		{	/* xauth-noauth has to be configured explicitly */
+			continue;
+		}
+		if (role == entry->role && (!name || streq(name, entry->name)))
 		{
 			method = entry->constructor(server, peer);
 			if (method)