Merge pull request #5172 from kmk3/ds-add-ids-paths

disable-shell.inc: add global shell paths from ids.config

2 files changed, 32 insertions, 1 deletions

diff --git a/etc/ids.config b/etc/ids.config
index 6c1aa543b..1217d4a3a 100644
--- a/etc/ids.config
+++ b/etc/ids.config
@@ -58,6 +58,7 @@ ${HOME}/.zshenv
 ${HOME}/.zshprofile
 ${HOME}/.zshrc
 
+# Note: This list should be kept in sync with the one in inc/disable-shell.inc.
 ### shells global ###
 # all
 /etc/dircolors
@@ -68,8 +69,8 @@ ${HOME}/.zshrc
 /etc/skel
 # bash
 /etc/bash
-/etc/bash_completion*
 /etc/bash.bashrc
+/etc/bash_completion*
 /etc/bashrc
 # fish
 /etc/fish
diff --git a/etc/inc/disable-shell.inc b/etc/inc/disable-shell.inc
index 3f19cdcf9..b1bfcd161 100644
--- a/etc/inc/disable-shell.inc
+++ b/etc/inc/disable-shell.inc
@@ -13,5 +13,35 @@ blacklist ${PATH}/sh
 blacklist ${PATH}/tclsh
 blacklist ${PATH}/tcsh
 blacklist ${PATH}/zsh
+
+# Note: This list should be kept in sync with the one in ../ids.config.
+### shells global ###
+# all
+blacklist /etc/dircolors
+blacklist /etc/environment
 blacklist /etc/profile
 blacklist /etc/profile.d
+blacklist /etc/shells
+blacklist /etc/skel
+# bash
+blacklist /etc/bash
+blacklist /etc/bash.bashrc
+blacklist /etc/bash_completion*
+blacklist /etc/bashrc
+# fish
+blacklist /etc/fish
+# ksh
+blacklist /etc/ksh.kshrc
+blacklist /etc/suid_profile
+# tcsh
+blacklist /etc/complete.tcsh
+blacklist /etc/csh.cshrc
+blacklist /etc/csh.login
+blacklist /etc/csh.logout
+# zsh
+blacklist /etc/zlogin
+blacklist /etc/zlogout
+blacklist /etc/zprofile
+blacklist /etc/zsh
+blacklist /etc/zshenv
+blacklist /etc/zshrc