fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 12:18:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dbus-1.8'

Browse source 
Conflicts:
	cmake/test/CMakeLists.txt
	test/Makefile.am
This commit is contained in:
Ralf Habacker 2015-05-01 23:08:43 +02:00
commit 9979b9916f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
dbus/dbus-server.c
View file

@ -1043,7 +1043,10 @@ dbus_server_set_auth_mechanisms (DBusServer *server,
{
copy = _dbus_dup_string_array (mechanisms);
if (copy == NULL)
return FALSE;
{
SERVER_UNLOCK (server);
return FALSE;
}
}
else
copy = NULL;