From: Tom Gundersen <teg@jklm.no>
Date: Thu, 5 Feb 2015 16:59:40 +0000 (+0100)
Subject: networkd: gracefully handle failure to emit signals when dbus is not connected
X-Git-Tag: v219~133
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=4852e15970ec652b823bf568b398f730be1fe1a5;ds=sidebyside

networkd: gracefully handle failure to emit signals when dbus is not connected

When we get kdbus we don't need these hackse.
---

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 645c47ae8..f7eae87ed 100644
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -108,6 +108,9 @@ int link_send_changed(Link *link, const char *property, ...) {
         assert(link);
         assert(link->manager);
 
+        if (!link->manager->bus)
+                return 0; /* replace with assert when we have kdbus */
+
         l = strv_from_stdarg_alloca(property);
 
         p = link_bus_path(link);
diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 7753c5dbc..b281f4fdb 100644
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -38,6 +38,9 @@ int manager_send_changed(Manager *manager, const char *property, ...) {
 
         assert(manager);
 
+        if (!manager->bus)
+                return 0; /* replace by assert when we have kdbus */
+
         l = strv_from_stdarg_alloca(property);
 
         return sd_bus_emit_properties_changed_strv(