X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsocket-label.c;h=cbe3ff216e55a77c7e55e2265a46411820d6de49;hb=d896ac2d2fbce41a0b11a0618a685adeaf18b8fe;hp=815b90fdfbd9dea59e80dc44117ad99659b523a2;hpb=f647962d64e844689f3e2acfce6102fc47e76df2;p=elogind.git
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index 815b90fdf..cbe3ff216 100644
--- a/src/shared/socket-label.c
+++ b/src/shared/socket-label.c
@@ -19,25 +19,18 @@
along with systemd; If not, see .
***/
-#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
-#include
#include "macro.h"
#include "util.h"
#include "mkdir.h"
-#include "socket-util.h"
#include "missing.h"
-#include "label.h"
+#include "selinux-util.h"
+#include "socket-util.h"
int socket_address_listen(
const SocketAddress *a,
@@ -93,13 +86,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");
}
}
@@ -116,9 +109,6 @@ int socket_address_listen(
/* Enforce the right access mode for the socket */
old_mask = umask(~ socket_mode);
- /* Include the original umask in our mask */
- umask(~socket_mode | old_mask);
-
r = mac_selinux_bind(fd, &a->sockaddr.sa, a->size);
if (r < 0 && errno == EADDRINUSE) {