diff options
author | glitsj16 <glitsj16@users.noreply.github.com> | 2023-10-22 23:51:12 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-22 23:51:12 +0000 |
commit | 2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50 (patch) | |
tree | afa69c65afe9fd9cf2c1a91a4f95e1e65933e73d /etc/inc | |
parent | contrib/syntax: remove 'text/plain' from firejail-profile.lang.in (#6059) (diff) | |
download | firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.tar.gz firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.tar.zst firejail-2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50.zip |
profiles: support more msmtp configuration paths (#6060)
Since version 1.8.6 msmtp supports per-user configuration at either
~/.msmtprc (already supported by firejail) or
`$XDG_CONFIG_HOME/msmtp/config`. System-wide support can be placed at
/etc/msmtprc.
This adds the missing paths to the relevant .inc and .profile files.
Note that `blacklist ${HOME}/.msmtprc` is present on both
disable-common.inc and disable-programs.inc, so the new paths are added
to both files.
References:
https://wiki.archlinux.org/title/Msmtp#Basic_setup
https://marlam.de/msmtp/msmtp.html#Configuration-files
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/disable-common.inc | 3 | ||||
-rw-r--r-- | etc/inc/disable-programs.inc | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/etc/inc/disable-common.inc b/etc/inc/disable-common.inc index a14ce7cf6..264fc29b2 100644 --- a/etc/inc/disable-common.inc +++ b/etc/inc/disable-common.inc | |||
@@ -334,6 +334,7 @@ blacklist /etc/hosts.equiv | |||
334 | read-only ${HOME}/.caffrc | 334 | read-only ${HOME}/.caffrc |
335 | read-only ${HOME}/.cargo/env | 335 | read-only ${HOME}/.cargo/env |
336 | read-only ${HOME}/.config/mpv | 336 | read-only ${HOME}/.config/mpv |
337 | read-only ${HOME}/.config/msmtp | ||
337 | read-only ${HOME}/.config/nano | 338 | read-only ${HOME}/.config/nano |
338 | read-only ${HOME}/.config/nvim | 339 | read-only ${HOME}/.config/nvim |
339 | read-only ${HOME}/.config/pkcs11 | 340 | read-only ${HOME}/.config/pkcs11 |
@@ -424,6 +425,7 @@ blacklist /etc/group- | |||
424 | blacklist /etc/gshadow | 425 | blacklist /etc/gshadow |
425 | blacklist /etc/gshadow+ | 426 | blacklist /etc/gshadow+ |
426 | blacklist /etc/gshadow- | 427 | blacklist /etc/gshadow- |
428 | blacklist /etc/msmtprc | ||
427 | blacklist /etc/passwd+ | 429 | blacklist /etc/passwd+ |
428 | blacklist /etc/passwd- | 430 | blacklist /etc/passwd- |
429 | blacklist /etc/shadow | 431 | blacklist /etc/shadow |
@@ -446,6 +448,7 @@ blacklist ${HOME}/.cargo/credentials.toml | |||
446 | blacklist ${HOME}/.cert | 448 | blacklist ${HOME}/.cert |
447 | blacklist ${HOME}/.config/hub | 449 | blacklist ${HOME}/.config/hub |
448 | blacklist ${HOME}/.config/keybase | 450 | blacklist ${HOME}/.config/keybase |
451 | blacklist ${HOME}/.config/msmtp | ||
449 | blacklist ${HOME}/.davfs2/secrets | 452 | blacklist ${HOME}/.davfs2/secrets |
450 | blacklist ${HOME}/.ecryptfs | 453 | blacklist ${HOME}/.ecryptfs |
451 | blacklist ${HOME}/.fetchmailrc | 454 | blacklist ${HOME}/.fetchmailrc |
diff --git a/etc/inc/disable-programs.inc b/etc/inc/disable-programs.inc index f446a9550..e013872df 100644 --- a/etc/inc/disable-programs.inc +++ b/etc/inc/disable-programs.inc | |||
@@ -559,6 +559,7 @@ blacklist ${HOME}/.config/mpDris2 | |||
559 | blacklist ${HOME}/.config/mpd | 559 | blacklist ${HOME}/.config/mpd |
560 | blacklist ${HOME}/.config/mps-youtube | 560 | blacklist ${HOME}/.config/mps-youtube |
561 | blacklist ${HOME}/.config/mpv | 561 | blacklist ${HOME}/.config/mpv |
562 | blacklist ${HOME}/.config/msmtp | ||
562 | blacklist ${HOME}/.config/mullvad-browser-flags.conf | 563 | blacklist ${HOME}/.config/mullvad-browser-flags.conf |
563 | blacklist ${HOME}/.config/mupen64plus | 564 | blacklist ${HOME}/.config/mupen64plus |
564 | blacklist ${HOME}/.config/mutt | 565 | blacklist ${HOME}/.config/mutt |
@@ -1232,6 +1233,7 @@ blacklist ${RUNUSER}/*firefox* | |||
1232 | blacklist ${RUNUSER}/akonadi | 1233 | blacklist ${RUNUSER}/akonadi |
1233 | blacklist ${RUNUSER}/psd/*firefox* | 1234 | blacklist ${RUNUSER}/psd/*firefox* |
1234 | blacklist ${RUNUSER}/qutebrowser | 1235 | blacklist ${RUNUSER}/qutebrowser |
1236 | blacklist /etc/msmtprc | ||
1235 | blacklist /etc/ssmtp | 1237 | blacklist /etc/ssmtp |
1236 | blacklist /tmp/.wine-* | 1238 | blacklist /tmp/.wine-* |
1237 | blacklist /tmp/akonadi-* | 1239 | blacklist /tmp/akonadi-* |