Rearrange gpg agent calls.
This commit is contained in:
parent
4ef4e0674d
commit
7e71b34b09
|
@ -422,17 +422,17 @@ template(`ssh_role_template',`
|
|||
nis_use_ypbind($1_ssh_agent_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
xserver_use_xdm_fds($1_ssh_agent_t)
|
||||
xserver_rw_xdm_pipes($1_ssh_agent_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
tunable_policy(`ssh_use_gpg_agent',`
|
||||
# for ssh-add
|
||||
gpg_stream_connect_agent($3)
|
||||
')
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
xserver_use_xdm_fds($1_ssh_agent_t)
|
||||
xserver_rw_xdm_pipes($1_ssh_agent_t)
|
||||
')
|
||||
')
|
||||
|
||||
########################################
|
||||
|
|
|
@ -204,17 +204,17 @@ tunable_policy(`user_tcp_server',`
|
|||
corenet_tcp_bind_generic_node(ssh_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t)
|
||||
xserver_domtrans_xauth(ssh_t)
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
tunable_policy(`ssh_use_gpg_agent',`
|
||||
gpg_stream_connect_agent(ssh_t)
|
||||
')
|
||||
')
|
||||
|
||||
optional_policy(`
|
||||
xserver_user_x_domain_template(ssh, ssh_t, ssh_tmpfs_t)
|
||||
xserver_domtrans_xauth(ssh_t)
|
||||
')
|
||||
|
||||
##############################
|
||||
#
|
||||
# ssh_keysign_t local policy
|
||||
|
|
Loading…
Reference in New Issue