diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-03-22 13:44:53 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2024-03-24 03:42:59 -0300 |
commit | 04efbb27631e2f4abb5f1c0a915612e8cc98397c (patch) | |
tree | 3b0c5d360a796880024a1c14e251522fb36ea5d7 /etc/profile-m-z/server.profile | |
parent | sstmp.profile: sort disable includes (diff) | |
download | firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.gz firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.tar.zst firejail-04efbb27631e2f4abb5f1c0a915612e8cc98397c.zip |
profiles: replace x11 socket blacklist with disable-X11.inc
Replace all occurrences of `blacklist /tmp/.X11-unix` with
`include disable-X11.inc`, which blacklists more X11-related files.
Commands used to search and replace:
$ git grep -Ilz '^blacklist /tmp/.X11-unix' -- \
etc/profile*/*.profile | xargs -0 perl -0 -pi -e '\
s/\nblacklist \/tmp\/.X11-unix\n/\n/; \
s/(\ninclude disable-xdg.inc\n)/\ninclude disable-X11.inc$1/; \
s/(\ninclude disable-[^Xx\n]+\n)(\n|# )/$1include disable-X11.inc\n$2/'
Note: The following files were also edited manually:
* etc/profile-a-l/erd.profile
* etc/profile-a-l/links-common.profile
* etc/profile-m-z/termshark.profile
* etc/profile-m-z/tmux.profile
* etc/profile-m-z/tshark.profile
Relates to #4462 #4854.
Diffstat (limited to 'etc/profile-m-z/server.profile')
-rw-r--r-- | etc/profile-m-z/server.profile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/profile-m-z/server.profile b/etc/profile-m-z/server.profile index 74587c992..a77cf7e0b 100644 --- a/etc/profile-m-z/server.profile +++ b/etc/profile-m-z/server.profile | |||
@@ -36,7 +36,6 @@ noblacklist /usr/sbin | |||
36 | noblacklist /etc/init.d | 36 | noblacklist /etc/init.d |
37 | #noblacklist /var/opt | 37 | #noblacklist /var/opt |
38 | 38 | ||
39 | blacklist /tmp/.X11-unix | ||
40 | blacklist ${RUNUSER}/wayland-* | 39 | blacklist ${RUNUSER}/wayland-* |
41 | 40 | ||
42 | include disable-common.inc | 41 | include disable-common.inc |
@@ -45,6 +44,7 @@ include disable-common.inc | |||
45 | #include disable-interpreters.inc | 44 | #include disable-interpreters.inc |
46 | include disable-programs.inc | 45 | include disable-programs.inc |
47 | include disable-write-mnt.inc | 46 | include disable-write-mnt.inc |
47 | include disable-X11.inc | ||
48 | include disable-xdg.inc | 48 | include disable-xdg.inc |
49 | 49 | ||
50 | #include whitelist-runuser-common.inc | 50 | #include whitelist-runuser-common.inc |