X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fsocket-label.c;h=cbe3ff216e55a77c7e55e2265a46411820d6de49;hb=30ab6a0fc1bb950c4dcd90dcd3dfe00a810c7fc1;hp=7a03ac0c51aa2bda1bb68d347c5e1fe96516ed44;hpb=da927ba997d68401563b927f92e6e40e021a8e5c;p=elogind.git
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
index 7a03ac0c5..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) {
@@ -161,10 +151,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);