09820226ae
Rebase on upstream commit 32611aea6543
See
$ cd SELinuxProject/selinux
$ git log --pretty=oneline checkpolicy-3.2..32611aea6543 -- checkpolicy
283 lines
8.8 KiB
Diff
283 lines
8.8 KiB
Diff
From b306cd5b90979a4d6e1a85b842835deb77272873 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Tue, 6 Jul 2021 19:54:32 +0200
|
|
Subject: [PATCH] checkpolicy/test: mark file local functions static
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
---
|
|
checkpolicy/test/dismod.c | 36 ++++++++++++++++++------------------
|
|
checkpolicy/test/dispol.c | 22 +++++++++++-----------
|
|
2 files changed, 29 insertions(+), 29 deletions(-)
|
|
|
|
diff --git a/checkpolicy/test/dismod.c b/checkpolicy/test/dismod.c
|
|
index b1b96115e79e..90c293186afd 100644
|
|
--- a/checkpolicy/test/dismod.c
|
|
+++ b/checkpolicy/test/dismod.c
|
|
@@ -111,7 +111,7 @@ static void display_id(policydb_t * p, FILE * fp, uint32_t symbol_type,
|
|
}
|
|
}
|
|
|
|
-int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy,
|
|
+static int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy,
|
|
FILE * fp)
|
|
{
|
|
unsigned int i, num_types;
|
|
@@ -175,7 +175,7 @@ int display_type_set(type_set_t * set, uint32_t flags, policydb_t * policy,
|
|
return 0;
|
|
}
|
|
|
|
-int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp)
|
|
+static int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp)
|
|
{
|
|
unsigned int i, num = 0;
|
|
|
|
@@ -210,7 +210,7 @@ int display_mod_role_set(role_set_t * roles, policydb_t * p, FILE * fp)
|
|
|
|
}
|
|
|
|
-int display_avrule(avrule_t * avrule, policydb_t * policy,
|
|
+static int display_avrule(avrule_t * avrule, policydb_t * policy,
|
|
FILE * fp)
|
|
{
|
|
class_perm_node_t *cur;
|
|
@@ -313,7 +313,7 @@ int display_avrule(avrule_t * avrule, policydb_t * policy,
|
|
return 0;
|
|
}
|
|
|
|
-int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data)
|
|
+static int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data)
|
|
{
|
|
type_datum_t *type;
|
|
FILE *fp;
|
|
@@ -355,14 +355,14 @@ int display_type_callback(hashtab_key_t key, hashtab_datum_t datum, void *data)
|
|
return 0;
|
|
}
|
|
|
|
-int display_types(policydb_t * p, FILE * fp)
|
|
+static int display_types(policydb_t * p, FILE * fp)
|
|
{
|
|
if (hashtab_map(p->p_types.table, display_type_callback, fp))
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
-int display_users(policydb_t * p, FILE * fp)
|
|
+static int display_users(policydb_t * p, FILE * fp)
|
|
{
|
|
unsigned int i, j;
|
|
ebitmap_t *bitmap;
|
|
@@ -381,7 +381,7 @@ int display_users(policydb_t * p, FILE * fp)
|
|
return 0;
|
|
}
|
|
|
|
-int display_bools(policydb_t * p, FILE * fp)
|
|
+static int display_bools(policydb_t * p, FILE * fp)
|
|
{
|
|
unsigned int i;
|
|
|
|
@@ -392,7 +392,7 @@ int display_bools(policydb_t * p, FILE * fp)
|
|
return 0;
|
|
}
|
|
|
|
-void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
+static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
{
|
|
|
|
cond_expr_t *cur;
|
|
@@ -427,14 +427,14 @@ void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
}
|
|
}
|
|
|
|
-void display_policycon(FILE * fp)
|
|
+static void display_policycon(FILE * fp)
|
|
{
|
|
/* There was an attempt to implement this at one time. Look through
|
|
* git history to find it. */
|
|
fprintf(fp, "Sorry, not implemented\n");
|
|
}
|
|
|
|
-void display_initial_sids(policydb_t * p, FILE * fp)
|
|
+static void display_initial_sids(policydb_t * p, FILE * fp)
|
|
{
|
|
ocontext_t *cur;
|
|
char *user, *role, *type;
|
|
@@ -459,7 +459,7 @@ void display_initial_sids(policydb_t * p, FILE * fp)
|
|
#endif
|
|
}
|
|
|
|
-void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp)
|
|
+static void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp)
|
|
{
|
|
unsigned int i, num = 0;
|
|
|
|
@@ -482,7 +482,7 @@ void display_class_set(ebitmap_t *classes, policydb_t *p, FILE *fp)
|
|
fprintf(fp, " }");
|
|
}
|
|
|
|
-void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp)
|
|
+static void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp)
|
|
{
|
|
for (; tr; tr = tr->next) {
|
|
fprintf(fp, "role transition ");
|
|
@@ -495,7 +495,7 @@ void display_role_trans(role_trans_rule_t * tr, policydb_t * p, FILE * fp)
|
|
}
|
|
}
|
|
|
|
-void display_role_allow(role_allow_rule_t * ra, policydb_t * p, FILE * fp)
|
|
+static void display_role_allow(role_allow_rule_t * ra, policydb_t * p, FILE * fp)
|
|
{
|
|
for (; ra; ra = ra->next) {
|
|
fprintf(fp, "role allow ");
|
|
@@ -517,7 +517,7 @@ static void display_filename_trans(filename_trans_rule_t * tr, policydb_t * p, F
|
|
}
|
|
}
|
|
|
|
-int role_display_callback(hashtab_key_t key __attribute__((unused)),
|
|
+static int role_display_callback(hashtab_key_t key __attribute__((unused)),
|
|
hashtab_datum_t datum, void *data)
|
|
{
|
|
role_datum_t *role;
|
|
@@ -611,7 +611,7 @@ int change_bool(char *name, int state, policydb_t * p, FILE * fp)
|
|
}
|
|
#endif
|
|
|
|
-int display_avdecl(avrule_decl_t * decl, int field,
|
|
+static int display_avdecl(avrule_decl_t * decl, int field,
|
|
policydb_t * policy, FILE * out_fp)
|
|
{
|
|
fprintf(out_fp, "decl %u:%s\n", decl->decl_id,
|
|
@@ -692,7 +692,7 @@ int display_avdecl(avrule_decl_t * decl, int field,
|
|
return 0; /* should never get here */
|
|
}
|
|
|
|
-int display_avblock(int field, policydb_t * policy,
|
|
+static int display_avblock(int field, policydb_t * policy,
|
|
FILE * out_fp)
|
|
{
|
|
avrule_block_t *block = policydb.global;
|
|
@@ -710,7 +710,7 @@ int display_avblock(int field, policydb_t * policy,
|
|
return 0;
|
|
}
|
|
|
|
-int display_handle_unknown(policydb_t * p, FILE * out_fp)
|
|
+static int display_handle_unknown(policydb_t * p, FILE * out_fp)
|
|
{
|
|
if (p->handle_unknown == ALLOW_UNKNOWN)
|
|
fprintf(out_fp, "Allow unknown classes and perms\n");
|
|
@@ -834,7 +834,7 @@ static void display_policycaps(policydb_t * p, FILE * fp)
|
|
}
|
|
}
|
|
|
|
-int menu(void)
|
|
+static int menu(void)
|
|
{
|
|
printf("\nSelect a command:\n");
|
|
printf("1) display unconditional AVTAB\n");
|
|
diff --git a/checkpolicy/test/dispol.c b/checkpolicy/test/dispol.c
|
|
index 37f71842c9e6..8ddefb04ac89 100644
|
|
--- a/checkpolicy/test/dispol.c
|
|
+++ b/checkpolicy/test/dispol.c
|
|
@@ -42,7 +42,7 @@ static __attribute__((__noreturn__)) void usage(const char *progname)
|
|
exit(1);
|
|
}
|
|
|
|
-int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p,
|
|
+static int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p,
|
|
FILE * fp)
|
|
{
|
|
char *perm;
|
|
@@ -54,13 +54,13 @@ int render_access_mask(uint32_t mask, avtab_key_t * key, policydb_t * p,
|
|
return 0;
|
|
}
|
|
|
|
-int render_type(uint32_t type, policydb_t * p, FILE * fp)
|
|
+static int render_type(uint32_t type, policydb_t * p, FILE * fp)
|
|
{
|
|
fprintf(fp, "%s", p->p_type_val_to_name[type - 1]);
|
|
return 0;
|
|
}
|
|
|
|
-int render_key(avtab_key_t * key, policydb_t * p, FILE * fp)
|
|
+static int render_key(avtab_key_t * key, policydb_t * p, FILE * fp)
|
|
{
|
|
char *stype, *ttype, *tclass;
|
|
stype = p->p_type_val_to_name[key->source_type - 1];
|
|
@@ -84,7 +84,7 @@ int render_key(avtab_key_t * key, policydb_t * p, FILE * fp)
|
|
#define RENDER_DISABLED 0x0004
|
|
#define RENDER_CONDITIONAL (RENDER_ENABLED|RENDER_DISABLED)
|
|
|
|
-int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what,
|
|
+static int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what,
|
|
policydb_t * p, FILE * fp)
|
|
{
|
|
if (!(what & RENDER_UNCONDITIONAL)) {
|
|
@@ -163,7 +163,7 @@ int render_av_rule(avtab_key_t * key, avtab_datum_t * datum, uint32_t what,
|
|
return 0;
|
|
}
|
|
|
|
-int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp)
|
|
+static int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp)
|
|
{
|
|
unsigned int i;
|
|
avtab_ptr_t cur;
|
|
@@ -178,7 +178,7 @@ int display_avtab(avtab_t * a, uint32_t what, policydb_t * p, FILE * fp)
|
|
return 0;
|
|
}
|
|
|
|
-int display_bools(policydb_t * p, FILE * fp)
|
|
+static int display_bools(policydb_t * p, FILE * fp)
|
|
{
|
|
unsigned int i;
|
|
|
|
@@ -189,7 +189,7 @@ int display_bools(policydb_t * p, FILE * fp)
|
|
return 0;
|
|
}
|
|
|
|
-void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
+static void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
{
|
|
|
|
cond_expr_t *cur;
|
|
@@ -224,7 +224,7 @@ void display_expr(policydb_t * p, cond_expr_t * exp, FILE * fp)
|
|
}
|
|
}
|
|
|
|
-int display_cond_expressions(policydb_t * p, FILE * fp)
|
|
+static int display_cond_expressions(policydb_t * p, FILE * fp)
|
|
{
|
|
cond_node_t *cur;
|
|
cond_av_list_t *av_cur;
|
|
@@ -249,7 +249,7 @@ int display_cond_expressions(policydb_t * p, FILE * fp)
|
|
return 0;
|
|
}
|
|
|
|
-int display_handle_unknown(policydb_t * p, FILE * out_fp)
|
|
+static int display_handle_unknown(policydb_t * p, FILE * out_fp)
|
|
{
|
|
if (p->handle_unknown == ALLOW_UNKNOWN)
|
|
fprintf(out_fp, "Allow unknown classes and permissions\n");
|
|
@@ -260,7 +260,7 @@ int display_handle_unknown(policydb_t * p, FILE * out_fp)
|
|
return 0;
|
|
}
|
|
|
|
-int change_bool(char *name, int state, policydb_t * p, FILE * fp)
|
|
+static int change_bool(char *name, int state, policydb_t * p, FILE * fp)
|
|
{
|
|
cond_bool_datum_t *bool;
|
|
|
|
@@ -368,7 +368,7 @@ static void display_filename_trans(policydb_t *p, FILE *fp)
|
|
hashtab_map(p->filename_trans, filenametr_display, &args);
|
|
}
|
|
|
|
-int menu(void)
|
|
+static int menu(void)
|
|
{
|
|
printf("\nSelect a command:\n");
|
|
printf("1) display unconditional AVTAB\n");
|
|
--
|
|
2.32.0
|
|
|