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>
This commit is contained in:
Родитель
484b366932
Коммит
6cbda6b6e2
|
@ -468,7 +468,7 @@ static int common_destroy(void *key, void *datum, void *p)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int class_destroy(void *key, void *datum, void *p)
|
static int cls_destroy(void *key, void *datum, void *p)
|
||||||
{
|
{
|
||||||
struct class_datum *cladatum;
|
struct class_datum *cladatum;
|
||||||
struct constraint_node *constraint, *ctemp;
|
struct constraint_node *constraint, *ctemp;
|
||||||
|
@ -566,7 +566,7 @@ static int cat_destroy(void *key, void *datum, void *p)
|
||||||
static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) =
|
static int (*destroy_f[SYM_NUM]) (void *key, void *datum, void *datap) =
|
||||||
{
|
{
|
||||||
common_destroy,
|
common_destroy,
|
||||||
class_destroy,
|
cls_destroy,
|
||||||
role_destroy,
|
role_destroy,
|
||||||
type_destroy,
|
type_destroy,
|
||||||
user_destroy,
|
user_destroy,
|
||||||
|
@ -1124,7 +1124,7 @@ static int class_read(struct policydb *p, struct hashtab *h, void *fp)
|
||||||
out:
|
out:
|
||||||
return rc;
|
return rc;
|
||||||
bad:
|
bad:
|
||||||
class_destroy(key, cladatum, NULL);
|
cls_destroy(key, cladatum, NULL);
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче