0e288fc9c5
- Add upstream patch 0001-machine-don-t-return-uninitialized-variable.patch - Port and add upstream patch 0002-vconsole-setup-run-setfont-before-loadkeys.patch - Rename 0001-udev-net_setup_link-add-a-bit-more-logging.patch to 1048-udev-net_setup_link-add-a-bit-more-logging.patch - Port and add upstream patches 0001-udev-net_setup_link-add-a-bit-more-logging.patch 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch 0002-namespace-fix-uninitialized-memory-access.patch - Add upstream patches 0001-architecture-Add-tilegx.patch 0002-architecture-Add-cris.patch 0003-arch-add-crisv32-to-uname-check.patch 0004-architecture-remove-cris-from-uname-list.patch - Add upstream patches 0006-hwdb-update.patch 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch - Add upstream patches 0001-parse_uid-return-ENXIO-for-1-uids.patch 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch 0003-localed-consider-an-unset-model-as-a-wildcard.patch 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch OBS-URL: https://build.opensuse.org/request/show/239780 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=191
29 lines
770 B
Diff
29 lines
770 B
Diff
From db9bb83fa5ec72da38eb5bd0c259ef8c76a71858 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Thu, 3 Jul 2014 01:19:21 +0200
|
|
Subject: [PATCH] bus: close a bus that failed to connect
|
|
|
|
---
|
|
src/libsystemd/sd-bus/sd-bus.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git src/libsystemd/sd-bus/sd-bus.c src/libsystemd/sd-bus/sd-bus.c
|
|
index c25375c..28fc19e 100644
|
|
--- src/libsystemd/sd-bus/sd-bus.c
|
|
+++ src/libsystemd/sd-bus/sd-bus.c
|
|
@@ -1033,8 +1033,10 @@ _public_ int sd_bus_start(sd_bus *bus) {
|
|
else
|
|
return -EINVAL;
|
|
|
|
- if (r < 0)
|
|
+ if (r < 0) {
|
|
+ sd_bus_close(bus);
|
|
return r;
|
|
+ }
|
|
|
|
return bus_send_hello(bus);
|
|
}
|
|
--
|
|
1.7.9.2
|
|
|