]> git.ipfire.org Git - people/stevee/selinux-policy.git/commitdiff
Remove module for gnome. 001
authorStefan Schantl <stefan.schantl@ipfire.org>
Sat, 21 Jan 2012 18:10:53 +0000 (19:10 +0100)
committerStefan Schantl <stefan.schantl@ipfire.org>
Sat, 21 Jan 2012 18:21:59 +0000 (19:21 +0100)
44 files changed:
policy/modules/admin/firstboot.te
policy/modules/admin/prelink.te
policy/modules/apps/gnome.fc [deleted file]
policy/modules/apps/gnome.if [deleted file]
policy/modules/apps/gnome.te [deleted file]
policy/modules/apps/gpg.te
policy/modules/apps/mplayer.te
policy/modules/apps/pulseaudio.te
policy/modules/apps/sandbox.te
policy/modules/apps/userhelper.te
policy/modules/kernel/corecommands.fc
policy/modules/kernel/domain.te
policy/modules/kernel/kernel.te
policy/modules/roles/staff.te
policy/modules/roles/sysadm.te
policy/modules/roles/unconfineduser.te
policy/modules/roles/unprivuser.te
policy/modules/roles/xguest.te
policy/modules/services/cobbler.te
policy/modules/services/colord.te
policy/modules/services/cups.te
policy/modules/services/dbus.te
policy/modules/services/denyhosts.te
policy/modules/services/devicekit.te
policy/modules/services/dovecot.te
policy/modules/services/fail2ban.te
policy/modules/services/hal.te
policy/modules/services/mailman.te
policy/modules/services/networkmanager.te
policy/modules/services/piranha.te
policy/modules/services/policykit.te
policy/modules/services/procmail.te
policy/modules/services/setroubleshoot.te
policy/modules/services/ssh.te
policy/modules/services/tuned.te
policy/modules/services/xserver.if
policy/modules/services/xserver.te
policy/modules/system/init.te
policy/modules/system/libraries.te
policy/modules/system/systemd.fc
policy/modules/system/systemd.te
policy/modules/system/udev.te
policy/modules/system/userdomain.if
policy/modules/system/userdomain.te

index bd59f2e1295c86db30a3be209bc43fcab585348b..69695bcbc6de4d4c90f665ecdf77779744380ea8 100644 (file)
@@ -136,11 +136,6 @@ optional_policy(`
        usermanage_domtrans_admin_passwd(firstboot_t)
 ')
 
-optional_policy(`
-       gnome_admin_home_gconf_filetrans(firstboot_t, dir)
-       gnome_manage_config(firstboot_t)
-')
-
 optional_policy(`
        xserver_domtrans(firstboot_t)
        xserver_rw_shm(firstboot_t)
index 20fd89c1f280e63b3c17554053c8a497207daee0..086ad1aa0bb951bc20c8a186ace5b120585583db 100644 (file)
@@ -120,11 +120,6 @@ optional_policy(`
        cron_system_entry(prelink_t, prelink_exec_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_read_config(prelink_t)
-       gnome_dontaudit_read_inherited_gconf_config_files(prelink_t)
-')
-
 optional_policy(`
        rpm_manage_tmp_files(prelink_t)
 ')
diff --git a/policy/modules/apps/gnome.fc b/policy/modules/apps/gnome.fc
deleted file mode 100644 (file)
index fba11e1..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-HOME_DIR/\.cache(/.*)? gen_context(system_u:object_r:cache_home_t,s0)
-HOME_DIR/\.color/icc(/.*)?     gen_context(system_u:object_r:icc_data_home_t,s0)
-HOME_DIR/\.config(/.*)?        gen_context(system_u:object_r:config_home_t,s0)
-HOME_DIR/\.gconf(d)?(/.*)?     gen_context(system_u:object_r:gconf_home_t,s0)
-HOME_DIR/\.gnome2(/.*)?                gen_context(system_u:object_r:gnome_home_t,s0)
-HOME_DIR/\.gnome2/keyrings(/.*)?       gen_context(system_u:object_r:gkeyringd_gnome_home_t,s0)
-HOME_DIR/\.gstreamer-.*                gen_context(system_u:object_r:gstreamer_home_t,s0)
-HOME_DIR/\.local.*             gen_context(system_u:object_r:gconf_home_t,s0)
-HOME_DIR/\.local/share(/.*)?   gen_context(system_u:object_r:data_home_t,s0)
-HOME_DIR/\.local/share/icc(/.*)?       gen_context(system_u:object_r:icc_data_home_t,s0)
-HOME_DIR/\.Xdefaults           gen_context(system_u:object_r:config_home_t,s0)
-HOME_DIR/\.xine(/.*)?          gen_context(system_u:object_r:config_home_t,s0)
-
-/var/run/user/[^/]*/dconf(/.*)?        gen_context(system_u:object_r:config_home_t,s0)
-
-/root/\.cache(/.*)?    gen_context(system_u:object_r:cache_home_t,s0)
-/root/\.color/icc(/.*)?        gen_context(system_u:object_r:icc_data_home_t,s0)
-/root/\.config(/.*)?           gen_context(system_u:object_r:config_home_t,s0)
-/root/\.gconf(d)?(/.*)?        gen_context(system_u:object_r:gconf_home_t,s0)
-/root/\.gnome2(/.*)?           gen_context(system_u:object_r:gnome_home_t,s0)
-/root/\.gnome2/keyrings(/.*)?  gen_context(system_u:object_r:gkeyringd_gnome_home_t,s0)
-/root/\.gstreamer-.*           gen_context(system_u:object_r:gstreamer_home_t,s0)
-/root/\.local.*                        gen_context(system_u:object_r:gconf_home_t,s0)
-/root/\.local/share(/.*)?      gen_context(system_u:object_r:data_home_t,s0)
-/root/\.local/share/icc(/.*)?  gen_context(system_u:object_r:icc_data_home_t,s0)
-/root/\.Xdefaults              gen_context(system_u:object_r:config_home_t,s0)
-/root/\.xine(/.*)?             gen_context(system_u:object_r:config_home_t,s0)
-
-/etc/gconf(/.*)?               gen_context(system_u:object_r:gconf_etc_t,s0)
-
-/tmp/gconfd-USER/.*    --      gen_context(system_u:object_r:gconf_tmp_t,s0)
-
-/usr/share/config(/.*)?        gen_context(system_u:object_r:config_usr_t,s0)
-
-/usr/bin/gnome-keyring-daemon  --      gen_context(system_u:object_r:gkeyringd_exec_t,s0)
-
-# Don't use because toolchain is broken
-#/usr/libexec/gconfd-2 --      gen_context(system_u:object_r:gconfd_exec_t,s0)
-
-/usr/libexec/gconf-defaults-mechanism          --      gen_context(system_u:object_r:gconfdefaultsm_exec_t,s0)
-
-/usr/libexec/gnome-system-monitor-mechanism    --      gen_context(system_u:object_r:gnomesystemmm_exec_t,s0)
diff --git a/policy/modules/apps/gnome.if b/policy/modules/apps/gnome.if
deleted file mode 100644 (file)
index 1be6bcd..0000000
+++ /dev/null
@@ -1,1296 +0,0 @@
-## <summary>GNU network object model environment (GNOME)</summary>
-
-###########################################################
-## <summary>
-##  Role access for gnome
-## </summary>
-## <param name="role">
-##  <summary>
-##  Role allowed access
-##  </summary>
-## </param>
-## <param name="domain">
-##  <summary>
-##  User domain for the role
-##  </summary>
-## </param>
-#
-interface(`gnome_role',`
-    gen_require(`
-        type gconfd_t, gconfd_exec_t;
-        type gconf_tmp_t;
-    ')
-
-    role $1 types gconfd_t;
-
-    domain_auto_trans($2, gconfd_exec_t, gconfd_t)
-    allow gconfd_t $2:fd use;
-    allow gconfd_t $2:fifo_file write;
-    allow gconfd_t $2:unix_stream_socket connectto;
-
-    ps_process_pattern($2, gconfd_t)
-
-       #gnome_stream_connect_gconf_template($1, $2)
-       read_files_pattern($2, gconf_tmp_t, gconf_tmp_t)
-       allow $2 gconfd_t:unix_stream_socket connectto;
-')
-
-######################################
-## <summary>
-##      The role template for the gnome-keyring-daemon.
-## </summary>
-## <param name="user_prefix">
-##      <summary>
-##      The user prefix.
-##      </summary>
-## </param>
-## <param name="user_role">
-##      <summary>
-##      The user role.
-##      </summary>
-## </param>
-## <param name="user_domain">
-##      <summary>
-##      The user domain associated with the role.
-##      </summary>
-## </param>
-#
-interface(`gnome_role_gkeyringd',`
-        gen_require(`
-                attribute gkeyringd_domain;
-                attribute gnomedomain;
-                type gnome_home_t;
-                type gkeyringd_exec_t, gkeyringd_tmp_t, gkeyringd_gnome_home_t;
-               class dbus send_msg;
-        ')
-
-       type $1_gkeyringd_t, gnomedomain, gkeyringd_domain;
-       typealias $1_gkeyringd_t alias gkeyringd_$1_t;
-       application_domain($1_gkeyringd_t, gkeyringd_exec_t)
-       ubac_constrained($1_gkeyringd_t)
-       domain_user_exemption_target($1_gkeyringd_t)
-
-       userdom_home_manager($1_gkeyringd_t)
-
-       role $2 types $1_gkeyringd_t;
-
-       domtrans_pattern($3, gkeyringd_exec_t, $1_gkeyringd_t)
-
-       allow $3 gkeyringd_gnome_home_t:dir { relabel_dir_perms manage_dir_perms };
-       allow $3 gkeyringd_gnome_home_t:file { relabel_file_perms manage_file_perms };
-
-       allow $3 gkeyringd_tmp_t:dir { relabel_dir_perms manage_dir_perms };
-       allow $3 gkeyringd_tmp_t:sock_file { relabel_sock_file_perms manage_sock_file_perms };
-
-       corecmd_bin_domtrans($1_gkeyringd_t, $1_t)
-       corecmd_shell_domtrans($1_gkeyringd_t, $1_t)
-       allow $1_gkeyringd_t $3:process sigkill;
-       allow $3 $1_gkeyringd_t:fd use;
-       allow $3 $1_gkeyringd_t:fifo_file rw_fifo_file_perms;
-
-       ps_process_pattern($1_gkeyringd_t, $3)
-
-       auth_use_nsswitch($1_gkeyringd_t)
-
-       ps_process_pattern($3, $1_gkeyringd_t)
-       allow $3 $1_gkeyringd_t:process signal_perms;
-       dontaudit $3 gkeyringd_exec_t:file entrypoint;
-
-       stream_connect_pattern($3, gkeyringd_tmp_t, gkeyringd_tmp_t, $1_gkeyringd_t)
-
-       allow $1_gkeyringd_t $3:dbus send_msg;
-       allow $3 $1_gkeyringd_t:dbus send_msg;
-       optional_policy(`
-               dbus_session_domain($1, gkeyringd_exec_t, $1_gkeyringd_t)
-               dbus_session_bus_client($1_gkeyringd_t)
-               gnome_home_dir_filetrans($1_gkeyringd_t)
-               gnome_manage_generic_home_dirs($1_gkeyringd_t)
-               gnome_read_generic_data_home_files($1_gkeyringd_t)
-       ')
-')
-
-########################################
-## <summary>
-##     gconf connection template.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_stream_connect_gconf',`
-       gen_require(`
-               type gconfd_t, gconf_tmp_t;
-       ')
-
-       read_files_pattern($1, gconf_tmp_t, gconf_tmp_t)
-       allow $1 gconfd_t:unix_stream_socket connectto;
-')
-
-########################################
-## <summary>
-##     Connect to gkeyringd with a unix stream socket. 
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_stream_connect_gkeyringd',`
-       gen_require(`
-                       attribute gkeyringd_domain;
-                       type gkeyringd_tmp_t;
-                       type gconf_tmp_t;
-       ')
-
-       allow $1 gconf_tmp_t:dir search_dir_perms;
-       stream_connect_pattern($1, gkeyringd_tmp_t, gkeyringd_tmp_t, gkeyringd_domain)
-')
-
-########################################
-## <summary>
-##     Connect to gkeyringd with a unix stream socket. 
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_stream_connect_all_gkeyringd',`
-       gen_require(`
-               attribute gkeyringd_domain;
-               type gkeyringd_tmp_t;
-               type gconf_tmp_t;
-       ')
-
-       allow $1 gconf_tmp_t:dir search_dir_perms;
-       stream_connect_pattern($1, gkeyringd_tmp_t, gkeyringd_tmp_t, gkeyringd_domain)
-')
-
-########################################
-## <summary>
-##     Run gconfd in gconfd domain.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_domtrans_gconfd',`
-       gen_require(`
-               type gconfd_t, gconfd_exec_t;
-       ')
-
-       domtrans_pattern($1, gconfd_exec_t, gconfd_t)
-')
-
-########################################
-## <summary>
-##     Dontaudit read gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain to not audit.
-##     </summary>
-## </param>
-#
-interface(`gnome_dontaudit_read_config',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       dontaudit $1 gnome_home_type:dir read_inherited_file_perms;
-')
-
-########################################
-## <summary>
-##     Dontaudit search gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain to not audit.
-##     </summary>
-## </param>
-#
-interface(`gnome_dontaudit_search_config',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       dontaudit $1 gnome_home_type:dir search_dir_perms;
-')
-
-########################################
-## <summary>
-##     Dontaudit write gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain to not audit.
-##     </summary>
-## </param>
-#
-interface(`gnome_dontaudit_write_config_files',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       dontaudit $1 gnome_home_type:file write;
-')
-
-########################################
-## <summary>
-##     manage gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_config',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       allow $1 gnome_home_type:dir manage_dir_perms;
-       allow $1 gnome_home_type:file manage_file_perms;
-       allow $1 gnome_home_type:lnk_file manage_lnk_file_perms;
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Send general signals to all gconf domains.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_signal_all',`
-       gen_require(`
-               attribute gnomedomain;
-       ')
-
-       allow $1 gnomedomain:process signal;
-')
-
-########################################
-## <summary>
-##     Create objects in a Gnome cache home directory
-##     with an automatic type transition to
-##     a specified private type.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <param name="private_type">
-##     <summary>
-##     The type of the object to create.
-##     </summary>
-## </param>
-## <param name="object_class">
-##     <summary>
-##     The class of the object to be created.
-##     </summary>
-## </param>
-#
-interface(`gnome_cache_filetrans',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       filetrans_pattern($1, cache_home_t, $2, $3, $4)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Create objects in a Gnome cache home directory
-##     with an automatic type transition to
-##     a specified private type.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <param name="private_type">
-##     <summary>
-##     The type of the object to create.
-##     </summary>
-## </param>
-## <param name="object_class">
-##     <summary>
-##     The class of the object to be created.
-##     </summary>
-## </param>
-#
-interface(`gnome_config_filetrans',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       filetrans_pattern($1, config_home_t, $2, $3, $4)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Read generic cache home files (.cache)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_generic_cache_files',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       read_files_pattern($1, cache_home_t, cache_home_t)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Set attributes of cache home dir (.cache)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_setattr_cache_home_dir',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       setattr_dirs_pattern($1, cache_home_t, cache_home_t)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     append to generic cache home files (.cache)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_append_generic_cache_files',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       append_files_pattern($1, cache_home_t, cache_home_t)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     write to generic cache home files (.cache)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_write_generic_cache_files',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       write_files_pattern($1, cache_home_t, cache_home_t)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Dontaudit read/write to generic cache home files (.cache)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain to not audit.
-##     </summary>
-## </param>
-#
-interface(`gnome_dontaudit_rw_generic_cache_files',`
-       gen_require(`
-               type cache_home_t;
-       ')
-
-       dontaudit $1 cache_home_t:file rw_inherited_file_perms;
-')
-
-########################################
-## <summary>
-##     read gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_config',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       list_dirs_pattern($1, gnome_home_type, gnome_home_type)
-       read_files_pattern($1, gnome_home_type, gnome_home_type)
-       read_lnk_files_pattern($1, gnome_home_type, gnome_home_type)
-')
-
-########################################
-## <summary>
-##     Create objects in a Gnome gconf home directory
-##     with an automatic type transition to
-##     a specified private type.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <param name="private_type">
-##     <summary>
-##     The type of the object to create.
-##     </summary>
-## </param>
-## <param name="object_class">
-##     <summary>
-##     The class of the object to be created.
-##     </summary>
-## </param>
-#
-interface(`gnome_data_filetrans',`
-       gen_require(`
-               type data_home_t;
-       ')
-
-       filetrans_pattern($1, data_home_t, $2, $3, $4)
-       gnome_search_gconf($1)
-')
-
-#######################################
-## <summary>
-##     Read generic data home files.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_generic_data_home_files',`
-       gen_require(`
-               type data_home_t, gconf_home_t;
-       ')
-
-       read_files_pattern($1, { gconf_home_t data_home_t }, data_home_t)
-')
-
-#######################################
-## <summary>
-##     Manage gconf data home files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_data',`
-       gen_require(`
-               type data_home_t;
-               type gconf_home_t;
-       ')
-
-               allow $1 gconf_home_t:dir search_dir_perms;
-               manage_dirs_pattern($1, data_home_t, data_home_t)
-               manage_files_pattern($1, data_home_t, data_home_t)
-               manage_lnk_files_pattern($1, data_home_t, data_home_t)
-')
-
-########################################
-## <summary>
-##     Read icc data home content.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_home_icc_data_content',`
-       gen_require(`
-               type icc_data_home_t, gconf_home_t, data_home_t;
-       ')
-
-       userdom_search_user_home_dirs($1)
-       allow $1 { gconf_home_t data_home_t }:dir search_dir_perms;
-       list_dirs_pattern($1, icc_data_home_t, icc_data_home_t)
-       read_files_pattern($1, icc_data_home_t, icc_data_home_t)
-       read_lnk_files_pattern($1, icc_data_home_t, icc_data_home_t)
-')
-
-########################################
-## <summary>
-##     Read inherited icc data home files.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_inherited_home_icc_data_files',`
-       gen_require(`
-               type icc_data_home_t;
-       ')
-
-       allow $1 icc_data_home_t:file read_inherited_file_perms;
-')
-
-########################################
-## <summary>
-##     Create gconf_home_t objects in the /root directory
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <param name="object_class">
-##     <summary>
-##     The class of the object to be created.
-##     </summary>
-## </param>
-#
-interface(`gnome_admin_home_gconf_filetrans',`
-       gen_require(`
-               type gconf_home_t;
-       ')
-
-       userdom_admin_home_dir_filetrans($1, gconf_home_t, $2)
-')
-
-########################################
-## <summary>
-##     Do not audit attempts to read
-##     inherited gconf config files.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain to not audit.
-##     </summary>
-## </param>
-#
-interface(`gnome_dontaudit_read_inherited_gconf_config_files',`
-       gen_require(`
-               type gconf_etc_t;
-       ')
-
-       dontaudit $1 gconf_etc_t:file read_inherited_file_perms;
-')
-
-########################################
-## <summary>
-##     read gconf config files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_gconf_config',`
-       gen_require(`
-               type gconf_etc_t;
-       ')
-
-       allow $1 gconf_etc_t:dir list_dir_perms;
-       read_files_pattern($1, gconf_etc_t, gconf_etc_t)
-       files_search_etc($1)
-')
-
-#######################################
-## <summary>
-##      Manage gconf config files
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`gnome_manage_gconf_config',`
-        gen_require(`
-                type gconf_etc_t;
-        ')
-
-        allow $1 gconf_etc_t:dir list_dir_perms;
-        manage_files_pattern($1, gconf_etc_t, gconf_etc_t)
-')
-
-########################################
-## <summary>
-##     Execute gconf programs in 
-##     in the caller domain.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_exec_gconf',`
-       gen_require(`
-               type gconfd_exec_t;
-       ')
-
-       can_exec($1, gconfd_exec_t)
-')
-
-########################################
-## <summary>
-##     Execute gnome keyringd in the caller domain.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_exec_keyringd',`
-       gen_require(`
-               type gkeyringd_exec_t;
-       ')
-
-       can_exec($1, gkeyringd_exec_t)
-       corecmd_search_bin($1)
-')
-
-########################################
-## <summary>
-##     Read gconf home files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_gconf_home_files',`
-       gen_require(`
-               type gconf_home_t;
-               type data_home_t;
-       ')
-
-       userdom_search_user_home_dirs($1)
-       allow $1 gconf_home_t:dir list_dir_perms;
-       allow $1 data_home_t:dir list_dir_perms;
-       read_files_pattern($1, gconf_home_t, gconf_home_t)
-       read_files_pattern($1, data_home_t, data_home_t)
-       read_lnk_files_pattern($1, gconf_home_t, gconf_home_t)
-       read_lnk_files_pattern($1, data_home_t, data_home_t)
-')
-
-########################################
-## <summary>
-##     Search gkeyringd temporary directories.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_search_gkeyringd_tmp_dirs',`
-       gen_require(`
-               type gkeyringd_tmp_t;
-       ')
-
-       files_search_tmp($1)
-       allow $1 gkeyringd_tmp_t:dir search_dir_perms;
-')
-
-########################################
-## <summary>
-##     search gconf homedir (.local)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_search_gconf',`
-       gen_require(`
-               type gconf_home_t;
-       ')
-
-       allow $1 gconf_home_t:dir search_dir_perms;
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Set attributes of Gnome config dirs.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_setattr_config_dirs',`
-       gen_require(`
-               type gnome_home_t;
-       ')
-
-       setattr_dirs_pattern($1, gnome_home_t, gnome_home_t)
-       files_search_home($1)
-')
-
-########################################
-## <summary>
-##     Manage generic gnome home files.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_generic_home_files',`
-       gen_require(`
-               type gnome_home_t;
-       ')
-
-       userdom_search_user_home_dirs($1)
-       manage_files_pattern($1, gnome_home_t, gnome_home_t)
-')
-
-########################################
-## <summary>
-##     Manage generic gnome home directories.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_generic_home_dirs',`
-       gen_require(`
-               type gnome_home_t;
-       ')
-
-       userdom_search_user_home_dirs($1)
-       allow $1 gnome_home_t:dir manage_dir_perms;
-')
-
-########################################
-## <summary>
-##     Append gconf home files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_append_gconf_home_files',`
-       gen_require(`
-               type gconf_home_t;
-       ')
-
-       append_files_pattern($1, gconf_home_t, gconf_home_t)
-')
-
-########################################
-## <summary>
-##     manage gconf home files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_gconf_home_files',`
-       gen_require(`
-               type gconf_home_t;
-       ')
-
-       allow $1 gconf_home_t:dir list_dir_perms;
-       manage_files_pattern($1, gconf_home_t, gconf_home_t)
-')
-
-########################################
-## <summary>
-##     Connect to gnome over an unix stream socket.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <param name="user_domain">
-##     <summary>
-##     The type of the user domain.
-##     </summary>
-## </param>
-#
-interface(`gnome_stream_connect',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       # Connect to pulseaudit server
-       stream_connect_pattern($1, gnome_home_type, gnome_home_type, $2)
-')
-
-########################################
-## <summary>
-##     list gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_list_home_config',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       allow $1 config_home_t:dir list_dir_perms;
-')
-
-########################################
-## <summary>
-##     Set attributes of gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_setattr_home_config',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       setattr_dirs_pattern($1, config_home_t, config_home_t)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     read gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_home_config',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       list_dirs_pattern($1, config_home_t, config_home_t)
-       read_files_pattern($1, config_home_t, config_home_t)
-       read_lnk_files_pattern($1, config_home_t, config_home_t)
-')
-
-#######################################
-## <summary>
-##  delete gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`gnome_delete_home_config',`
-    gen_require(`
-        type config_home_t;
-    ')
-
-    delete_files_pattern($1, config_home_t, config_home_t)
-')
-
-#######################################
-## <summary>
-##  setattr gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`gnome_setattr_home_config_dirs',`
-    gen_require(`
-        type config_home_t;
-    ')
-
-    setattr_dirs_pattern($1, config_home_t, config_home_t)
-')
-
-########################################
-## <summary>
-##     manage gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_home_config',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       manage_files_pattern($1, config_home_t, config_home_t)
-')
-
-#######################################
-## <summary>
-##  delete gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`gnome_delete_home_config_dirs',`
-    gen_require(`
-        type config_home_t;
-    ')
-
-    delete_dirs_pattern($1, config_home_t, config_home_t)
-')
-
-########################################
-## <summary>
-##     manage gnome homedir content (.config)
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_home_config_dirs',`
-       gen_require(`
-               type config_home_t;
-       ')
-
-       manage_dirs_pattern($1, config_home_t, config_home_t)
-')
-
-########################################
-## <summary>
-##     manage gstreamer home content files.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_manage_gstreamer_home_files',`
-       gen_require(`
-               type gstreamer_home_t;
-       ')
-
-       manage_files_pattern($1, gstreamer_home_t, gstreamer_home_t)
-')
-
-########################################
-## <summary>
-##     Read/Write all inherited gnome home config 
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_rw_inherited_config',`
-       gen_require(`
-               attribute gnome_home_type;
-       ')
-
-       allow $1 gnome_home_type:file rw_inherited_file_perms;
-')
-
-########################################
-## <summary>
-##     Send and receive messages from
-##     gconf system service over dbus.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_dbus_chat_gconfdefault',`
-       gen_require(`
-               type gconfdefaultsm_t;
-               class dbus send_msg;
-       ')
-
-       allow $1 gconfdefaultsm_t:dbus send_msg;
-       allow gconfdefaultsm_t $1:dbus send_msg;
-')
-
-########################################
-## <summary>
-##     Send and receive messages from
-##     gkeyringd over dbus.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_dbus_chat_gkeyringd',`
-       gen_require(`
-               attribute gkeyringd_domain;
-               class dbus send_msg;
-       ')
-
-       allow $1 gkeyringd_domain:dbus send_msg;
-       allow gkeyringd_domain $1:dbus send_msg;
-')
-
-########################################
-## <summary>
-##     Send signull signal to gkeyringd processes.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_signull_gkeyringd',`
-       gen_require(`
-               attribute gkeyringd_domain;
-       ')
-
-       allow $1 gkeyringd_domain:process signull;
-')
-
-########################################
-## <summary>
-##     Allow the domain to read gkeyringd state files in /proc.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_read_gkeyringd_state',`
-       gen_require(`
-               attribute gkeyringd_domain;
-       ')
-
-       ps_process_pattern($1, gkeyringd_domain)
-')
-
-########################################
-## <summary>
-##     Create directories in user home directories
-##     with the gnome home file type.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_home_dir_filetrans',`
-       gen_require(`
-               type gnome_home_t;
-       ')
-
-       userdom_user_home_dir_filetrans($1, gnome_home_t, dir)
-       userdom_search_user_home_dirs($1)
-')
-
-########################################
-## <summary>
-##     Execute gnome-keyring in the user gkeyring domain
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access
-##     </summary>
-## </param>
-## <param name="role">
-##     <summary>
-##     The role to be allowed the gkeyring domain.
-##     </summary>
-## </param>
-#
-interface(`gnome_transition_gkeyringd',`
-       gen_require(`
-               attribute gkeyringd_domain;
-       ')
-
-       allow $1 gkeyringd_domain:process transition;
-       dontaudit $1 gkeyringd_domain:process { noatsecure siginh rlimitinh };
-       allow gkeyringd_domain $1:process { sigchld signull };
-       allow gkeyringd_domain $1:fifo_file rw_inherited_fifo_file_perms;
-')
-
-########################################
-## <summary>
-##     Create gnome content in the user home directory
-##     with an correct label.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_filetrans_home_content',`
-
-gen_require(`
-       type config_home_t;
-       type cache_home_t;
-       type gstreamer_home_t;
-       type gconf_home_t;
-       type gnome_home_t;
-       type data_home_t, icc_data_home_t;
-       type gkeyringd_gnome_home_t;
-')
-
-       userdom_user_home_dir_filetrans($1, config_home_t, dir, ".config")
-       userdom_user_home_dir_filetrans($1, config_home_t, file, ".Xdefaults")
-       userdom_user_home_dir_filetrans($1, config_home_t, dir, ".xine")
-       userdom_user_home_dir_filetrans($1, cache_home_t, dir, ".cache")
-       userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".gconf")
-       userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".gconfd")
-       userdom_user_home_dir_filetrans($1, gconf_home_t, dir, ".local")
-       userdom_user_home_dir_filetrans($1, gnome_home_t, dir, ".gnome2")
-       userdom_user_home_dir_filetrans($1, gstreamer_home_t, dir, ".gstreamer-10")
-       userdom_user_home_dir_filetrans($1, gstreamer_home_t, dir, ".gstreamer-12")
-       # ~/.color/icc: legacy
-       userdom_user_home_content_filetrans($1, icc_data_home_t, dir, "icc")
-       filetrans_pattern($1, gnome_home_t, gkeyringd_gnome_home_t, dir, "keyrings")
-       filetrans_pattern($1, gconf_home_t, data_home_t, dir, "share")
-       filetrans_pattern($1, data_home_t, icc_data_home_t, dir, "icc")
-       userdom_user_tmp_filetrans($1, config_home_t, dir, "dconf")
-')
-
-########################################
-## <summary>
-##     Create gnome directory in the /root directory
-##     with an correct label.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`gnome_filetrans_admin_home_content',`
-
-gen_require(`
-       type config_home_t;
-       type cache_home_t;
-       type gstreamer_home_t;
-       type gconf_home_t;
-       type gnome_home_t;
-       type icc_data_home_t;
-')
-
-       userdom_admin_home_dir_filetrans($1, config_home_t, file, ".Xdefaults")
-       userdom_admin_home_dir_filetrans($1, config_home_t, dir, ".xine")
-       userdom_admin_home_dir_filetrans($1, cache_home_t, dir, ".cache")
-       userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".gconf")
-       userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".gconfd")
-       userdom_admin_home_dir_filetrans($1, gconf_home_t, dir, ".local")
-       userdom_admin_home_dir_filetrans($1, gnome_home_t, dir, ".gnome2")
-       userdom_admin_home_dir_filetrans($1, gstreamer_home_t, dir, ".gstreamer-10")
-       userdom_admin_home_dir_filetrans($1, gstreamer_home_t, dir, ".gstreamer-12")
-       # /root/.color/icc: legacy
-       userdom_admin_home_dir_filetrans($1, icc_data_home_t, dir, "icc")
-')
-
-######################################
-## <summary>
-##  Execute gnome-keyring executable
-##  in the specified domain.
-## </summary>
-## <desc>
-##  <p>
-##  Execute a telepathy executable
-##  in the specified domain.  This allows
-##  the specified domain to execute any file
-##  on these filesystems in the specified
-##  domain. 
-##  </p>
-##  <p>
-##  No interprocess communication (signals, pipes,
-##  etc.) is provided by this interface since
-##  the domains are not owned by this module.
-##  </p>
-##  <p>
-##  This interface was added to handle
-##  the ssh-agent policy.
-##  </p>
-## </desc>
-## <param name="domain">
-##  <summary>
-##  Domain allowed to transition.
-##  </summary>
-## </param>
-## <param name="target_domain">
-##  <summary>
-##  The type of the new process.
-##  </summary>
-## </param>
-#
-interface(`gnome_command_domtrans_gkeyringd', `
-    gen_require(`
-        type gkeyringd_exec_t;
-    ')
-
-    allow $2 gkeyringd_exec_t:file entrypoint;
-    domain_transition_pattern($1, gkeyringd_exec_t, $2)
-    type_transition $1 gkeyringd_exec_t:process $2;
-')
diff --git a/policy/modules/apps/gnome.te b/policy/modules/apps/gnome.te
deleted file mode 100644 (file)
index 3c5d792..0000000
+++ /dev/null
@@ -1,263 +0,0 @@
-policy_module(gnome, 2.1.0)
-
-##############################
-#
-# Declarations
-#
-
-attribute gnomedomain;
-attribute gnome_home_type;
-attribute gkeyringd_domain;
-
-type gconf_etc_t;
-files_config_file(gconf_etc_t)
-
-type data_home_t, gnome_home_type;
-userdom_user_home_content(data_home_t)
-
-type config_home_t, gnome_home_type;
-userdom_user_home_content(config_home_t)
-
-type cache_home_t, gnome_home_type;
-userdom_user_home_content(cache_home_t)
-
-type gstreamer_home_t, gnome_home_type;
-userdom_user_home_content(gstreamer_home_t)
-
-type icc_data_home_t, gnome_home_type;
-userdom_user_home_content(icc_data_home_t)
-
-type gconf_home_t, gnome_home_type;
-typealias gconf_home_t alias { user_gconf_home_t staff_gconf_home_t sysadm_gconf_home_t };
-typealias gconf_home_t alias { auditadm_gconf_home_t secadm_gconf_home_t };
-typealias gconf_home_t alias unconfined_gconf_home_t;
-userdom_user_home_content(gconf_home_t)
-
-type gconf_tmp_t;
-typealias gconf_tmp_t alias { user_gconf_tmp_t staff_gconf_tmp_t sysadm_gconf_tmp_t };
-typealias gconf_tmp_t alias { auditadm_gconf_tmp_t secadm_gconf_tmp_t };
-typealias gconf_tmp_t alias unconfined_gconf_tmp_t;
-files_tmp_file(gconf_tmp_t)
-ubac_constrained(gconf_tmp_t)
-
-type gconfd_t, gnomedomain;
-type gconfd_exec_t;
-typealias gconfd_t alias { user_gconfd_t staff_gconfd_t sysadm_gconfd_t };
-typealias gconfd_t alias { auditadm_gconfd_t secadm_gconfd_t };
-application_domain(gconfd_t, gconfd_exec_t)
-ubac_constrained(gconfd_t)
-
-type gnome_home_t, gnome_home_type;
-typealias gnome_home_t alias { user_gnome_home_t staff_gnome_home_t sysadm_gnome_home_t };
-typealias gnome_home_t alias { auditadm_gnome_home_t secadm_gnome_home_t };
-typealias gnome_home_t alias unconfined_gnome_home_t;
-userdom_user_home_content(gnome_home_t)
-
-# type KDE /usr/share/config files
-type config_usr_t;
-files_type(config_usr_t)
-
-type gkeyringd_exec_t;
-corecmd_executable_file(gkeyringd_exec_t)
-
-type gkeyringd_gnome_home_t;
-userdom_user_home_content(gkeyringd_gnome_home_t)
-
-type gkeyringd_tmp_t;
-userdom_user_tmp_content(gkeyringd_tmp_t)
-
-type gconfdefaultsm_t;
-type gconfdefaultsm_exec_t;
-dbus_system_domain(gconfdefaultsm_t, gconfdefaultsm_exec_t)
-
-type gnomesystemmm_t;
-type gnomesystemmm_exec_t;
-dbus_system_domain(gnomesystemmm_t, gnomesystemmm_exec_t)
-
-##############################
-#
-# Local Policy
-#
-
-allow gconfd_t self:process getsched;
-allow gconfd_t self:fifo_file rw_fifo_file_perms;
-
-manage_dirs_pattern(gconfd_t, gconf_home_t, gconf_home_t)
-manage_files_pattern(gconfd_t, gconf_home_t, gconf_home_t)
-userdom_user_home_dir_filetrans(gconfd_t, gconf_home_t, dir)
-
-manage_dirs_pattern(gconfd_t, gconf_tmp_t, gconf_tmp_t)
-manage_files_pattern(gconfd_t, gconf_tmp_t, gconf_tmp_t)
-userdom_user_tmp_filetrans(gconfd_t, gconf_tmp_t, { dir file })
-
-allow gconfd_t gconf_etc_t:dir list_dir_perms;
-read_files_pattern(gconfd_t, gconf_etc_t, gconf_etc_t)
-
-dev_read_urand(gconfd_t)
-
-files_read_etc_files(gconfd_t)
-
-miscfiles_read_localization(gconfd_t)
-
-logging_send_syslog_msg(gconfd_t)
-
-userdom_manage_user_tmp_sockets(gconfd_t)
-userdom_manage_user_tmp_dirs(gconfd_t)
-userdom_tmp_filetrans_user_tmp(gconfd_t, dir)
-
-optional_policy(`
-       nscd_dontaudit_search_pid(gconfd_t)
-')
-
-optional_policy(`
-       xserver_use_xdm_fds(gconfd_t)
-       xserver_rw_xdm_pipes(gconfd_t)
-')
-
-#######################################
-#
-# gconf-defaults-mechanisms local policy
-#
-
-allow gconfdefaultsm_t self:capability { dac_override sys_nice };
-allow gconfdefaultsm_t self:process getsched;
-allow gconfdefaultsm_t self:fifo_file rw_fifo_file_perms;
-
-corecmd_search_bin(gconfdefaultsm_t)
-
-files_read_etc_files(gconfdefaultsm_t)
-files_read_usr_files(gconfdefaultsm_t)
-
-miscfiles_read_localization(gconfdefaultsm_t)
-
-gnome_manage_gconf_home_files(gconfdefaultsm_t)
-gnome_manage_gconf_config(gconfdefaultsm_t)
-
-userdom_read_all_users_state(gconfdefaultsm_t)
-userdom_search_user_home_dirs(gconfdefaultsm_t)
-
-userdom_dontaudit_search_admin_dir(gconfdefaultsm_t)
-
-optional_policy(`
-       consolekit_dbus_chat(gconfdefaultsm_t)
-')
-
-optional_policy(`
-       nscd_dontaudit_search_pid(gconfdefaultsm_t)
-')
-
-optional_policy(`
-       policykit_domtrans_auth(gconfdefaultsm_t)
-       policykit_dbus_chat(gconfdefaultsm_t)
-       policykit_read_lib(gconfdefaultsm_t)
-       policykit_read_reload(gconfdefaultsm_t)
-')
-
-userdom_home_manager(gconfdefaultsm_t)
-
-#######################################
-#
-# gnome-system-monitor-mechanisms local policy
-#
-
-allow gnomesystemmm_t self:capability sys_nice;
-allow gnomesystemmm_t self:fifo_file rw_fifo_file_perms;
-
-kernel_read_system_state(gnomesystemmm_t)
-
-corecmd_search_bin(gnomesystemmm_t)
-
-domain_kill_all_domains(gnomesystemmm_t)
-domain_search_all_domains_state(gnomesystemmm_t)
-domain_setpriority_all_domains(gnomesystemmm_t)
-domain_signal_all_domains(gnomesystemmm_t)
-domain_sigstop_all_domains(gnomesystemmm_t)
-
-files_read_etc_files(gnomesystemmm_t)
-files_read_usr_files(gnomesystemmm_t)
-
-fs_getattr_xattr_fs(gnomesystemmm_t)
-
-miscfiles_read_localization(gnomesystemmm_t)
-
-userdom_read_all_users_state(gnomesystemmm_t)
-userdom_dontaudit_search_admin_dir(gnomesystemmm_t)
-
-optional_policy(`
-       consolekit_dbus_chat(gnomesystemmm_t)
-')
-
-optional_policy(`
-       nscd_dontaudit_search_pid(gnomesystemmm_t)
-')
-
-optional_policy(`
-       policykit_dbus_chat(gnomesystemmm_t)
-       policykit_domtrans_auth(gnomesystemmm_t)
-       policykit_read_lib(gnomesystemmm_t)
-       policykit_read_reload(gnomesystemmm_t)
-')
-
-######################################
-#
-# gnome-keyring-daemon local policy
-#
-
-allow gkeyringd_domain self:capability ipc_lock;
-allow gkeyringd_domain self:process { getcap getsched setcap signal };
-allow gkeyringd_domain self:fifo_file rw_fifo_file_perms;
-allow gkeyringd_domain self:unix_stream_socket { connectto accept listen };
-
-userdom_user_home_dir_filetrans(gkeyringd_domain, gnome_home_t, dir)
-
-manage_dirs_pattern(gkeyringd_domain, gkeyringd_gnome_home_t, gkeyringd_gnome_home_t)
-manage_files_pattern(gkeyringd_domain, gkeyringd_gnome_home_t, gkeyringd_gnome_home_t)
-filetrans_pattern(gkeyringd_domain, gnome_home_t, gkeyringd_gnome_home_t, dir)
-
-manage_dirs_pattern(gkeyringd_domain, gkeyringd_tmp_t, gkeyringd_tmp_t)
-manage_sock_files_pattern(gkeyringd_domain, gkeyringd_tmp_t, gkeyringd_tmp_t)
-files_tmp_filetrans(gkeyringd_domain, gkeyringd_tmp_t, dir)
-
-kernel_read_system_state(gkeyringd_domain)
-kernel_read_crypto_sysctls(gkeyringd_domain)
-
-corecmd_search_bin(gkeyringd_domain)
-
-dev_read_rand(gkeyringd_domain)
-dev_read_urand(gkeyringd_domain)
-dev_read_sysfs(gkeyringd_domain)
-
-files_read_etc_files(gkeyringd_domain)
-files_read_usr_files(gkeyringd_domain)
-# for nscd?
-files_search_pids(gkeyringd_domain)
-
-fs_getattr_xattr_fs(gkeyringd_domain)
-fs_getattr_tmpfs(gkeyringd_domain)
-
-selinux_getattr_fs(gkeyringd_domain)
-
-logging_send_syslog_msg(gkeyringd_domain)
-
-miscfiles_read_localization(gkeyringd_domain)
-
-optional_policy(`
-       xserver_append_xdm_home_files(gkeyringd_domain)
-       xserver_read_xdm_home_files(gkeyringd_domain)
-       xserver_use_xdm_fds(gkeyringd_domain)
-')
-
-optional_policy(`
-       gnome_read_home_config(gkeyringd_domain)
-       gnome_read_generic_cache_files(gkeyringd_domain)
-       gnome_write_generic_cache_files(gkeyringd_domain)
-')
-
-optional_policy(`
-       ssh_read_user_home_files(gkeyringd_domain)
-')
-
-domain_use_interactive_fds(gnomedomain)
-
-userdom_use_inherited_user_terminals(gnomedomain)
-
index 9e7ad4b8f5acbf1911af2a0543b5234eb2dd31d8..ba69f86a1b66c907fee75fff70f95dbcc70adad7 100644 (file)
@@ -152,11 +152,6 @@ mta_write_config(gpg_t)
 
 userdom_home_manager(gpg_t)
 
-optional_policy(`
-       gnome_read_config(gpg_t)
-       gnome_stream_connect_gkeyringd(gpg_t)
-')
-
 optional_policy(`
        mta_read_spool(gpg_t)
 ')
@@ -346,21 +341,11 @@ userdom_use_user_terminals(gpg_pinentry_t)
 
 userdom_home_reader(gpg_pinentry_t)
 
-optional_policy(`
-       gnome_read_home_config(gpg_pinentry_t)
-')
-
 optional_policy(`
        dbus_session_bus_client(gpg_pinentry_t)
        dbus_system_bus_client(gpg_pinentry_t)
 ')
 
-optional_policy(`
-       gnome_write_generic_cache_files(gpg_pinentry_t)
-       gnome_read_generic_cache_files(gpg_pinentry_t)
-       gnome_read_gconf_home_files(gpg_pinentry_t)
-')
-
 optional_policy(`
        pulseaudio_exec(gpg_pinentry_t)
        pulseaudio_rw_home_files(gpg_pinentry_t)
index 320963bee4840efcf268a9f5e32b2e8ab3e9b8c0..64bd5daf4281f2d6b6b13dcb53aa02acbde43591 100644 (file)
@@ -237,10 +237,6 @@ optional_policy(`
        alsa_read_rw_config(mplayer_t)
 ')
 
-optional_policy(`
-       gnome_setattr_config_dirs(mplayer_t)
-')
-
 optional_policy(`
        pulseaudio_exec(mplayer_t)
        pulseaudio_stream_connect(mplayer_t)
index 48673c7971ac49337a66a01730624b8a03615c34..ba094177c78a627e3fc61db7ff5afc6eddfa09b8 100644 (file)
@@ -150,11 +150,6 @@ optional_policy(`
        ')
 ')
 
-optional_policy(`
-       gnome_read_gkeyringd_state(pulseaudio_t)
-       gnome_signull_gkeyringd(pulseaudio_t)
-')
-
 optional_policy(`
        rtkit_scheduled(pulseaudio_t)
 ')
index f5cb481aea4f0573a2636417891b8a34eecc5496..a3df5fe1cf76efbf25b638afe6ec154fffda914f 100644 (file)
@@ -286,10 +286,6 @@ optional_policy(`
        devicekit_dontaudit_dbus_chat_disk(sandbox_x_domain)
 ')
 
-optional_policy(`
-       gnome_read_gconf_config(sandbox_x_domain)
-')
-
 optional_policy(`
        nscd_dontaudit_search_pid(sandbox_x_domain)
 ')
index 8ce8577185ed65c9d32f5f5b7454cb8c896949ec..bd4bf16f67047875bc16259fdf3a649f514be4ba 100644 (file)
@@ -66,10 +66,6 @@ userdom_use_user_ptys(consolehelper_domain)
 userdom_use_user_ttys(consolehelper_domain)
 userdom_read_user_home_content_files(consolehelper_domain)
 
-optional_policy(`
-       gnome_read_gconf_home_files(consolehelper_domain)
-')
-
 optional_policy(`
        xserver_read_home_fonts(consolehelper_domain)
        xserver_stream_connect(consolehelper_domain)
index 7441b55882df5ab90910eef22e026311db4030ee..1c718356980259b87a5c2a5be507d29681471ebd 100644 (file)
@@ -230,7 +230,6 @@ ifdef(`distro_gentoo',`
 /usr/lib/tumbler-[^/]*/tumblerd        --      gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/security/pam_krb5/pam_krb5_storetmp -- gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/sftp-server           --      gen_context(system_u:object_r:bin_t,s0)
-/usr/lib/vte/gnome-pty-helper  --      gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/yaboot/addnote                --      gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/debug/bin(/.*)?       --      gen_context(system_u:object_r:bin_t,s0)
 /usr/lib/debug/sbin(/.*)?      --      gen_context(system_u:object_r:bin_t,s0)
index facd6a8f5c9cadd052c58085dbadf6719e266d48..8308597cf00f3715a990871d22b9a273410b8112 100644 (file)
@@ -226,10 +226,6 @@ optional_policy(`
        bootloader_filetrans_config(unconfined_domain_type)
 ')
 
-optional_policy(`
-       gnome_filetrans_admin_home_content(unconfined_domain_type)
-')
-
 optional_policy(`
        devicekit_filetrans_named_content(unconfined_domain_type)
 ')
index 88525351c4a663de2f7e5662bda19611da15221b..7183acd9358af9ec21c765d2be6340cab380404e 100644 (file)
@@ -313,10 +313,6 @@ optional_policy(`
        apache_filetrans_home_content(kernel_t)
 ')
 
-optional_policy(`
-       gnome_filetrans_home_content(kernel_t)
-')
-
 optional_policy(`
        kerberos_filetrans_home_content(kernel_t)
 ')
index 24a9df64e8a44c6127c83aa1ea96df3d3dfae583..9e0b520aad769d2ba548af119fd74f939f362e64 100644 (file)
@@ -82,10 +82,6 @@ optional_policy(`
        colord_dbus_chat(staff_t)
 ')
 
-optional_policy(`
-       gnome_role(staff_r, staff_t)
-')
-
 optional_policy(`
        irc_role(staff_r, staff_t)
 ')
index d6b4ce700cd5060f832b155e4db0658a82a21c00..a06ae86527079b7369435e283295cb80ad9f015b 100644 (file)
@@ -498,11 +498,6 @@ ifndef(`distro_redhat',`
                dbus_role_template(sysadm, sysadm_r, sysadm_t)
        ')
 
-       optional_policy(`
-               gnome_role(sysadm_r, sysadm_t)
-               gnome_filetrans_admin_home_content(sysadm_t)
-       ')
-
        optional_policy(`
                gpg_role(sysadm_r, sysadm_t)
        ')
index edb36f1da8a2d783d0d179c87deda189d9167b93..9b1ee919eb36164e172a93d6963e6a877504b0fa 100644 (file)
@@ -219,11 +219,6 @@ optional_policy(`
                fprintd_dbus_chat(unconfined_t)
        ')
 
-       optional_policy(`
-               gnome_dbus_chat_gconfdefault(unconfined_t)
-               gnome_command_domtrans_gkeyringd(unconfined_dbusd_t,unconfined_t)
-       ')
-
        optional_policy(`
                ipsec_mgmt_dbus_chat(unconfined_t)
        ')
index 15ab923f5a39e1bb5a4c6bb87e23ebf2a2516aac..93574cc102fa7c9dd1f032b4717519d9d1717214 100644 (file)
@@ -38,10 +38,6 @@ optional_policy(`
        colord_dbus_chat(user_t)
 ')
 
-optional_policy(`
-       gnome_role(user_r, user_t)
-')
-
 optional_policy(`
        irc_role(user_r, user_t)
 ')
index 6185b837d791ab7064f905645aac002a525c2782..014350ed06d09c6c362086c4a49ff4c50cbfeb59 100644 (file)
@@ -99,10 +99,6 @@ optional_policy(`
        apache_role(xguest_r, xguest_t)
 ')
 
-optional_policy(`
-       gnome_role(xguest_r, xguest_t)
-')
-
 optional_policy(`
        pcscd_read_pub_files(xguest_t)
        pcscd_stream_connect(xguest_t)
index 1328a63c6368f79de1482aedccbd315f525fc5e4..20349ec87ce32ce4be98ca6f08b8fc324832cd50 100644 (file)
@@ -206,10 +206,6 @@ optional_policy(`
        dnsmasq_systemctl(cobblerd_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(cobblerd_t)
-')
-
 optional_policy(`
        puppet_domtrans_puppetca(cobblerd_t)
 ')
index be3683b9849f86650953e35fadb168627d685e6c..1a9f22724c7ffb3196f42579472c58da0278b4e5 100644 (file)
@@ -112,12 +112,6 @@ optional_policy(`
        cups_dbus_chat(colord_t)
 ')
 
-optional_policy(`
-       gnome_read_home_icc_data_content(colord_t)
-       # Fixes lots of breakage in F16 on upgrade
-       gnome_read_generic_data_home_files(colord_t)
-')
-
 optional_policy(`
        policykit_dbus_chat(colord_t)
        policykit_domtrans_auth(colord_t)
index 3bc4cfd4e0147db708f1840efe389c01e2c82628..71463e330ead9b98b854cb99c4ab18a25065dfaa 100644 (file)
@@ -470,10 +470,6 @@ optional_policy(`
        ')
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(cupsd_config_t)
-')
-
 optional_policy(`
        hal_domtrans(cupsd_config_t)
        hal_read_tmp_files(cupsd_config_t)
@@ -627,10 +623,6 @@ optional_policy(`
 
 userdom_home_manager(cups_pdf_t)
 
-optional_policy(`
-       gnome_read_config(cups_pdf_t)
-')
-
 ########################################
 #
 # HPLIP local policy
index c9396dbfd3e94d93d9e5364d0ac19774a6dfde79..125e2ee5df7a89ac14e708b4feea335f57c2fac4 100644 (file)
@@ -149,11 +149,6 @@ optional_policy(`
        bind_domtrans(system_dbusd_t)
 ')
 
-optional_policy(`
-       gnome_exec_gconf(system_dbusd_t)
-       gnome_read_inherited_home_icc_data_files(system_dbusd_t)
-')
-
 optional_policy(`
        cpufreqselector_dbus_chat(system_dbusd_t)
 ')
@@ -303,10 +298,6 @@ userdom_manage_user_home_content_dirs(session_bus_type)
 userdom_manage_user_home_content_files(session_bus_type)
 userdom_user_home_dir_filetrans_user_home_content(session_bus_type, { dir file })
 
-optional_policy(`
-       gnome_read_gconf_home_files(session_bus_type)
-')
-
 optional_policy(`
        hal_dbus_chat(session_bus_type)
 ')
index b10da2c08941dca01909cb3ea5c619c5a0cf7564..49a6ea0f3db52d642e6ceb7f7bbc1c0cb9abb4ed 100644 (file)
@@ -75,7 +75,3 @@ sysnet_etc_filetrans_config(denyhosts_t)
 optional_policy(`
        cron_system_entry(denyhosts_t, denyhosts_exec_t)
 ')
-
-optional_policy(`
-       gnome_dontaudit_search_config(denyhosts_t)
-')
index f277ea622a907cf3910a73561787185dc21bbec1..af8253947c820e85abecd99806c780693925c33e 100644 (file)
@@ -305,10 +305,6 @@ optional_policy(`
        fstools_domtrans(devicekit_power_t)
 ')
 
-optional_policy(`
-       gnome_manage_home_config(devicekit_power_t)
-')
-
 optional_policy(`
        hal_domtrans_mac(devicekit_power_t)
        hal_manage_pid_dirs(devicekit_power_t)
index 47969fef4361c749b88c1174082ae2c1233e3a48..a0d949d9e946811b8c787533f41b4a5e524d218e 100644 (file)
@@ -169,10 +169,6 @@ optional_policy(`
        kerberos_keytab_template(dovecot, dovecot_t)
 ')
 
-optional_policy(`
-       gnome_manage_data(dovecot_t)
-')
-
 optional_policy(`
        postfix_manage_private_sockets(dovecot_t)
        postfix_search_spool(dovecot_t)
@@ -334,10 +330,6 @@ userdom_user_home_dir_filetrans_user_home_content(dovecot_deliver_t, { dir file
 
 userdom_home_manager(dovecot_deliver_t)
 
-optional_policy(`
-       gnome_manage_data(dovecot_deliver_t)
-')
-
 optional_policy(`
        mta_manage_spool(dovecot_deliver_t)
        mta_read_queue(dovecot_deliver_t)
index c7a0911bec6a867da98b0e8c72498fe83bc374a8..a9c294caa31ce16c085f5d33940322ee9589e0ac 100644 (file)
@@ -109,10 +109,6 @@ optional_policy(`
        ftp_read_log(fail2ban_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(fail2ban_t)
-')
-
 optional_policy(`
        iptables_domtrans(fail2ban_t)
 ')
index bd85b8f8829ae64ad5ed46c2f9a6e671b26f86ae..4eba8b761e95f9e519d6ae3f7f0e744fc8f46058 100644 (file)
@@ -280,10 +280,6 @@ optional_policy(`
        dmidecode_domtrans(hald_t)
 ')
 
-optional_policy(`
-       gnome_read_config(hald_t)
-')
-
 optional_policy(`
        gpm_dontaudit_getattr_gpmctl(hald_t)
 ')
index 0c0925ecd02a7dec06fdbaa8366a50ee097696e6..05fb8a2b2cb54fa4e532bb08720fe55f2c2ae884 100644 (file)
@@ -93,10 +93,6 @@ optional_policy(`
        courier_read_spool(mailman_mail_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(mailman_mail_t)
-')
-
 optional_policy(`
        cron_read_pipes(mailman_mail_t)
 ')
index be38b9dd84bb120e5a2d4e055d156cc5d9375ade..f19f6d2fd7aadab7810c0944c5cd70ca7517cff4 100644 (file)
@@ -246,10 +246,6 @@ optional_policy(`
        howl_signal(NetworkManager_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(NetworkManager_t)
-')
-
 optional_policy(`
        ipsec_domtrans_mgmt(NetworkManager_t)
        ipsec_kill_mgmt(NetworkManager_t)
index 1c69a1a98dbe162c8b85555e4e862349d4d899c6..66d047c9c3f3d0c53d27412f3ac4ca15cf677831 100644 (file)
@@ -122,10 +122,6 @@ optional_policy(`
        apache_exec(piranha_web_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(piranha_web_t)
-')
-
 optional_policy(`
        sasl_connect(piranha_web_t)
 ')
index c2771dd9e725026fa3c3a782fc719c6005803e0a..ce30ca50d61877a6e466627bf2fa970b81b32b2d 100644 (file)
@@ -118,10 +118,6 @@ optional_policy(`
        consolekit_read_pid_files(policykit_t)
 ')
 
-optional_policy(`
-       gnome_read_config(policykit_t)
-')
-
 ########################################
 #
 # polkit_auth local policy
index 999b986385fd5a0c65226c04b5abbfacbf7854bd..4c188f9990259e4a98ae3eacc13023a55dd80716 100644 (file)
@@ -117,10 +117,6 @@ optional_policy(`
        clamav_search_lib(procmail_t)
 ')
 
-optional_policy(`
-       gnome_manage_data(procmail_t)
-')
-
 optional_policy(`
        munin_dontaudit_search_lib(procmail_t)
 ')
index a181f019e3cbe720193b43413a6422ddc13be0d6..53e4a57fb288261306fa1e362df1c784ce27fdef 100644 (file)
@@ -190,10 +190,6 @@ miscfiles_read_localization(setroubleshoot_fixit_t)
 userdom_dontaudit_search_admin_dir(setroubleshoot_fixit_t)
 userdom_signull_unpriv_users(setroubleshoot_fixit_t)
 
-optional_policy(`
-       gnome_dontaudit_search_config(setroubleshoot_fixit_t)
-')
-
 optional_policy(`
        rpm_signull(setroubleshoot_fixit_t)
        rpm_read_db(setroubleshoot_fixit_t)
index aadaa2cb0b2f164ef873a1f80fae6aed00dfe53c..d3b746c916248a072ca4158578a47583d85e8b52 100644 (file)
@@ -212,10 +212,6 @@ tunable_policy(`user_tcp_server',`
        corenet_tcp_bind_generic_node(ssh_t)
 ')
 
-optional_policy(`
-       gnome_stream_connect_all_gkeyringd(ssh_t)
-')
-
 optional_policy(`
        xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t)
        xserver_domtrans_xauth(ssh_t)
index 1aebd234586693c613749c95e0121a338ea7af3d..bbb59f2a405902f24491b010ae5021de0766ca9a 100644 (file)
@@ -59,10 +59,6 @@ optional_policy(`
        fstools_domtrans(tuned_t)
 ')
 
-optional_policy(`
-       gnome_dontaudit_search_config(tuned_t)
-')
-
 # to allow network interface tuning
 optional_policy(`
        sysnet_domtrans_ifconfig(tuned_t)
index 351ed06236e6a83c0a960c43c1f96fbbae7b3990..b35ff341ba30b9139dbf4c778605825156ab9b6e 100644 (file)
@@ -132,10 +132,6 @@ interface(`xserver_restricted_role',`
        tunable_policy(`user_direct_dri',`
                dev_rw_dri($2)
        ')
-
-       optional_policy(`
-               gnome_read_gconf_config($2)
-       ')
 ')
 
 ########################################
index 2bf72ddec9d4e3d88a21f3eac5080c7c66c0c562..3f981bbb92900a9a451ae5e53ba5b68bd36f268b 100644 (file)
@@ -765,17 +765,6 @@ optional_policy(`
        gpm_setattr_gpmctl(xdm_t)
 ')
 
-optional_policy(`
-       gnome_exec_keyringd(xdm_t)
-       gnome_manage_config(xdm_t)
-       gnome_manage_gconf_home_files(xdm_t)
-       gnome_filetrans_home_content(xdm_t)
-       gnome_read_config(xdm_t)
-       gnome_read_usr_config(xdm_t)
-       gnome_read_gconf_config(xdm_t)
-       gnome_transition_gkeyringd(xdm_t)
-')
-
 optional_policy(`
        hostname_exec(xdm_t)
 ')
index 8146289dc501b673e86d286b94baed4dc89b8438..c9a13efba06297c43cbce454cbd19b0331fae050 100644 (file)
@@ -780,10 +780,6 @@ ifdef(`distro_redhat',`
                dirsrv_manage_var_run(initrc_t)
        ')
 
-       optional_policy(`
-               gnome_manage_gconf_config(initrc_t)
-       ')
-
        optional_policy(`
                ldap_read_db_files(initrc_t)
        ')
index eae94270cf5ebc87ca901fc88b3f609b856afc69..48c21c3aac7999489f315d3300ca9307ad500dce 100644 (file)
@@ -141,10 +141,6 @@ optional_policy(`
        apt_use_ptys(ldconfig_t)
 ')
 
-optional_policy(`
-       gnome_append_generic_cache_files(ldconfig_t)
-')
-
 optional_policy(`
        puppet_rw_tmp(ldconfig_t)
 ')
index 0d3e625da6812331262a6863ac4a938daa3baeae..7b95654fb4b2f365a84063a85b550d615272c5a2 100644 (file)
@@ -4,7 +4,6 @@
 /bin/systemd-tmpfiles                          --              gen_context(system_u:object_r:systemd_tmpfiles_exec_t,s0)
 
 /usr/bin/systemctl                             --      gen_context(system_u:object_r:systemd_systemctl_exec_t,s0)
-/usr/bin/systemd-gnome-ask-password-agent      --              gen_context(system_u:object_r:systemd_passwd_agent_exec_t,s0)
 /usr/bin/systemd-notify                                --              gen_context(system_u:object_r:systemd_notify_exec_t,s0)
 /usr/bin/systemd-tmpfiles                      --              gen_context(system_u:object_r:systemd_tmpfiles_exec_t,s0)
 /usr/bin/systemd-tty-ask-password-agent                --              gen_context(system_u:object_r:systemd_passwd_agent_exec_t,s0)
index 9e0812572e7a94fec67f3eedba4b72f3ecd46bb9..67355e82648f0c7725bbde1b7728e6525c922647 100644 (file)
@@ -129,12 +129,6 @@ optional_policy(`
        cron_read_state_crond(systemd_logind_t)
 ')
 
-optional_policy(`
-       # we label /run/user/$USER/dconf as config_home_t
-       gnome_manage_home_config_dirs(systemd_logind_t)
-       gnome_manage_home_config(systemd_logind_t)
-')
-
 optional_policy(`
        # It links /run/user/$USER/X11/display to /tmp/.X11-unix/X* sock_file
        xserver_search_xdm_tmp_dirs(systemd_logind_t)
@@ -281,13 +275,6 @@ optional_policy(`
     auth_rw_login_records(systemd_tmpfiles_t)
 ')
 
-optional_policy(`
-       # we have /run/user/$USER/dconf 
-       gnome_delete_home_config(systemd_tmpfiles_t)
-       gnome_delete_home_config_dirs(systemd_tmpfiles_t)
-       gnome_setattr_home_config_dirs(systemd_tmpfiles_t)
-')
-
 optional_policy(`
        rpm_read_db(systemd_tmpfiles_t)
        rpm_delete_db(systemd_tmpfiles_t)
index 6a93c644be3ff2e394a5d0784a0ea2c5b1901834..8654d1ef808f7f9b88f0ba746d43dcf4f532abcb 100644 (file)
@@ -262,10 +262,6 @@ optional_policy(`
        devicekit_domtrans_disk(udev_t)
 ')
 
-optional_policy(`
-       gnome_read_home_config(udev_t)
-')
-
 optional_policy(`
        gpsd_domtrans(udev_t)
 ')
index 1523a5111a56e054b624add073359c9ba9aa7217..0e662c89a2a29650d9bc132684972427dc15a1f5 100644 (file)
@@ -719,10 +719,6 @@ template(`userdom_common_user_template',`
                        devicekit_dbus_chat_disk($1_usertype)
                ')
 
-               optional_policy(`
-                       gnome_dbus_chat_gconfdefault($1_usertype)
-               ')
-
                optional_policy(`
                        hal_dbus_chat($1_usertype)
                ')
@@ -1084,13 +1080,6 @@ template(`userdom_restricted_xwindows_user_template',`
                alsa_read_rw_config($1_usertype)
        ')
 
-        # cjp: needed by KDE apps
-        # bug: #682499
-        optional_policy(`
-               gnome_read_usr_config($1_usertype)
-               gnome_role_gkeyringd($1, $1_r, $1_usertype)
-       ')
-
        optional_policy(`
                dbus_role_template($1, $1_r, $1_usertype)
                dbus_system_bus_client($1_usertype)
@@ -5067,11 +5056,6 @@ interface(`userdom_filetrans_home_content',`
        userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".cert")
        userdom_user_home_dir_filetrans($1, home_cert_t, dir, ".pki")
        userdom_user_home_dir_filetrans($1, home_cert_t, dir, "certificates")
-       gnome_config_filetrans($1, home_cert_t, dir, "certificates")
-
-       #optional_policy(`
-       #       gnome_admin_home_gconf_filetrans($1, home_bin_t, dir, "bin")
-       #')
 ')
 
 ########################################
index 63f769a5e8c019817dec03115e9f7ba20a3040f3..34536f313eb8a6fcbbeea7c7da945a954cf46cc4 100644 (file)
@@ -160,10 +160,6 @@ optional_policy(`
        alsa_relabel_home_files(unpriv_userdomain)
 ')
 
-optional_policy(`
-       gnome_filetrans_home_content(userdomain)
-')
-
 optional_policy(`
        ssh_filetrans_home_content(userdomain)
 ')