From 70abf87502b764558cc92b53beb2b5b6054bb8cb Mon Sep 17 00:00:00 2001
From: Chris PeBenito <cpebenito@tresys.com>
Date: May 12 2005 14:49:46 +0000
Subject: finish lock_domain, fix file_type_auto_trans



---

diff --git a/docs/macro_conversion_guide b/docs/macro_conversion_guide
index 7a08215..69272c5 100644
--- a/docs/macro_conversion_guide
+++ b/docs/macro_conversion_guide
@@ -794,14 +794,6 @@ type_transition $1 $2:dir $3;
 type_transition $1 $2:{ file lnk_file sock_file fifo_file } $3;
 
 #
-# file_type_auto_trans($1,$2,$3,$4):
-#
-# for each i in $4
-allow $1 $2:dir { read getattr lock search ioctl add_name remove_name write };
-can_create_internal($1,$2,$4)
-type_transition $1 $2:$4 $3;
-
-#
 # file_type_auto_trans($1,$2,$3):
 #
 allow $1 $3:dir { read getattr lock search ioctl add_name remove_name write };
@@ -814,9 +806,9 @@ type_transition $1 $2:{ dir file lnk_file sock_file fifo_file } $3;
 #
 # file_type_auto_trans($1,$2,$3,$4):
 #
-# for each i in $4
 allow $1 $2:dir { read getattr lock search ioctl add_name remove_name write };
-can_create_internal($1,$2,$3,$4)
+# for each i in $4:
+can_create_internal($1,$3,$i)
 type_transition $1 $2:$i $3;
 
 #
@@ -909,10 +901,12 @@ libraries_legacy_read_shared_libraries($1_t)
 libraries_legacy_use_dynamic_loader($1_t)
 
 #
-# lock_domain():
+# lock_domain(): complete
 #
-type $1_lock_t, file_type, sysadmfile, lockfile;
-file_type_auto_trans($1_t, var_lock_t, $1_lock_t, file)
+type $1_lock_t;
+files_make_lock_file($1_lock_t)
+allow $1_t $1_lock_t:file { create ioctl read getattr lock write setattr append link unlink rename };
+files_create_private_lock_file($1_t,$1_lock_t)
 
 #
 # log_domain(): complete