@@ -31833,7 +31874,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ## This template creates a user domain, types, and ## rules for the user's tty, pty, home directories, ## tmp, and tmpfs files. -@@ -1164,7 +1176,6 @@ +@@ -1164,7 +1177,6 @@ # Need the following rule to allow users to run vpnc corenet_tcp_bind_xserver_port($1_t) @@ -31841,7 +31882,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo # cjp: why? files_read_kernel_symbol_table($1_t) -@@ -1193,12 +1204,11 @@ +@@ -1193,12 +1205,11 @@ # and may change other protocols tunable_policy(`user_tcp_server',` corenet_tcp_bind_all_nodes($1_t) @@ -31856,7 +31897,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') # Run pppd in pppd_t by default for user -@@ -1207,7 +1217,27 @@ +@@ -1207,7 +1218,27 @@ ') optional_policy(` @@ -31885,7 +31926,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ') -@@ -1284,8 +1314,6 @@ +@@ -1284,8 +1315,6 @@ # Manipulate other users crontab. allow $1_t self:passwd crontab; @@ -31894,7 +31935,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo kernel_read_software_raid_state($1_t) kernel_getattr_core_if($1_t) kernel_getattr_message_if($1_t) -@@ -1307,8 +1335,6 @@ +@@ -1307,8 +1336,6 @@ dev_getattr_generic_blk_files($1_t) dev_getattr_generic_chr_files($1_t) @@ -31903,7 +31944,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo # Allow MAKEDEV to work dev_create_all_blk_files($1_t) dev_create_all_chr_files($1_t) -@@ -1363,13 +1389,6 @@ +@@ -1363,13 +1390,6 @@ # But presently necessary for installing the file_contexts file. seutil_manage_bin_policy($1_t) @@ -31917,7 +31958,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo optional_policy(` userhelper_exec($1_t) ') -@@ -1422,6 +1441,7 @@ +@@ -1422,6 +1442,7 @@ dev_relabel_all_dev_nodes($1) files_create_boot_flag($1) @@ -31925,7 +31966,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo # Necessary for managing /boot/efi fs_manage_dos_files($1) -@@ -1787,10 +1807,14 @@ +@@ -1787,10 +1808,14 @@ template(`userdom_user_home_content',` gen_require(` attribute $1_file_type; @@ -31941,7 +31982,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -1886,11 +1910,11 @@ +@@ -1886,11 +1911,11 @@ # template(`userdom_search_user_home_dirs',` gen_require(` @@ -31955,7 +31996,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -1920,11 +1944,11 @@ +@@ -1920,11 +1945,11 @@ # template(`userdom_list_user_home_dirs',` gen_require(` @@ -31969,7 +32010,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -1968,12 +1992,12 @@ +@@ -1968,12 +1993,12 @@ # template(`userdom_user_home_domtrans',` gen_require(` @@ -31985,7 +32026,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2003,10 +2027,11 @@ +@@ -2003,10 +2028,11 @@ # template(`userdom_dontaudit_list_user_home_dirs',` gen_require(` @@ -31999,7 +32040,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2038,11 +2063,47 @@ +@@ -2038,11 +2064,47 @@ # template(`userdom_manage_user_home_content_dirs',` gen_require(` @@ -32049,7 +32090,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2074,10 +2135,10 @@ +@@ -2074,10 +2136,10 @@ # template(`userdom_dontaudit_setattr_user_home_content_files',` gen_require(` @@ -32062,7 +32103,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2107,11 +2168,11 @@ +@@ -2107,11 +2169,11 @@ # template(`userdom_read_user_home_content_files',` gen_require(` @@ -32076,7 +32117,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2141,11 +2202,11 @@ +@@ -2141,11 +2203,11 @@ # template(`userdom_dontaudit_read_user_home_content_files',` gen_require(` @@ -32091,7 +32132,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2175,10 +2236,14 @@ +@@ -2175,10 +2237,14 @@ # template(`userdom_dontaudit_write_user_home_content_files',` gen_require(` @@ -32108,7 +32149,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2208,11 +2273,11 @@ +@@ -2208,11 +2274,11 @@ # template(`userdom_read_user_home_content_symlinks',` gen_require(` @@ -32122,7 +32163,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2242,11 +2307,11 @@ +@@ -2242,11 +2308,11 @@ # template(`userdom_exec_user_home_content_files',` gen_require(` @@ -32136,7 +32177,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2276,10 +2341,10 @@ +@@ -2276,10 +2342,10 @@ # template(`userdom_dontaudit_exec_user_home_content_files',` gen_require(` @@ -32149,7 +32190,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2311,12 +2376,12 @@ +@@ -2311,12 +2377,12 @@ # template(`userdom_manage_user_home_content_files',` gen_require(` @@ -32165,7 +32206,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2348,10 +2413,10 @@ +@@ -2348,10 +2414,10 @@ # template(`userdom_dontaudit_manage_user_home_content_dirs',` gen_require(` @@ -32178,7 +32219,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2383,12 +2448,12 @@ +@@ -2383,12 +2449,12 @@ # template(`userdom_manage_user_home_content_symlinks',` gen_require(` @@ -32194,7 +32235,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2420,12 +2485,12 @@ +@@ -2420,12 +2486,12 @@ # template(`userdom_manage_user_home_content_pipes',` gen_require(` @@ -32210,7 +32251,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2457,12 +2522,12 @@ +@@ -2457,12 +2523,12 @@ # template(`userdom_manage_user_home_content_sockets',` gen_require(` @@ -32226,7 +32267,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2507,11 +2572,11 @@ +@@ -2507,11 +2573,11 @@ # template(`userdom_user_home_dir_filetrans',` gen_require(` @@ -32240,7 +32281,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2556,11 +2621,11 @@ +@@ -2556,11 +2622,11 @@ # template(`userdom_user_home_content_filetrans',` gen_require(` @@ -32254,7 +32295,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2600,11 +2665,11 @@ +@@ -2600,11 +2666,11 @@ # template(`userdom_user_home_dir_filetrans_user_home_content',` gen_require(` @@ -32268,7 +32309,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2634,11 +2699,11 @@ +@@ -2634,11 +2700,11 @@ # template(`userdom_write_user_tmp_sockets',` gen_require(` @@ -32282,7 +32323,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2668,11 +2733,11 @@ +@@ -2668,11 +2734,11 @@ # template(`userdom_list_user_tmp',` gen_require(` @@ -32296,7 +32337,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2704,10 +2769,10 @@ +@@ -2704,10 +2770,10 @@ # template(`userdom_dontaudit_list_user_tmp',` gen_require(` @@ -32309,7 +32350,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2739,10 +2804,10 @@ +@@ -2739,10 +2805,10 @@ # template(`userdom_dontaudit_manage_user_tmp_dirs',` gen_require(` @@ -32322,7 +32363,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2772,12 +2837,12 @@ +@@ -2772,12 +2838,12 @@ # template(`userdom_read_user_tmp_files',` gen_require(` @@ -32338,7 +32379,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2809,10 +2874,10 @@ +@@ -2809,10 +2875,10 @@ # template(`userdom_dontaudit_read_user_tmp_files',` gen_require(` @@ -32351,7 +32392,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2844,10 +2909,48 @@ +@@ -2844,10 +2910,48 @@ # template(`userdom_dontaudit_append_user_tmp_files',` gen_require(` @@ -32402,7 +32443,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2877,12 +2980,12 @@ +@@ -2877,12 +2981,12 @@ # template(`userdom_rw_user_tmp_files',` gen_require(` @@ -32418,7 +32459,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2914,10 +3017,10 @@ +@@ -2914,10 +3018,10 @@ # template(`userdom_dontaudit_manage_user_tmp_files',` gen_require(` @@ -32431,7 +32472,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2949,12 +3052,12 @@ +@@ -2949,12 +3053,12 @@ # template(`userdom_read_user_tmp_symlinks',` gen_require(` @@ -32447,7 +32488,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -2986,11 +3089,11 @@ +@@ -2986,11 +3090,11 @@ # template(`userdom_manage_user_tmp_dirs',` gen_require(` @@ -32461,7 +32502,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3022,11 +3125,11 @@ +@@ -3022,11 +3126,11 @@ # template(`userdom_manage_user_tmp_files',` gen_require(` @@ -32475,7 +32516,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3058,11 +3161,11 @@ +@@ -3058,11 +3162,11 @@ # template(`userdom_manage_user_tmp_symlinks',` gen_require(` @@ -32489,7 +32530,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3094,11 +3197,11 @@ +@@ -3094,11 +3198,11 @@ # template(`userdom_manage_user_tmp_pipes',` gen_require(` @@ -32503,7 +32544,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3130,11 +3233,11 @@ +@@ -3130,11 +3234,11 @@ # template(`userdom_manage_user_tmp_sockets',` gen_require(` @@ -32517,7 +32558,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3179,10 +3282,10 @@ +@@ -3179,10 +3283,10 @@ # template(`userdom_user_tmp_filetrans',` gen_require(` @@ -32530,7 +32571,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo files_search_tmp($2) ') -@@ -3223,10 +3326,10 @@ +@@ -3223,10 +3327,10 @@ # template(`userdom_tmp_filetrans_user_tmp',` gen_require(` @@ -32543,7 +32584,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ') ######################################## -@@ -3254,24 +3357,24 @@ +@@ -3254,24 +3358,24 @@ ## ## # @@ -32572,7 +32613,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ##
#### This is a templated interface, and should only -@@ -3290,23 +3393,24 @@ +@@ -3290,23 +3394,24 @@ ## ## # @@ -32604,7 +32645,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo ##
##
## This is a templated interface, and should only
-@@ -3321,25 +3425,28 @@
+@@ -3321,25 +3426,28 @@
##
##
##
## This is a templated interface, and should only
-@@ -3358,18 +3465,86 @@
+@@ -3358,18 +3466,86 @@
##
##
#
@@ -32729,7 +32770,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
##
##
-@@ -4231,11 +4406,11 @@
+@@ -4231,11 +4407,11 @@
#
interface(`userdom_search_staff_home_dirs',`
gen_require(`
@@ -32743,7 +32784,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4251,10 +4426,10 @@
+@@ -4251,10 +4427,10 @@
#
interface(`userdom_dontaudit_search_staff_home_dirs',`
gen_require(`
@@ -32756,7 +32797,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4270,11 +4445,11 @@
+@@ -4270,11 +4446,11 @@
#
interface(`userdom_manage_staff_home_dirs',`
gen_require(`
@@ -32770,7 +32811,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4289,16 +4464,16 @@
+@@ -4289,16 +4465,16 @@
#
interface(`userdom_relabelto_staff_home_dirs',`
gen_require(`
@@ -32790,7 +32831,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
## users home directory.
##
##
-@@ -4307,12 +4482,27 @@
+@@ -4307,12 +4483,27 @@
##
##
#
@@ -32821,7 +32862,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4327,13 +4517,13 @@
+@@ -4327,13 +4518,13 @@
#
interface(`userdom_read_staff_home_content_files',`
gen_require(`
@@ -32839,7 +32880,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4531,10 +4721,10 @@
+@@ -4531,10 +4722,10 @@
#
interface(`userdom_getattr_sysadm_home_dirs',`
gen_require(`
@@ -32852,7 +32893,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4551,10 +4741,10 @@
+@@ -4551,10 +4742,10 @@
#
interface(`userdom_dontaudit_getattr_sysadm_home_dirs',`
gen_require(`
@@ -32865,7 +32906,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4569,10 +4759,10 @@
+@@ -4569,10 +4760,10 @@
#
interface(`userdom_search_sysadm_home_dirs',`
gen_require(`
@@ -32878,7 +32919,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4588,10 +4778,10 @@
+@@ -4588,10 +4779,10 @@
#
interface(`userdom_dontaudit_search_sysadm_home_dirs',`
gen_require(`
@@ -32891,7 +32932,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4606,10 +4796,10 @@
+@@ -4606,10 +4797,10 @@
#
interface(`userdom_list_sysadm_home_dirs',`
gen_require(`
@@ -32904,7 +32945,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4625,10 +4815,10 @@
+@@ -4625,10 +4816,10 @@
#
interface(`userdom_dontaudit_list_sysadm_home_dirs',`
gen_require(`
@@ -32917,7 +32958,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4644,12 +4834,11 @@
+@@ -4644,12 +4835,11 @@
#
interface(`userdom_dontaudit_read_sysadm_home_content_files',`
gen_require(`
@@ -32933,7 +32974,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4676,10 +4865,10 @@
+@@ -4676,10 +4866,10 @@
#
interface(`userdom_sysadm_home_dir_filetrans',`
gen_require(`
@@ -32946,7 +32987,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4694,10 +4883,10 @@
+@@ -4694,10 +4884,10 @@
#
interface(`userdom_search_sysadm_home_content_dirs',`
gen_require(`
@@ -32959,7 +33000,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4712,13 +4901,13 @@
+@@ -4712,13 +4902,13 @@
#
interface(`userdom_read_sysadm_home_content_files',`
gen_require(`
@@ -32977,7 +33018,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4754,11 +4943,49 @@
+@@ -4754,11 +4944,49 @@
#
interface(`userdom_search_all_users_home_dirs',`
gen_require(`
@@ -33028,7 +33069,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4778,6 +5005,14 @@
+@@ -4778,6 +5006,14 @@
files_list_home($1)
allow $1 home_dir_type:dir list_dir_perms;
@@ -33043,7 +33084,7 @@ diff --exclude-from=exclude -N -u -r nsaserefpolicy/policy/modules/system/userdo
')
########################################
-@@ -4839,6 +5074,26 @@
+@@ -4839,6 +5075,26 @@
########################################
##