From 0de2b45f63709a691ad29274d28d64fb8501b7b2 Mon Sep 17 00:00:00 2001
From: dcashman <dcashman@google.com>
Date: Mon, 22 Dec 2014 14:23:46 -0800
Subject: [PATCH] Adjust sepolicy-analyze to reflect libsepol changes.
Commit dc0ab516f11d8e2c413315e733e25a41ba468e4f changed the libsepol
structures on which sepolicy-analyze relies so that it could be compiled
as a C++ library. Reflect this change in sepolicy-analyze.
Change-Id: I7da601767c3a4ebed7274e33304d8b589a9115fe
---
tools/sepolicy-analyze/neverallow.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/sepolicy-analyze/neverallow.c b/tools/sepolicy-analyze/neverallow.c
index 1da88c08d..b288ea7ac 100644
--- a/tools/sepolicy-analyze/neverallow.c
+++ b/tools/sepolicy-analyze/neverallow.c
@@ -257,7 +257,7 @@ static int read_classperms(policydb_t *policydb, char **ptr, char *end,
node = calloc(1, sizeof *node);
if (!node)
goto err;
- node->class = cls->s.value;
+ node->tclass = cls->s.value;
node->next = classperms;
classperms = node;
free(id);
@@ -332,13 +332,13 @@ static int read_classperms(policydb_t *policydb, char **ptr, char *end,
}
for (node = classperms; node; node = node->next) {
- cls = policydb->class_val_to_struct[node->class-1];
+ cls = policydb->class_val_to_struct[node->tclass-1];
perm = hashtab_search(cls->permissions.table, id);
if (cls->comdatum && !perm)
perm = hashtab_search(cls->comdatum->permissions.table, id);
if (!perm) {
if (warn)
- fprintf(stderr, "Warning! Permission %s used in neverallow undefined in class %s in policy being checked.\n", id, policydb->p_class_val_to_name[node->class-1]);
+ fprintf(stderr, "Warning! Permission %s used in neverallow undefined in class %s in policy being checked.\n", id, policydb->p_class_val_to_name[node->tclass-1]);
continue;
}
node->data |= 1U << (perm->s.value - 1);
--
GitLab