From 1c73f3bc29111a00738569c9d40a989b161a0624 Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 23 Feb 2015 23:19:54 -0500 Subject: tmpfiles: avoid creating duplicate acl entries https://bugs.freedesktop.org/show_bug.cgi?id=89202 https://bugs.debian.org/778656 Status quo ante can be restored with: getfacl -p /var/log/journal/`cat /etc/machine-id`|grep -v '^#'|sort -u|sudo setfacl --set-file=- /var/log/journal/`cat /etc/machine-id` --- src/shared/acl-util.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/shared/acl-util.h') diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h index 90e88ffa26..fdb90063fa 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -41,5 +41,9 @@ int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl); DEFINE_TRIVIAL_CLEANUP_FUNC(acl_t, acl_free); #define acl_free_charp acl_free DEFINE_TRIVIAL_CLEANUP_FUNC(char*, acl_free_charp); +#define acl_free_uid_tp acl_free +DEFINE_TRIVIAL_CLEANUP_FUNC(uid_t*, acl_free_uid_tp); +#define acl_free_gid_tp acl_free +DEFINE_TRIVIAL_CLEANUP_FUNC(gid_t*, acl_free_gid_tp); #endif -- cgit v1.2.3-54-g00ecf