lmtp and smtp are the same file require same context of setfiles complains

postfix_pickup_t wants to read postfix_spool_maildrop_t dir

diff --git a/Changelog b/Changelog
index 90fed4b42749504df10f565acbe4607d55a3cb1d..c92f63ef205a4276e83f0b82850a14d416764803 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,4 @@
+- Patch for postfix lmtp labeling and pickup rule fix from Dan Walsh.
 - Patch for kerberized telnet fixes from Dan Walsh.
 - Patch for kerberized ftp and other ftp fixes from Dan Walsh.
 - Patch for an additional wine executable from Dan Walsh.

diff --git a/policy/modules/services/postfix.fc b/policy/modules/services/postfix.fc
index 3ca65e402f0c1587a22463df99ab71b713e6219d..9a5855082646d3353f76c7e30bc02d00b8878d1f 100644 (file)
--- a/policy/modules/services/postfix.fc
+++ b/policy/modules/services/postfix.fc
@@ -3,6 +3,7 @@
 ifdef(`distro_redhat', `
 /usr/libexec/postfix/.*        --      gen_context(system_u:object_r:postfix_exec_t,s0)
 /usr/libexec/postfix/cleanup --        gen_context(system_u:object_r:postfix_cleanup_exec_t,s0)
+/usr/libexec/postfix/lmtp --   gen_context(system_u:object_r:postfix_smtp_exec_t,s0)
 /usr/libexec/postfix/local --  gen_context(system_u:object_r:postfix_local_exec_t,s0)
 /usr/libexec/postfix/master -- gen_context(system_u:object_r:postfix_master_exec_t,s0)
 /usr/libexec/postfix/pickup -- gen_context(system_u:object_r:postfix_pickup_exec_t,s0)

diff --git a/policy/modules/services/postfix.te b/policy/modules/services/postfix.te
index 50754ddfd0e10d95bdcbf625bab41a858134b64d..8816ee268a8b6d0d4387f6f45d794ff26772c9e7 100644 (file)
--- a/policy/modules/services/postfix.te
+++ b/policy/modules/services/postfix.te
@@ -1,5 +1,5 @@
 
-policy_module(postfix,1.4.0)
+policy_module(postfix,1.4.1)
 
 ########################################
 #
@@ -386,6 +386,7 @@ rw_sock_files_pattern(postfix_pickup_t,postfix_public_t,postfix_public_t)
 
 postfix_list_spool(postfix_pickup_t)
 
+allow postfix_pickup_t postfix_spool_maildrop_t:dir list_dir_perms;
 read_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t)
 delete_files_pattern(postfix_pickup_t,postfix_spool_maildrop_t,postfix_spool_maildrop_t)