Make sure that xauth-noauth is not used accidentally

It has to be selected explicitly with rightauth2=xauth-noauth.
This commit is contained in:
Tobias Brunner 2013-03-19 10:57:17 +01:00
parent e4013bb904
commit 3c34e15ee4
1 changed files with 5 additions and 2 deletions

View File

@ -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)