fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-08 16:20:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not mention disallowed auth mechanisms in REJECTED message

Browse source 
Previously, all implemented mechanisms were included, even if the
sysadmin had configured them not to be allowed.

Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99621
This commit is contained in:
Ralf Habacker 2017-02-01 22:11:40 +01:00
parent b16eb872fb
commit 7d2d823707
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dbus/dbus-auth.c
View file

@ -1485,9 +1485,14 @@ send_rejected (DBusAuth *auth)
"REJECTED"))
goto nomem;
i = 0;
while (all_mechanisms[i].mechanism != NULL)
for (i = 0; all_mechanisms[i].mechanism != NULL; i++)
{
/* skip mechanisms that aren't allowed */
if (auth->allowed_mechs != NULL &&
!_dbus_string_array_contains ((const char**)auth->allowed_mechs,
all_mechanisms[i].mechanism))
continue;
if (!_dbus_string_append (&command,
" "))
goto nomem;
@ -1495,8 +1500,6 @@ send_rejected (DBusAuth *auth)
if (!_dbus_string_append (&command,
all_mechanisms[i].mechanism))
goto nomem;
++i;
}
if (!_dbus_string_append (&command, "\r\n"))