From 114fc45d2b01c8b57171b5a50fa617f5f5baebc0 Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: Thu, 29 Sep 2005 21:00:06 +0000
Subject: [PATCH] misc fixes

---
 docs/macro_conversion_guide | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/docs/macro_conversion_guide b/docs/macro_conversion_guide
index 8248da426..dd8fcffe2 100644
--- a/docs/macro_conversion_guide
+++ b/docs/macro_conversion_guide
@@ -135,12 +135,16 @@ domain_wide_inherit_fd($1)
 #
 # privlog: complete
 #
-logging_send_syslog_msg($1)
+optional_policy(`logging.te',`
+	logging_send_syslog_msg($1)
+')
 
 #
 # privmail: complete
 #
-mta_send_mail($1)
+optional_policy(`mta.te',`
+	mta_send_mail($1)
+')
 
 #
 # privmem: complete
@@ -172,6 +176,11 @@ domain_subj_id_change_exempt($1)
 #
 domain_system_change_exempt($1)
 
+#
+# secure_file_type: complete
+#
+files_security_file($1)
+
 #
 # sysadmfile: complete
 #
@@ -968,7 +977,7 @@ allow $1 $2:lnk_file { getattr read };
 #
 # system_crond_entry():
 #
-optional_policy(`crond.te', `
+optional_policy(`cron.te', `
 	cron_system_entry($2,$1)
 ')
 
@@ -1012,7 +1021,7 @@ allow $1_t $1_tmpfs_t:file { create ioctl read getattr lock write setattr append
 allow $1_t $1_tmpfs_t:lnk_file { create read getattr setattr link unlink rename };
 allow $1_t $1_tmpfs_t:sock_file { create ioctl read getattr lock write setattr append link unlink rename };
 allow $1_t $1_tmpfs_t:fifo_file { create ioctl read getattr lock write setattr append link unlink rename };
-filesystem_create_private_tmpfs_data($1_t,$1_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
+fs_create_tmpfs($1_t,$1_tmpfs_t,{ dir file lnk_file sock_file fifo_file })
 
 #
 # unconfined_domain(): complete
@@ -1044,7 +1053,6 @@ allow authbind_t $1:{ tcp_socket udp_socket } rw_socket_perms;
 #
 # uses_shlib(): complete
 #
-files_list_usr($1)
 libs_use_ld_so($1)
 libs_use_shared_libs($1)