RepoMirrors/setools
1
0
Fork 0
mirror of https://github.com/SELinuxProject/setools synced 2025-05-02 16:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to libsepol 2.4 parser.

Browse Source 
There was a struct change internally. Now setools4 requires libsepol 2.4.
This commit is contained in:
Chris PeBenito 2015-02-04 14:34:47 -05:00
parent 17c169d4d4
commit 3937946900
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README
View File

@ -40,7 +40,7 @@ SETools requires the following development packages for building:
bison bison
flex flex
libselinux libselinux
libsepol libsepol 2.4
libbz2 libbz2
To build SETools' graphical tools, the following packages are required: To build SETools' graphical tools, the following packages are required:
@ -51,7 +51,7 @@ To run SETools, the following packages are required:
NetworkX NetworkX
setuptools setuptools
libselinux libselinux
libsepol libsepol 2.4
libbz2 libbz2
2.1. building SETools 2.1. building SETools

4
libqpol/policy_define.c
View File

@ -1663,7 +1663,7 @@ int define_compute_type_helper(int which, avrule_t ** rule)
goto bad; goto bad;
} }
class_perm_node_init(perm); class_perm_node_init(perm);
perm->class = i + 1; perm->tclass = i + 1;
perm->data = datum->s.value; perm->data = datum->s.value;
perm->next = avrule->perms; perm->next = avrule->perms;
avrule->perms = perm; avrule->perms = perm;
@ -1903,7 +1903,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule)
goto out; goto out;
} }
class_perm_node_init(cur_perms); class_perm_node_init(cur_perms);
cur_perms->class = i + 1; cur_perms->tclass = i + 1;
if (!perms) if (!perms)
perms = cur_perms; perms = cur_perms;
if (tail) if (tail)

4
libqpol/policy_extend.c
View File

@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
for (class_node = rule->perms; class_node; class_node = class_node->next) { for (class_node = rule->perms; class_node; class_node = class_node->next) {
key.rule_type = rule->specified; key.rule_type = rule->specified;
key.source_val = key.target_val = i + 1; key.source_val = key.target_val = i + 1;
key.class_val = class_node->class; key.class_val = class_node->tclass;
key.cond = cond; key.cond = cond;
if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
goto err; goto err;
@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_
key.rule_type = rule->specified; key.rule_type = rule->specified;
key.source_val = i + 1; key.source_val = i + 1;
key.target_val = j + 1; key.target_val = j + 1;
key.class_val = class_node->class; key.class_val = class_node->tclass;
key.cond = cond; key.cond = cond;
if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule))
goto err; goto err;

6
libqpol/syn_rule_query.c
View File

@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter)
return NULL; return NULL;
} }
return db->class_val_to_struct[srcs->cur->class - 1]; return db->class_val_to_struct[srcs->cur->tclass - 1];
} }
static int syn_rule_class_state_next(qpol_iterator_t * iter) static int syn_rule_class_state_next(qpol_iterator_t * iter)
@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a
} }
for (node = internal_rule->perms; node; node = node->next) { for (node = internal_rule->perms; node; node = node->next) {
for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) { for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) {
if (!(node->data & (1 << i))) if (!(node->data & (1 << i)))
continue; continue;
tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i)); tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i));
if (tmp) { if (tmp) {
tmp++; /* remove prepended space */ tmp++; /* remove prepended space */
for (cur = 0; cur < perm_list_sz; cur++) for (cur = 0; cur < perm_list_sz; cur++)