From 7f9f5bce635da1be59cca0d24eea958a206bf1fa Mon Sep 17 00:00:00 2001 From: Chris PeBenito Date: Mon, 1 Nov 2010 11:22:07 -0400 Subject: [PATCH] Rename vlock interfaces. --- policy/modules/apps/vlock.if | 6 +++--- policy/modules/roles/staff.te | 2 +- policy/modules/roles/sysadm.te | 2 +- policy/modules/roles/unprivuser.te | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/policy/modules/apps/vlock.if b/policy/modules/apps/vlock.if index 264293ab6..c5eeea08c 100644 --- a/policy/modules/apps/vlock.if +++ b/policy/modules/apps/vlock.if @@ -10,7 +10,7 @@ ## ## # -interface(`vlock_domtrans_vlock',` +interface(`vlock_domtrans',` gen_require(` type vlock_t, vlock_exec_t; ') @@ -36,11 +36,11 @@ interface(`vlock_domtrans_vlock',` ## ## # -interface(`vlock_run_vlock',` +interface(`vlock_run',` gen_require(` type vlock_t; ') - vlock_domtrans_vlock($1) + vlock_domtrans($1) role $2 types vlock_t; ') diff --git a/policy/modules/roles/staff.te b/policy/modules/roles/staff.te index cb938879b..f1a72b82a 100644 --- a/policy/modules/roles/staff.te +++ b/policy/modules/roles/staff.te @@ -48,7 +48,7 @@ optional_policy(` ') optional_policy(` - vlock_run_vlock(staff_t, staff_r) + vlock_run(staff_t, staff_r) ') optional_policy(` diff --git a/policy/modules/roles/sysadm.te b/policy/modules/roles/sysadm.te index 96a7dbb36..917300f5e 100644 --- a/policy/modules/roles/sysadm.te +++ b/policy/modules/roles/sysadm.te @@ -389,7 +389,7 @@ optional_policy(` ') optional_policy(` - vlock_run_vlock(sysadm_t, sysadm_r) + vlock_run(sysadm_t, sysadm_r) ') optional_policy(` diff --git a/policy/modules/roles/unprivuser.te b/policy/modules/roles/unprivuser.te index d1a9d1b45..f036118bc 100644 --- a/policy/modules/roles/unprivuser.te +++ b/policy/modules/roles/unprivuser.te @@ -21,7 +21,7 @@ optional_policy(` ') optional_policy(` - vlock_run_vlock(user_t, user_r) + vlock_run(user_t, user_r) ') optional_policy(`