Changeset 2821

Show
Ignore:
Timestamp:
09/26/08 08:29:57 (2 months ago)
Author:
cpebenito
Message:

rbacsep: clean up role statements.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/rbacsep/policy/modules/apps/ethereal.if

    r2782 r2821  
    2323        ') 
    2424 
    25         role $1 types { ethereal_t ethereal_home_t ethereal_tmp_t ethereal_tmpfs_t }
     25        role $1 types ethereal_t
    2626 
    2727        domain_auto_trans($2, ethereal_exec_t, ethereal_t) 
  • branches/rbacsep/policy/modules/apps/evolution.if

    r2756 r2821  
    3232        ') 
    3333 
    34         role $1 types { evolution_t evolution_tmpfs_t evolution_home_t }; 
    35         role $1 types { evolution_orbit_tmp_t evolution_alarm_t }; 
    36         role $1 types { evolution_alarm_tmpfs_t evolution_alarm_orbit_tmp_t }; 
    37         role $1 types { evolution_exchange_t evolution_exchange_tmpfs_t }; 
    38         role $1 types { evolution_exchange_tmp_t evolution_exchange_orbit_tmp_t }; 
    39         role $1 types { evolution_server_t evolution_server_orbit_tmp_t }; 
    40         role $1 types { evolution_webcal_t evolution_webcal_tmpfs_t }; 
     34        role $1 types { evolution_t evolution_alarm_t evolution_exchange_t }; 
     35        role $1 types { evolution_server_t evolution_webcal_t }; 
    4136 
    4237        domtrans_pattern($2, evolution_exec_t, evolution_t) 
  • branches/rbacsep/policy/modules/apps/games.if

    r2726 r2821  
    2323        ') 
    2424 
    25         role $1 types { games_t games_devpts_t games_tmpfs_t games_tmp_t }
     25        role $1 types games_t
    2626 
    2727        domtrans_pattern($2, games_exec_t, games_t) 
  • branches/rbacsep/policy/modules/apps/gift.if

    r2726 r2821  
    2323        ') 
    2424 
    25         role $1 types { gift_t giftd_t gift_home_t gift_tmpfs_t }; 
     25        role $1 types { gift_t giftd_t }; 
    2626 
    2727        # transition from user domain 
  • branches/rbacsep/policy/modules/apps/gnome.if

    r2726 r2821  
    2323        ') 
    2424 
    25         role $1 types { gconfd_t gconf_home_t gconf_tmp_t gnome_home_t }
     25        role $1 types gconfd_t
    2626 
    2727        domain_auto_trans($2, gconfd_exec_t, gconfd_t) 
  • branches/rbacsep/policy/modules/apps/gpg.if

    r2726 r2821  
    2424        ') 
    2525 
    26         role $1 types { gpg_t gpg_agent_t gpg_agent_tmp_t }; 
    27         role $1 types { gpg_secret_t gpg_helper_t gpg_pinentry_t }; 
     26        role $1 types { gpg_t gpg_agent_t gpg_helper_t gpg_pinentry_t }; 
    2827 
    2928        # transition from the userdomain to the derived domain 
  • branches/rbacsep/policy/modules/apps/irc.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { irc_t irc_home_t irc_tmp_t }
     24        role $1 types irc_t
    2525 
    2626        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/apps/java.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { java_t java_tmp_t java_tmpfs_t }
     24        role $1 types java_t
    2525 
    2626        # The user role is authorized for this domain. 
  • branches/rbacsep/policy/modules/apps/lockdev.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { lockdev_t lockdev_lock_t }
     24        role $1 types lockdev_t
    2525 
    2626        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/apps/mozilla.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { mozilla_t mozilla_home_t mozilla_tmpfs_t }
     24        role $1 types mozilla_t
    2525 
    2626        domain_auto_trans($2, mozilla_exec_t, mozilla_t) 
  • branches/rbacsep/policy/modules/apps/mplayer.if

    r2726 r2821  
    2323        ') 
    2424 
    25         role $1 types { mencoder_t mplayer_t mplayer_home_t mplayer_tmpfs_t }; 
     25        role $1 types { mencoder_t mplayer_t }; 
    2626 
    2727        # domain transition 
  • branches/rbacsep/policy/modules/apps/rssh.if

    r2790 r2821  
    2222        ') 
    2323 
    24         role $1 types { rssh_t rssh_devpts_t rssh_ro_t rssh_rw_t }
     24        role $1 types rssh_t
    2525 
    2626        # allow ps to show irc 
  • branches/rbacsep/policy/modules/apps/thunderbird.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { thunderbird_t thunderbird_home_t thunderbird_tmpfs_t }
     24        role $1 types thunderbird_t
    2525 
    2626        domain_auto_trans($2, thunderbird_exec_t, thunderbird_t) 
  • branches/rbacsep/policy/modules/apps/tvtime.if

    r2726 r2821  
    2222        ') 
    2323 
    24         role $1 types { tvtime_t tvtime_home_t tvtime_tmpfs_t }
     24        role $1 types tvtime_t
    2525 
    2626        # Type transition 
  • branches/rbacsep/policy/modules/apps/uml.if

    r2782 r2821  
    2323        ') 
    2424 
    25         role $1 types { uml_t uml_devpts_t uml_ro_t uml_rw_t uml_tmp_t uml_tmpfs_t }
     25        role $1 types uml_t
    2626 
    2727        # Transition from the user domain to this domain. 
  • branches/rbacsep/policy/modules/apps/vmware.if

    r2745 r2821  
    2424        ') 
    2525 
    26         role $1 types { vmware_t vmware_conf_t vmware_file_t vmware_var_run_t }; 
    27         role $1 types { vmware_tmp_t vmware_tmpfs_t }; 
     26        role $1 types vmware_t; 
    2827 
    2928        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/apps/wireshark.if

    r2726 r2821  
    2323        ') 
    2424 
    25         role $1 types { wireshark_t wireshark_home_t wireshark_tmp_t wireshark_tmpfs_t }
     25        role $1 types wireshark_t
    2626 
    2727        domain_auto_trans($2, wireshark_exec_t, wireshark_t) 
  • branches/rbacsep/policy/modules/services/apache.if

    r2782 r2821  
    265265        ') 
    266266 
    267         role $1 types { httpd_user_content_t httpd_user_htaccess_t }; 
    268         role $1 types { httpd_user_script_t httpd_user_script_exec_t }; 
    269         role $1 types { httpd_user_script_ra_t httpd_user_script_ro_t }; 
    270         role $1 types httpd_user_script_rw_t; 
     267        role $1 types httpd_user_script_t; 
    271268 
    272269        allow $2 httpd_user_content_t:{ dir file lnk_file } { relabelto relabelfrom }; 
  • branches/rbacsep/policy/modules/services/bluetooth.if

    r2782 r2821  
    2323 
    2424        role $1 types bluetooth_helper_t; 
    25         role $1 types { bluetooth_helper_tmp_t bluetooth_helper_tmpfs_t }; 
    2625 
    2726        domtrans_pattern($2, bluetooth_helper_exec_t, bluetooth_helper_t) 
  • branches/rbacsep/policy/modules/services/cron.if

    r2759 r2821  
    105105        ') 
    106106 
    107         role $1 types { cronjob_t crontab_t crontab_tmp_t }; 
     107        role $1 types { cronjob_t crontab_t }; 
    108108 
    109109        # cronjob shows up in user ps 
     
    150150        ') 
    151151 
    152         role $1 types { unconfined_cronjob_t crontab_t crontab_tmp_t }; 
     152        role $1 types { unconfined_cronjob_t crontab_t }; 
    153153 
    154154        # cronjob shows up in user ps 
  • branches/rbacsep/policy/modules/services/lpd.if

    r2782 r2821  
    5151        ') 
    5252 
    53         role $1 types { lpr_t lpr_tmp_t print_spool_t }
     53        role $1 types lpr_t
    5454 
    5555        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/services/pyzor.if

    r2782 r2821  
    2222        ') 
    2323 
    24         role $1 types { pyzor_t pyzor_home_t pyzor_var_lib_t pyzor_tmp_t }
     24        role $1 types pyzor_t
    2525 
    2626        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/services/razor.if

    r2782 r2821  
    128128        ') 
    129129 
    130         role $1 types { razor_t razor_home_t razor_tmp_t }
     130        role $1 types razor_t
    131131 
    132132        # Transition from the user domain to the derived domain. 
  • branches/rbacsep/policy/modules/services/spamassassin.if

    r2782 r2821  
    2323        ') 
    2424 
    25         role $1 types { spamc_t spamc_tmp_t spamassassin_t }; 
    26         role $1 types { spamassassin_home_t spamassassin_tmp_t }; 
     25        role $1 types { spamc_t spamassassin_t }; 
    2726 
    2827        domtrans_pattern($2, spamassassin_exec_t, spamassassin_t) 
  • branches/rbacsep/policy/modules/services/xserver.if

    r2820 r2821  
    2626                class x_synthetic_event all_x_synthetic_event_perms; 
    2727        ') 
     28 
     29        role $1 types { xserver_t xauth_t iceauth_t }; 
    2830 
    2931        domtrans_pattern($2, xserver_exec_t, xserver_t)