chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install: make InstallContext::{will_install,have_installed} OrderedHashmaps
[elogind.git]
/
src
/
shared
/
socket-label.c
diff --git
a/src/shared/socket-label.c
b/src/shared/socket-label.c
index eb09779b334aafe29f866a6a92236e44a803ac62..6f9aeeea5dab0404e49e5ea4a8b3e35dbb4593f1 100644
(file)
--- a/
src/shared/socket-label.c
+++ b/
src/shared/socket-label.c
@@
-64,7
+64,7
@@
int socket_address_listen(
return -EAFNOSUPPORT;
if (label) {
return -EAFNOSUPPORT;
if (label) {
- r =
label
_socket_set(label);
+ r =
mac_selinux
_socket_set(label);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-73,7
+73,7
@@
int socket_address_listen(
r = fd < 0 ? -errno : 0;
if (label)
r = fd < 0 ? -errno : 0;
if (label)
-
label
_socket_clear();
+
mac_selinux
_socket_clear();
if (r < 0)
return r;
if (r < 0)
return r;
@@
-119,7
+119,7
@@
int socket_address_listen(
/* Include the original umask in our mask */
umask(~socket_mode | old_mask);
/* Include the original umask in our mask */
umask(~socket_mode | old_mask);
- r =
label
_bind(fd, &a->sockaddr.sa, a->size);
+ r =
mac_selinux
_bind(fd, &a->sockaddr.sa, a->size);
if (r < 0 && errno == EADDRINUSE) {
/* Unlink and try again */
if (r < 0 && errno == EADDRINUSE) {
/* Unlink and try again */
@@
-150,7
+150,8
@@
int make_socket_fd(int log_level, const char* address, int flags) {
r = socket_address_parse(&a, address);
if (r < 0) {
r = socket_address_parse(&a, address);
if (r < 0) {
- log_error("Failed to parse socket: %s", strerror(-r));
+ log_error("Failed to parse socket address \"%s\": %s",
+ address, strerror(-r));
return r;
}
return r;
}
@@
-166,7
+167,7
@@
int make_socket_fd(int log_level, const char* address, int flags) {
}
if (fd < 0)
}
if (fd < 0)
- log_error("Failed to listen on %s: %s", p, strerror(-
r
));
+ log_error("Failed to listen on %s: %s", p, strerror(-
fd
));
else
log_full(log_level, "Listening on %s", p);
}
else
log_full(log_level, "Listening on %s", p);
}