diff options
author | James Morris <jmorris@namei.org> | 2006-11-29 16:50:27 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2006-12-03 00:31:39 -0500 |
commit | 6cbda6b6e2e2a0a84c0fcda8ea262c16d7a63fc8 (patch) | |
tree | ca4c974f9eedc3ab756b6eecb7c2db2a68095493 | |
parent | 484b366932be0b73a22c74a82748ca10a721643e (diff) |
Rename class_destroy to avoid namespace conflicts.
We're seeing increasing namespace conflicts between the global
class_destroy() function declared in linux/device.h, and the private
function in the SELinux core code. This patch renames the SELinux
function to cls_destroy() to avoid this conflict.
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
-rw-r--r-- | security/selinux/ss/policydb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/selinux/ss/policydb.c b/security/selinux/ss/policydb.c index ba48961f9d05..cd79c6338aa0 100644 --- a/security/selinux/ss/policydb.c +++ b/security/selinux/ss/policydb.c | |||
@@ -468,7 +468,7 @@ static int common_destroy(void *key, void *datum, void *p) | |||
468 | return 0; | 468 | return 0; |
469 | } | 469 | } |
470 | 470 | ||
471 | static int class_destroy(void *key, void *datum, void *p) | 471 | static int cls_destroy(void *key, void *datum, void *p) |
472 | { | 472 | { |
473 | struct class_datum *cladatum; | 473 | struct class_datum *cladatum; |
474 | struct constraint_node *constraint, *ctemp; | 474 | struct constraint_node *constraint, *ctemp; |
@@ -566,7 +566,7 @@ static int cat_destroy(void *key, void *datum, void *p) | |||
566 | static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) = | 566 | static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) = |
567 | { | 567 | { |
568 | common_destroy, | 568 | common_destroy, |
569 | class_destroy, | 569 | cls_destroy, |
570 | role_destroy, | 570 | role_destroy, |
571 | type_destroy, | 571 | type_destroy, |
572 | user_destroy, | 572 | user_destroy, |
@@ -1124,7 +1124,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp) | |||
1124 | out: | 1124 | out: |
1125 | return rc; | 1125 | return rc; |
1126 | bad: | 1126 | bad: |
1127 | class_destroy(key, cladatum, NULL); | 1127 | cls_destroy(key, cladatum, NULL); |
1128 | goto out; | 1128 | goto out; |
1129 | } | 1129 | } |
1130 | 1130 | ||