From 76febd21465aeba7e4097c48affbe27fdb53c009 Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 7 Nov 2005 21:13:07 +0000 Subject: [PATCH] fix sendmail transition --- refpolicy/policy/modules/services/mta.if | 18 ------------------ refpolicy/policy/modules/services/sendmail.te | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/refpolicy/policy/modules/services/mta.if b/refpolicy/policy/modules/services/mta.if index c0ab5aef2..f797e1661 100644 --- a/refpolicy/policy/modules/services/mta.if +++ b/refpolicy/policy/modules/services/mta.if @@ -230,24 +230,6 @@ interface(`mta_sendmail_mailserver',` typeattribute $1 mailserver_domain; ') -####################################### -## -## Allow the specified domain to use -## the sendmail program as an entrypoint. -## -## -## Domain allowed access. -## -# -# cjp: added for targeted sendmail (unconfined) -interface(`mta_sendmail_entry',` - gen_require(` - type sendmail_exec_t; - ') - - domain_entry_file($1,sendmail_exec_t) -') - ####################################### ## ## Make a type a mailserver type used diff --git a/refpolicy/policy/modules/services/sendmail.te b/refpolicy/policy/modules/services/sendmail.te index 8122a195f..33bc8bd8d 100644 --- a/refpolicy/policy/modules/services/sendmail.te +++ b/refpolicy/policy/modules/services/sendmail.te @@ -17,7 +17,7 @@ files_pid_file(sendmail_var_run_t) ifdef(`targeted_policy',` unconfined_alias_domain(sendmail_t) - mta_sendmail_entry(sendmail_t) + mta_sendmail_mailserver(sendmail_t) ',` type sendmail_t; mta_sendmail_mailserver(sendmail_t)