[selinux-policy: 1781/3172] trunk: several support macro fixes.

[Daniel J Walsh]

commit c040ea12b2b5d6259584ee9ae7e094fb41176fa5
Author: Chris PeBenito <cpebenito at tresys.com>
Date:   Tue Jul 31 15:11:22 2007 +0000

    trunk: several support macro fixes.

 policy/support/file_patterns.spt |   18 +++++++++---------
 policy/support/misc_patterns.spt |    2 +-
 policy/support/obj_perm_sets.spt |    4 +++-
 3 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/policy/support/file_patterns.spt b/policy/support/file_patterns.spt
index 77eefa8..9f4a291 100644
--- a/policy/support/file_patterns.spt
+++ b/policy/support/file_patterns.spt
@@ -310,47 +310,47 @@ define(`relabel_fifo_files_pattern',`
 #
 define(`getattr_sock_files_pattern',`
 	allow $1 $2:dir search_dir_perms;
-	allow $1 $3:sock_file getattr_fifo_file_perms;
+	allow $1 $3:sock_file getattr_sock_file_perms;
 ')
 
 define(`setattr_sock_files_pattern',`
 	allow $1 $2:dir search_dir_perms;
-	allow $1 $3:sock_file setattr_fifo_file_perms;
+	allow $1 $3:sock_file setattr_sock_file_perms;
 ')
 
 define(`read_sock_files_pattern',`
 	allow $1 $2:dir search_dir_perms;
-	allow $1 $3:sock_file read_fifo_file_perms;
+	allow $1 $3:sock_file read_sock_file_perms;
 ')
 
 define(`write_sock_files_pattern',`
 	allow $1 $2:dir search_dir_perms;
-	allow $1 $3:sock_file write_fifo_file_perms;
+	allow $1 $3:sock_file write_sock_file_perms;
 ')
 
 define(`rw_sock_files_pattern',`
 	allow $1 $2:dir search_dir_perms;
-	allow $1 $3:sock_file rw_fifo_file_perms;
+	allow $1 $3:sock_file rw_sock_file_perms;
 ')
 
 define(`create_sock_files_pattern',`
 	allow $1 $2:dir add_entry_dir_perms;
-	allow $1 $3:sock_file create_fifo_file_perms;
+	allow $1 $3:sock_file create_sock_file_perms;
 ')
 
 define(`delete_sock_files_pattern',`
 	allow $1 $2:dir del_entry_dir_perms;
-	allow $1 $3:sock_file delete_fifo_file_perms;
+	allow $1 $3:sock_file delete_sock_file_perms;
 ')
 
 define(`rename_sock_files_pattern',`
 	allow $1 $2:dir rw_dir_perms;
-	allow $1 $3:sock_file rename_fifo_file_perms;
+	allow $1 $3:sock_file rename_sock_file_perms;
 ')
 
 define(`manage_sock_files_pattern',`
 	allow $1 $2:dir rw_dir_perms;
-	allow $1 $3:sock_file manage_fifo_file_perms;
+	allow $1 $3:sock_file manage_sock_file_perms;
 ')
 
 define(`relabelfrom_sock_files_pattern',`
diff --git a/policy/support/misc_patterns.spt b/policy/support/misc_patterns.spt
index 06110b6..ca7aa43 100644
--- a/policy/support/misc_patterns.spt
+++ b/policy/support/misc_patterns.spt
@@ -15,7 +15,7 @@ define(`spec_domtrans_pattern',`
 	domain_transition_pattern($1,$2,$3)
 
 	allow $3 $1:fd use;
-	allow $3 $1:fifo_file rw_file_perms;
+	allow $3 $1:fifo_file rw_fifo_file_perms;
 	allow $3 $1:process sigchld;
 ')
 
diff --git a/policy/support/obj_perm_sets.spt b/policy/support/obj_perm_sets.spt
index 1c4830c..5d5321b 100644
--- a/policy/support/obj_perm_sets.spt
+++ b/policy/support/obj_perm_sets.spt
@@ -255,6 +255,7 @@ define(`append_fifo_file_perms',`{ getattr append lock ioctl }')
 define(`write_fifo_file_perms',`{ getattr write append lock ioctl }')
 define(`rw_fifo_file_perms',`{ getattr read write append ioctl lock }')
 define(`create_fifo_file_perms',`{ getattr create }')
+define(`rename_fifo_file_perms',`{ getattr rename }')
 define(`delete_fifo_file_perms',`{ getattr unlink }')
 define(`manage_fifo_file_perms',`{ create getattr setattr read write append rename link unlink ioctl lock }')
 define(`relabelfrom_fifo_file_perms',`{ getattr relabelfrom }')
@@ -270,8 +271,9 @@ define(`read_sock_file_perms',`{ getattr read }')
 define(`write_sock_file_perms',`{ getattr write append }')
 define(`rw_sock_file_perms',`{ getattr read write append }')
 define(`create_sock_file_perms',`{ getattr create }')
+define(`rename_sock_file_perms',`{ getattr rename }')
 define(`delete_sock_file_perms',`{ getattr unlink }')
-define(`manage_sock_file_perms',`{ create getattr setattr read write rename link unlink ioctl lock }')
+define(`manage_sock_file_perms',`{ create getattr setattr read write rename link unlink ioctl lock append }')
 define(`relabelfrom_sock_file_perms',`{ getattr relabelfrom }')
 define(`relabelto_sock_file_perms',`{ getattr relabelto }')
 define(`relabel_sock_file_perms',`{ getattr relabelfrom relabelto }')