From 3c34e15ee41b99d87b802f8dff431bc3bcadb9ac Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Tue, 19 Mar 2013 10:57:17 +0100 Subject: [PATCH] Make sure that xauth-noauth is not used accidentally It has to be selected explicitly with rightauth2=xauth-noauth. --- src/libcharon/sa/xauth/xauth_manager.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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) -- 2.47.2