From 40ad5ce5942456435b7db1a60ab0c12efd2af16d Mon Sep 17 00:00:00 2001
From: rusty-snake <41237666+rusty-snake@users.noreply.github.com>
Date: Thu, 12 Aug 2021 19:41:46 +0200
Subject: Move disable-passwordmgr.inc into
 disable-common.inc/disable-programs.inc follow up

---
 etc/profile-a-l/chromium-common.profile | 1 -
 etc/profile-a-l/krunner.profile         | 1 -
 etc/profile-m-z/mencoder.profile        | 1 -
 etc/profile-m-z/midori.profile          | 1 -
 etc/profile-m-z/server.profile          | 1 -
 etc/templates/profile.template          | 1 -
 src/fbuilder/build_profile.c            | 1 -
 7 files changed, 7 deletions(-)

diff --git a/etc/profile-a-l/chromium-common.profile b/etc/profile-a-l/chromium-common.profile
index 3b533e458..b35b6ae80 100644
--- a/etc/profile-a-l/chromium-common.profile
+++ b/etc/profile-a-l/chromium-common.profile
@@ -20,7 +20,6 @@ include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
-# include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
 
diff --git a/etc/profile-a-l/krunner.profile b/etc/profile-a-l/krunner.profile
index 9cb5eff87..96eb6978d 100644
--- a/etc/profile-a-l/krunner.profile
+++ b/etc/profile-a-l/krunner.profile
@@ -22,7 +22,6 @@ noblacklist ${HOME}/.kde4/share/config/krunnerrc
 include disable-common.inc
 # include disable-devel.inc
 # include disable-interpreters.inc
-# include disable-passwdmgr.inc
 # include disable-programs.inc
 
 include whitelist-var-common.inc
diff --git a/etc/profile-m-z/mencoder.profile b/etc/profile-m-z/mencoder.profile
index caf238785..3909e543e 100644
--- a/etc/profile-m-z/mencoder.profile
+++ b/etc/profile-m-z/mencoder.profile
@@ -11,7 +11,6 @@ include mencoder.local
 #include disable-common.inc
 #include disable-devel.inc
 #include disable-interpreters.inc
-#include disable-passwdmgr.inc
 #include disable-programs.inc
 
 ipc-namespace
diff --git a/etc/profile-m-z/midori.profile b/etc/profile-m-z/midori.profile
index e15259608..7928d124e 100644
--- a/etc/profile-m-z/midori.profile
+++ b/etc/profile-m-z/midori.profile
@@ -25,7 +25,6 @@ include disable-common.inc
 include disable-devel.inc
 include disable-exec.inc
 include disable-interpreters.inc
-#include disable-passwdmgr.inc
 include disable-programs.inc
 include disable-xdg.inc
 
diff --git a/etc/profile-m-z/server.profile b/etc/profile-m-z/server.profile
index c5464ecbd..3c9ef3a86 100644
--- a/etc/profile-m-z/server.profile
+++ b/etc/profile-m-z/server.profile
@@ -7,7 +7,6 @@
 #       [sudo] password for netblue:
 #       Reading profile /etc/firejail/server.profile
 #       Reading profile /etc/firejail/disable-common.inc
-#       Reading profile /etc/firejail/disable-passwdmgr.inc
 #       Reading profile /etc/firejail/disable-programs.inc
 #
 #       ** Note: you can use --noprofile to disable server.profile **
diff --git a/etc/templates/profile.template b/etc/templates/profile.template
index 95ce2e924..1fd65e8d3 100644
--- a/etc/templates/profile.template
+++ b/etc/templates/profile.template
@@ -118,7 +118,6 @@ include globals.local
 #include disable-devel.inc
 #include disable-exec.inc
 #include disable-interpreters.inc
-#include disable-passwdmgr.inc
 #include disable-programs.inc
 #include disable-shell.inc
 #include disable-write-mnt.inc
diff --git a/src/fbuilder/build_profile.c b/src/fbuilder/build_profile.c
index 06a4d8517..0b9a99739 100644
--- a/src/fbuilder/build_profile.c
+++ b/src/fbuilder/build_profile.c
@@ -114,7 +114,6 @@ void build_profile(int argc, char **argv, int index, FILE *fp) {
 		fprintf(fp, "#include disable-devel.inc\t# development tools such as gcc and gdb\n");
 		fprintf(fp, "#include disable-exec.inc\t# non-executable directories such as /var, /tmp, and /home\n");
 		fprintf(fp, "#include disable-interpreters.inc\t# perl, python, lua etc.\n");
-		fprintf(fp, "include disable-passwdmgr.inc\t# password managers\n");
 		fprintf(fp, "include disable-programs.inc\t# user configuration for programs such as firefox, vlc etc.\n");
 		fprintf(fp, "#include disable-shell.inc\t# sh, bash, zsh etc.\n");
 		fprintf(fp, "#include disable-xdg.inc\t# standard user directories: Documents, Pictures, Videos, Music\n");
-- 
cgit v1.2.3-54-g00ecf