resolved: Support resolved.conf.d directories in the usual search paths

[elogind.git] / src / resolve / resolved-bus.c

diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c
index 517d20eca9164eeb6effc2d96d3b9694ac086b61..ff741cdc6753d1f73f7b4e6571813afafb622b36 100644 (file)
--- a/src/resolve/resolved-bus.c
+++ b/src/resolve/resolved-bus.c
@@ -251,7 +251,7 @@ static void bus_method_resolve_hostname_complete(DnsQuery *q) {
 
 finish:
         if (r < 0) {
-                log_error_errno(-r, "Failed to send hostname reply: %m");
+                log_error_errno(r, "Failed to send hostname reply: %m");
                 sd_bus_reply_method_errno(q->request, -r, NULL);
         }
 
@@ -419,7 +419,7 @@ static void bus_method_resolve_address_complete(DnsQuery *q) {
 
 finish:
         if (r < 0) {
-                log_error_errno(-r, "Failed to send address reply: %m");
+                log_error_errno(r, "Failed to send address reply: %m");
                 sd_bus_reply_method_errno(q->request, -r, NULL);
         }
 
@@ -591,7 +591,7 @@ static void bus_method_resolve_record_complete(DnsQuery *q) {
 
 finish:
         if (r < 0) {
-                log_error_errno(-r, "Failed to send record reply: %m");
+                log_error_errno(r, "Failed to send record reply: %m");
                 sd_bus_reply_method_errno(q->request, -r, NULL);
         }
 
@@ -690,7 +690,7 @@ static int match_prepare_for_sleep(sd_bus *bus, sd_bus_message *message, void *u
 
         r = sd_bus_message_read(message, "b", &b);
         if (r < 0) {
-                log_debug_errno(-r, "Failed to parse PrepareForSleep signal: %m");
+                log_debug_errno(r, "Failed to parse PrepareForSleep signal: %m");
                 return 0;
         }
 
@@ -717,34 +717,26 @@ int manager_connect_bus(Manager *m) {
                  * boot. Let's try in 5s again. As soon as we have
                  * kdbus we can stop doing this... */
 
-                log_debug_errno(-r, "Failed to connect to bus, trying again in 5s: %m");
+                log_debug_errno(r, "Failed to connect to bus, trying again in 5s: %m");
 
                 r = sd_event_add_time(m->event, &m->bus_retry_event_source, CLOCK_MONOTONIC, now(CLOCK_MONOTONIC) + 5*USEC_PER_SEC, 0, on_bus_retry, m);
-                if (r < 0) {
-                        log_error_errno(-r, "Failed to install bus reconnect time event: %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "Failed to install bus reconnect time event: %m");
 
                 return 0;
         }
 
         r = sd_bus_add_object_vtable(m->bus, NULL, "/org/freedesktop/resolve1", "org.freedesktop.resolve1.Manager", resolve_vtable, m);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to register object: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to register object: %m");
 
         r = sd_bus_request_name(m->bus, "org.freedesktop.resolve1", 0);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to register name: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to register name: %m");
 
         r = sd_bus_attach_event(m->bus, m->event, 0);
-        if (r < 0) {
-                log_error_errno(-r, "Failed to attach bus to event loop: %m");
-                return r;
-        }
+        if (r < 0)
+                return log_error_errno(r, "Failed to attach bus to event loop: %m");
 
         r = sd_bus_add_match(m->bus, &m->prepare_for_sleep_slot,
                              "type='signal',"
@@ -755,7 +747,7 @@ int manager_connect_bus(Manager *m) {
                              match_prepare_for_sleep,
                              m);
         if (r < 0)
-                log_error_errno(-r, "Failed to add match for PrepareForSleep: %m");
+                log_error_errno(r, "Failed to add match for PrepareForSleep: %m");
 
         return 0;
 }