[systemd-commits] src/journal

[Lennart Poettering]

 src/journal/journald-server.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 11ec7cede5bd0255e9df7bf95325d8b69993e40f
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue May 7 19:07:27 2013 +0200

    journald: don't recalculate the ACL mask
    
    Otherwise we might end up with executable files if some default ACL is
    set for the journal directory.

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 88163c0..cc52b8a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -227,9 +227,9 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
                 }
         }
 
+        /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
         if (acl_get_permset(entry, &permset) < 0 ||
-            acl_add_perm(permset, ACL_READ) < 0 ||
-            acl_calc_mask(&acl) < 0) {
+            acl_add_perm(permset, ACL_READ) < 0) {
                 log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
                 goto finish;
         }