aboutsummaryrefslogtreecommitdiffstats
path: root/etc/inc
diff options
context:
space:
mode:
authorLibravatar glitsj16 <glitsj16@users.noreply.github.com>2023-10-22 23:51:12 +0000
committerLibravatar GitHub <noreply@github.com>2023-10-22 23:51:12 +0000
commit2e2c2327f27ef629d7135bd7d2cc5cce4dfb8e50 (patch)
treeafa69c65afe9fd9cf2c1a91a4f95e1e65933e73d /etc/inc
parentcontrib/syntax: remove 'text/plain' from firejail-profile.lang.in (#6059) (diff)
downloadfirejail-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.inc3
-rw-r--r--etc/inc/disable-programs.inc2
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
334read-only ${HOME}/.caffrc 334read-only ${HOME}/.caffrc
335read-only ${HOME}/.cargo/env 335read-only ${HOME}/.cargo/env
336read-only ${HOME}/.config/mpv 336read-only ${HOME}/.config/mpv
337read-only ${HOME}/.config/msmtp
337read-only ${HOME}/.config/nano 338read-only ${HOME}/.config/nano
338read-only ${HOME}/.config/nvim 339read-only ${HOME}/.config/nvim
339read-only ${HOME}/.config/pkcs11 340read-only ${HOME}/.config/pkcs11
@@ -424,6 +425,7 @@ blacklist /etc/group-
424blacklist /etc/gshadow 425blacklist /etc/gshadow
425blacklist /etc/gshadow+ 426blacklist /etc/gshadow+
426blacklist /etc/gshadow- 427blacklist /etc/gshadow-
428blacklist /etc/msmtprc
427blacklist /etc/passwd+ 429blacklist /etc/passwd+
428blacklist /etc/passwd- 430blacklist /etc/passwd-
429blacklist /etc/shadow 431blacklist /etc/shadow
@@ -446,6 +448,7 @@ blacklist ${HOME}/.cargo/credentials.toml
446blacklist ${HOME}/.cert 448blacklist ${HOME}/.cert
447blacklist ${HOME}/.config/hub 449blacklist ${HOME}/.config/hub
448blacklist ${HOME}/.config/keybase 450blacklist ${HOME}/.config/keybase
451blacklist ${HOME}/.config/msmtp
449blacklist ${HOME}/.davfs2/secrets 452blacklist ${HOME}/.davfs2/secrets
450blacklist ${HOME}/.ecryptfs 453blacklist ${HOME}/.ecryptfs
451blacklist ${HOME}/.fetchmailrc 454blacklist ${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
559blacklist ${HOME}/.config/mpd 559blacklist ${HOME}/.config/mpd
560blacklist ${HOME}/.config/mps-youtube 560blacklist ${HOME}/.config/mps-youtube
561blacklist ${HOME}/.config/mpv 561blacklist ${HOME}/.config/mpv
562blacklist ${HOME}/.config/msmtp
562blacklist ${HOME}/.config/mullvad-browser-flags.conf 563blacklist ${HOME}/.config/mullvad-browser-flags.conf
563blacklist ${HOME}/.config/mupen64plus 564blacklist ${HOME}/.config/mupen64plus
564blacklist ${HOME}/.config/mutt 565blacklist ${HOME}/.config/mutt
@@ -1232,6 +1233,7 @@ blacklist ${RUNUSER}/*firefox*
1232blacklist ${RUNUSER}/akonadi 1233blacklist ${RUNUSER}/akonadi
1233blacklist ${RUNUSER}/psd/*firefox* 1234blacklist ${RUNUSER}/psd/*firefox*
1234blacklist ${RUNUSER}/qutebrowser 1235blacklist ${RUNUSER}/qutebrowser
1236blacklist /etc/msmtprc
1235blacklist /etc/ssmtp 1237blacklist /etc/ssmtp
1236blacklist /tmp/.wine-* 1238blacklist /tmp/.wine-*
1237blacklist /tmp/akonadi-* 1239blacklist /tmp/akonadi-*