summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-02-05 17:59:40 +0100
committerTom Gundersen <teg@jklm.no>2015-02-05 18:02:42 +0100
commit4852e15970ec652b823bf568b398f730be1fe1a5 (patch)
treeb92d0b8fc0e06b8a14521454e32cca09b10940da
parentb2086f601b313939db160aa028e66649ba81bd01 (diff)
networkd: gracefully handle failure to emit signals when dbus is not connected
When we get kdbus we don't need these hackse.
-rw-r--r--src/network/networkd-link-bus.c3
-rw-r--r--src/network/networkd-manager-bus.c3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 645c47ae8c..f7eae87edd 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 7753c5dbc9..b281f4fdb6 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(