diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2003-10-22 20:42:22 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2003-10-22 20:42:22 +0000 |
| commit | 9e7bf51ca8a1418958e8ab694669407545c35b8d (patch) | |
| tree | 7e3dd8fa3a9d6e0a72e64656a55ff4ebb0c524f7 /sys | |
| parent | 5d79de444b90d1613f0bb783c806ba278334c08f (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/kern_mac.c | 9 | ||||
| -rw-r--r-- | sys/security/mac/mac_framework.c | 9 | ||||
| -rw-r--r-- | sys/security/mac/mac_syscalls.c | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/sys/kern/kern_mac.c b/sys/kern/kern_mac.c index db3ade90f790b..c37e9752c22f3 100644 --- a/sys/kern/kern_mac.c +++ b/sys/kern/kern_mac.c @@ -235,7 +235,6 @@ SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, #define MAC_DEBUG_COUNTER_DEC(x) #endif -static int error_select(int error1, int error2); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); @@ -360,14 +359,14 @@ mac_policy_list_unbusy(void) error = 0; \ LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ @@ -709,8 +708,8 @@ mac_policy_unregister(struct mac_policy_conf *mpc) * Define an error value precedence, and given two arguments, selects the * value with the higher precedence. */ -static int -error_select(int error1, int error2) +int +mac_error_select(int error1, int error2) { /* Certain decision-making errors take top priority. */ diff --git a/sys/security/mac/mac_framework.c b/sys/security/mac/mac_framework.c index db3ade90f790b..c37e9752c22f3 100644 --- a/sys/security/mac/mac_framework.c +++ b/sys/security/mac/mac_framework.c @@ -235,7 +235,6 @@ SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, #define MAC_DEBUG_COUNTER_DEC(x) #endif -static int error_select(int error1, int error2); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); @@ -360,14 +359,14 @@ mac_policy_list_unbusy(void) error = 0; \ LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ @@ -709,8 +708,8 @@ mac_policy_unregister(struct mac_policy_conf *mpc) * Define an error value precedence, and given two arguments, selects the * value with the higher precedence. */ -static int -error_select(int error1, int error2) +int +mac_error_select(int error1, int error2) { /* Certain decision-making errors take top priority. */ diff --git a/sys/security/mac/mac_syscalls.c b/sys/security/mac/mac_syscalls.c index db3ade90f790b..c37e9752c22f3 100644 --- a/sys/security/mac/mac_syscalls.c +++ b/sys/security/mac/mac_syscalls.c @@ -235,7 +235,6 @@ SYSCTL_UINT(_security_mac_debug_counters, OID_AUTO, devfsdirents, CTLFLAG_RD, #define MAC_DEBUG_COUNTER_DEC(x) #endif -static int error_select(int error1, int error2); static int mac_policy_register(struct mac_policy_conf *mpc); static int mac_policy_unregister(struct mac_policy_conf *mpc); @@ -360,14 +359,14 @@ mac_policy_list_unbusy(void) error = 0; \ LIST_FOREACH(mpc, &mac_static_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ if ((entrycount = mac_policy_list_conditional_busy()) != 0) { \ LIST_FOREACH(mpc, &mac_policy_list, mpc_list) { \ if (mpc->mpc_ops->mpo_ ## check != NULL) \ - error = error_select( \ + error = mac_error_select( \ mpc->mpc_ops->mpo_ ## check (args), \ error); \ } \ @@ -709,8 +708,8 @@ mac_policy_unregister(struct mac_policy_conf *mpc) * Define an error value precedence, and given two arguments, selects the * value with the higher precedence. */ -static int -error_select(int error1, int error2) +int +mac_error_select(int error1, int error2) { /* Certain decision-making errors take top priority. */ |