sd-icmp6-nd: Update Router Advertisement handling

[elogind.git] / src / core / dbus-manager.c

diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
index 5fe06f927d973c801733713fe02a08776ba5d097..8ba665dc3d3f978d08edcf85c2522944da30af6f 100644 (file)
--- a/src/core/dbus-manager.c
+++ b/src/core/dbus-manager.c
@@ -39,7 +39,7 @@
 #include "dbus-unit.h"
 #include "dbus-snapshot.h"
 #include "dbus-execute.h"
-#include "bus-errors.h"
+#include "bus-common-errors.h"
 
 static int property_get_version(
                 sd_bus *bus,
@@ -407,7 +407,7 @@ static int method_get_unit_by_pid(sd_bus *bus, sd_bus_message *message, void *us
 
         u = manager_get_unit_by_pid(m, pid);
         if (!u)
-                return sd_bus_error_setf(error, BUS_ERROR_NO_UNIT_FOR_PID, "PID %u does not belong to any loaded unit.", pid);
+                return sd_bus_error_setf(error, BUS_ERROR_NO_UNIT_FOR_PID, "PID "PID_FMT" does not belong to any loaded unit.", pid);
 
         r = mac_selinux_unit_access_check(u, message, "status", error);
         if (r < 0)
@@ -681,9 +681,11 @@ static int transient_aux_units_from_message(
                 if (r < 0 && r != -EEXIST)
                         return r;
 
-                r = unit_load(u);
-                if (r < 0)
-                        return r;
+                if (r != -EEXIST) {
+                        r = unit_load(u);
+                        if (r < 0)
+                                return r;
+                }
 
                 r = sd_bus_message_exit_container(message);
                 if (r < 0)