X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fsocket-label.c;h=b1ef19f26503d78d3355ffddcd98baf8ac2957b6;hp=7a03ac0c51aa2bda1bb68d347c5e1fe96516ed44;hb=58a489c2b3628f3003d3901537bec8b5e6c1b7bd;hpb=da927ba997d68401563b927f92e6e40e021a8e5c

diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index 7a03ac0c5..b1ef19f26 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -93,13 +93,13 @@ int socket_address_listen(
                 if (free_bind) {
                         one = 1;
                         if (setsockopt(fd, IPPROTO_IP, IP_FREEBIND, &one, sizeof(one)) < 0)
-                                log_warning("IP_FREEBIND failed: %m");
+                                log_warning_errno(errno, "IP_FREEBIND failed: %m");
                 }
 
                 if (transparent) {
                         one = 1;
                         if (setsockopt(fd, IPPROTO_IP, IP_TRANSPARENT, &one, sizeof(one)) < 0)
-                                log_warning("IP_TRANSPARENT failed: %m");
+                                log_warning_errno(errno, "IP_TRANSPARENT failed: %m");
                 }
         }
 
@@ -161,10 +161,8 @@ int make_socket_fd(int log_level, const char* address, int flags) {
                 _cleanup_free_ char *p = NULL;
 
                 r = socket_address_print(&a, &p);
-                if (r < 0) {
-                        log_error_errno(r, "socket_address_print(): %m");
-                        return r;
-                }
+                if (r < 0)
+                        return log_error_errno(r, "socket_address_print(): %m");
 
                 if (fd < 0)
                         log_error_errno(fd, "Failed to listen on %s: %m", p);