Changed all interfaces that used auth_file_type to call the new
corresponding interface in files.if.
Signed-off-by: James Carter <[email protected]>
---
policy/modules/system/authlogin.if | 74 ++++++++++++-----------------------
1 files changed, 26 insertions(+), 48 deletions(-)
diff --git a/policy/modules/system/authlogin.if b/policy/modules/system/authlogin.if
index d51181f..6ce867a 100644
--- a/policy/modules/system/authlogin.if
+++ b/policy/modules/system/authlogin.if
@@ -201,12 +201,8 @@ interface(`auth_login_entry_type',`
## <infoflow type="none"/>
#
interface(`auth_file',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_security_file($1)
- typeattribute $1 auth_file_type;
+ refpolicywarn(`$0($*) has been deprecated, use files_auth_file() instead.')
+ files_auth_file($1)
')
########################################
@@ -1201,11 +1197,8 @@ interface(`auth_delete_pam_console_data',`
## </param>
#
interface(`auth_read_all_dirs_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_read_all_dirs_except($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_list_non_auth_dirs() instead.')
+ files_list_non_auth_dirs($1)
')
########################################
@@ -1226,8 +1219,8 @@ interface(`auth_read_all_dirs_except_auth_files',`
## </param>
#
interface(`auth_read_all_dirs_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_read_all_dirs_except_auth_files() instead.')
- auth_read_all_dirs_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_list_non_auth_dirs() instead.')
+ files_list_non_auth_dirs($1)
')
########################################
@@ -1249,11 +1242,8 @@ interface(`auth_read_all_dirs_except_shadow',`
## <rolecap/>
#
interface(`auth_read_all_files_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_read_all_files_except($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_read_non_auth_files() instead.')
+ files_read_non_auth_files($1)
')
########################################
@@ -1275,8 +1265,8 @@ interface(`auth_read_all_files_except_auth_files',`
## <rolecap/>
#
interface(`auth_read_all_files_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_read_all_files_except_auth_files() instead.')
- auth_read_all_files_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_read_non_auth_files() instead.')
+ files_read_non_auth_files($1)
')
########################################
@@ -1297,11 +1287,8 @@ interface(`auth_read_all_files_except_shadow',`
## </param>
#
interface(`auth_read_all_symlinks_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_read_all_symlinks_except($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_read_non_auth_symlinks() instead.')
+ files_read_non_auth_symlinks($1)
')
########################################
@@ -1322,8 +1309,8 @@ interface(`auth_read_all_symlinks_except_auth_files',`
## </param>
#
interface(`auth_read_all_symlinks_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_read_all_symlinks_except_auth_files() instead.')
- auth_read_all_symlinks_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_read_non_auth_symlinks() instead.')
+ files_read_non_auth_symlinks($1)
')
#######################################
@@ -1344,11 +1331,8 @@ interface(`auth_read_all_symlinks_except_shadow',`
## </param>
#
interface(`auth_relabel_all_files_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_relabel_all_files($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_relabel_non_auth_files() instead.')
+ files_relabel_non_auth_files($1)
')
########################################
@@ -1369,8 +1353,8 @@ interface(`auth_relabel_all_files_except_auth_files',`
## </param>
#
interface(`auth_relabel_all_files_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_relabel_all_files_except_auth_files() instead.')
- auth_relabel_all_files_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_relabel_non_auth_files() instead.')
+ files_relabel_non_auth_files($1)
')
########################################
@@ -1391,11 +1375,8 @@ interface(`auth_relabel_all_files_except_shadow',`
## </param>
#
interface(`auth_rw_all_files_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_rw_all_files($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_rw_non_auth_files() instead.')
+ files_rw_non_auth_files($1)
')
########################################
@@ -1416,8 +1397,8 @@ interface(`auth_rw_all_files_except_auth_files',`
## </param>
#
interface(`auth_rw_all_files_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_rw_all_files_except_auth_files() instead.')
- auth_rw_all_files_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_rw_non_auth_files() instead.')
+ files_rw_non_auth_files($1)
')
########################################
@@ -1438,11 +1419,8 @@ interface(`auth_rw_all_files_except_shadow',`
## </param>
#
interface(`auth_manage_all_files_except_auth_files',`
- gen_require(`
- attribute auth_file_type;
- ')
-
- files_manage_all_files($1, $2 -auth_file_type)
+ refpolicywarn(`$0($*) has been deprecated, use files_manage_non_auth_files() instead.')
+ files_manage_non_auth_files($1)
')
########################################
@@ -1463,8 +1441,8 @@ interface(`auth_manage_all_files_except_auth_files',`
## </param>
#
interface(`auth_manage_all_files_except_shadow',`
- refpolicywarn(`$0($*) has been deprecated, use auth_manage_all_files_except_auth_files() instead.')
- auth_manage_all_files_except_auth_files($1, $2)
+ refpolicywarn(`$0($*) has been deprecated, use files_manage_non_auth_files() instead.')
+ files_manage_non_auth_files($1)
')
########################################
--
1.7.7.6