daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
1ff636
From a8ad87112c0992579fcf4fc91234490ec82ce939 Mon Sep 17 00:00:00 2001
1ff636
From: Davide Bettio <davide.bettio@ispirata.com>
1ff636
Date: Fri, 15 May 2015 16:36:28 +0200
1ff636
Subject: [PATCH] core: don't consider umask for SocketMode=
1ff636
1ff636
https://bugs.freedesktop.org/show_bug.cgi?id=89248
1ff636
(cherry picked from commit a2c7f25aec23b6d74ff5cf169e38159754e6dfe8)
1ff636
1ff636
Cherry-picked from: a2c7f25
1ff636
Resolves: #1222517
1ff636
---
1ff636
 src/shared/socket-label.c | 3 ---
1ff636
 1 file changed, 3 deletions(-)
1ff636
1ff636
diff --git a/src/shared/socket-label.c b/src/shared/socket-label.c
181b3f
index 6806c5115..a6289eb50 100644
1ff636
--- a/src/shared/socket-label.c
1ff636
+++ b/src/shared/socket-label.c
1ff636
@@ -117,9 +117,6 @@ int socket_address_listen(
1ff636
                 /* Enforce the right access mode for the socket */
1ff636
                 old_mask = umask(~ socket_mode);
1ff636
 
1ff636
-                /* Include the original umask in our mask */
1ff636
-                umask(~socket_mode | old_mask);
1ff636
-
1ff636
                 r = mac_selinux_bind(fd, &a->sockaddr.sa, a->size);
1ff636
 
1ff636
                 if (r < 0 && errno == EADDRINUSE) {