diff --git a/apparmor.d/abstractions/trash b/apparmor.d/abstractions/trash index 59485d54..4ab3dbb1 100644 --- a/apparmor.d/abstractions/trash +++ b/apparmor.d/abstractions/trash @@ -1,5 +1,6 @@ # apparmor.d - Full set of apparmor profiles # Copyright (C) 2018-2021 Mikhail Morfikov +# 2021 Alexandre Pujol # SPDX-License-Identifier: GPL-2.0-only abi , @@ -19,8 +20,7 @@ owner @{user_share_dirs}/Trash/files/{,**} rw, owner @{user_share_dirs}/Trash/info/ rw, owner @{user_share_dirs}/Trash/info/*.trashinfo{,.*} rw, - owner @{user_share_dirs}/Trash/expunged/ rw, - owner @{user_share_dirs}/Trash/expunged/[0-9]* rw, + owner @{user_share_dirs}/Trash/expunged/{,**} rw, # Partitions' trash location when the admin creates the .Trash/ folder in the top lvl dir owner /{media,mnt}/*/.Trash/ rw, @@ -30,8 +30,7 @@ owner /{media,mnt}/*/.Trash/[0-9]*/files/{,**} rw, owner /{media,mnt}/*/.Trash/[0-9]*/info/ rw, owner /{media,mnt}/*/.Trash/[0-9]*/info/*.trashinfo{,.*} rw, - owner /{media,mnt}/*/.Trash/[0-9]*/expunged/ rw, - owner /{media,mnt}/*/.Trash/[0-9]*/expunged/[0-9]* rw, + owner /{media,mnt}/*/.Trash/[0-9]*/expunged/{,**} rw, # Partitions' trash location when the admin doesn't create the .Trash/ folder in the top lvl dir owner /{media,mnt}/*/.Trash-[0-9]*/ rw, @@ -40,5 +39,4 @@ owner /{media,mnt}/*/.Trash-[0-9]*/files/{,**} rw, owner /{media,mnt}/*/.Trash-[0-9]*/info/ rw, owner /{media,mnt}/*/.Trash-[0-9]*/info/*.trashinfo{,.*} rw, - owner /{media,mnt}/*/.Trash-[0-9]*/expunged/ rw, - owner /{media,mnt}/*/.Trash-[0-9]*/expunged/[0-9]* rw, + owner /{media,mnt}/*/.Trash-[0-9]*/expunged/{,**} rw,