topjohnwu/selinux
1
0
Fork 0
mirror of https://github.com/topjohnwu/selinux.git synced 2024-11-28 14:00:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

policycoreutils: sepolicy: rename policy global variable

Browse Source 
Variable policy is both a global variable and a parameter to some
functions in policycoreutils/sepolicy/search.c.  This makes the building
fail when using -Wshadow -Werror compilation flags.

Fix this by renaming the global variable global_policy.  This does not
change the API of the Python module.

Signed-off-by: Nicolas Iooss <nicolas.iooss@m4x.org>
This commit is contained in:
Nicolas Iooss 2016-02-05 21:55:49 +01:00 committed by Steve Lawrence
parent 5b6287fafc
commit 168f653d28
4 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
policycoreutils/sepolicy/info.c
View File

@ -1318,31 +1318,31 @@ PyObject* info( int type, const char *name)
switch(type) {
/* display requested info */
case TYPE:
output = get_types(name, policy);
output = get_types(name, global_policy);
break;
case ATTRIBUTE:
output = get_attribs(name, policy);
output = get_attribs(name, global_policy);
break;
case ROLE:
output = get_roles(name, policy);
output = get_roles(name, global_policy);
break;
case USER:
output = get_users(name, policy);
output = get_users(name, global_policy);
break;
case CLASS:
output = get_classes(name, policy);
output = get_classes(name, global_policy);
break;
case BOOLEAN:
output = get_booleans(name, policy);
output = get_booleans(name, global_policy);
break;
case PORT:
output = get_ports(name, policy);
output = get_ports(name, global_policy);
break;
case SENS:
output = get_sens(name, policy);
output = get_sens(name, global_policy);
break;
case CATS:
output = get_cats(name, policy);
output = get_cats(name, global_policy);
break;
default:
errno = EINVAL;
@ -1357,7 +1357,7 @@ PyObject *wrap_info(PyObject *UNUSED(self), PyObject *args){
int type;
const char *name;
if (!policy) {
if (!global_policy) {
PyErr_SetString(PyExc_RuntimeError,"Policy not loaded");
return NULL;
}

10
policycoreutils/sepolicy/policy.c
View File

@ -33,7 +33,7 @@
#endif
#include "policy.h"
apol_policy_t *policy = NULL;
apol_policy_t *global_policy = NULL;
/* other */
#include <errno.h>
@ -53,8 +53,8 @@ PyObject *wrap_policy(PyObject *UNUSED(self), PyObject *args){
if (!PyArg_ParseTuple(args, "z", &policy_file))
return NULL;
if (policy)
apol_policy_destroy(&policy);
if (global_policy)
apol_policy_destroy(&global_policy);
int policy_load_options = 0;
@ -66,9 +66,9 @@ PyObject *wrap_policy(PyObject *UNUSED(self), PyObject *args){
}
apol_vector_destroy(&mod_paths);
policy = apol_policy_create_from_policy_path(pol_path, policy_load_options, NULL, NULL);
global_policy = apol_policy_create_from_policy_path(pol_path, policy_load_options, NULL, NULL);
apol_policy_path_destroy(&pol_path);
if (!policy) {
if (!global_policy) {
PyErr_SetString(PyExc_RuntimeError,strerror(errno));
return NULL;
}

2
policycoreutils/sepolicy/policy.h
View File

@ -1,5 +1,5 @@
#include <apol/policy.h>
extern apol_policy_t *policy;
extern apol_policy_t *global_policy;
extern PyObject *wrap_info(PyObject *self, PyObject *args);
extern void init_info (PyObject *m);
extern PyObject *wrap_search(PyObject *self, PyObject *args);

26
policycoreutils/sepolicy/search.c
View File

@ -914,23 +914,23 @@ PyObject* search(bool allow,
cmd_opts.perm_vector = apol_vector_create(free);
cmd_opts.permlist = strdup(permlist);
}
if (!cmd_opts.semantic && qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_SYN_RULES)) {
if (qpol_policy_build_syn_rule_table(apol_policy_get_qpol(policy))) {
if (!cmd_opts.semantic && qpol_policy_has_capability(apol_policy_get_qpol(global_policy), QPOL_CAP_SYN_RULES)) {
if (qpol_policy_build_syn_rule_table(apol_policy_get_qpol(global_policy))) {
PyErr_SetString(PyExc_RuntimeError,"Query failed");
goto cleanup;
}
}
/* if syntactic rules are not available always do semantic search */
if (!qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_SYN_RULES)) {
if (!qpol_policy_has_capability(apol_policy_get_qpol(global_policy), QPOL_CAP_SYN_RULES)) {
cmd_opts.semantic = 1;
}
/* supress line numbers if doing semantic search or not available */
if (cmd_opts.semantic || !qpol_policy_has_capability(apol_policy_get_qpol(policy), QPOL_CAP_LINE_NUMBERS)) {
if (cmd_opts.semantic || !qpol_policy_has_capability(apol_policy_get_qpol(global_policy), QPOL_CAP_LINE_NUMBERS)) {
cmd_opts.lineno = 0;
}
if (perform_av_query(policy, &cmd_opts, &v)) {
if (perform_av_query(global_policy, &cmd_opts, &v)) {
goto cleanup;
}
output = PyList_New(0);
@ -938,36 +938,36 @@ PyObject* search(bool allow,
goto cleanup;
if (v) {
get_av_results(policy, v, output);
get_av_results(global_policy, v, output);
}
apol_vector_destroy(&v);
if (perform_te_query(policy, &cmd_opts, &v)) {
if (perform_te_query(global_policy, &cmd_opts, &v)) {
goto cleanup;
}
if (v) {
get_te_results(policy, v, output);
get_te_results(global_policy, v, output);
}
if (cmd_opts.all || cmd_opts.type) {
apol_vector_destroy(&v);
if (perform_ft_query(policy, &cmd_opts, &v)) {
if (perform_ft_query(global_policy, &cmd_opts, &v)) {
goto cleanup;
}
if (v) {
get_ft_results(policy, v, output);
get_ft_results(global_policy, v, output);
}
}
if (cmd_opts.all || cmd_opts.role_allow) {
apol_vector_destroy(&v);
if (perform_ra_query(policy, &cmd_opts, &v)) {
if (perform_ra_query(global_policy, &cmd_opts, &v)) {
goto cleanup;
}
if (v) {
get_ra_results(policy, v, output);
get_ra_results(global_policy, v, output);
}
}
@ -1016,7 +1016,7 @@ PyObject *wrap_search(PyObject *UNUSED(self), PyObject *args){
int transition = Dict_ContainsInt(dict, "transition");
int role_allow = Dict_ContainsInt(dict, "role_allow");
if (!policy) {
if (!global_policy) {
PyErr_SetString(PyExc_RuntimeError,"Policy not loaded");
return NULL;
}