diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2015-05-01 23:08:43 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2015-05-01 23:08:43 +0200 |
| commit | 9979b9916f224f17e031363bc88cab038ae01f03 (patch) | |
| tree | 3493a548f7a4f7e91c3b351cddbb806a2640392f | |
| parent | c396b8ea5694852c7c89d3bf3b2ce1f1d68c0288 (diff) | |
| parent | 08e2b810622096e84e9c9099450bfadf5768e97e (diff) | |
| download | dbus-9979b9916f224f17e031363bc88cab038ae01f03.tar.gz | |
Merge remote-tracking branch 'origin/dbus-1.8'
Conflicts:
cmake/test/CMakeLists.txt
test/Makefile.am
| -rw-r--r-- | dbus/dbus-server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/dbus-server.c b/dbus/dbus-server.c index c1d5f6e5..7b810792 100644 --- a/dbus/dbus-server.c +++ b/dbus/dbus-server.c @@ -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; |