chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: avoid a null dereference
[elogind.git]
/
src
/
shared
/
socket-label.c
diff --git
a/src/shared/socket-label.c
b/src/shared/socket-label.c
index b0fca9b45ccef308cdc01b465a867a382097471d..b1ef19f26503d78d3355ffddcd98baf8ac2957b6 100644
(file)
--- 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)
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)
}
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,13
+161,11
@@
int make_socket_fd(int log_level, const char* address, int flags) {
_cleanup_free_ char *p = NULL;
r = socket_address_print(&a, &p);
_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)
if (fd < 0)
- log_error_errno(
-
fd, "Failed to listen on %s: %m", p);
+ log_error_errno(fd, "Failed to listen on %s: %m", p);
else
log_full(log_level, "Listening on %s", p);
}
else
log_full(log_level, "Listening on %s", p);
}