44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From c7527bdb608b3d2f2283047bcc6faeecd1ebfaf4 Mon Sep 17 00:00:00 2001
|
|
From: James Carter <jwcart2@tycho.nsa.gov>
|
|
Date: Fri, 1 Nov 2019 09:50:53 -0400
|
|
Subject: [PATCH] libsepol/cil: Report disabling an optional block only at high
|
|
verbose levels
|
|
|
|
Since failing to resolve a statement in an optional block is normal,
|
|
only display messages about the statement failing to resolve and the
|
|
optional block being disabled at the highest verbosity level.
|
|
|
|
These messages are now only at log level CIL_INFO instead of CIL_WARN.
|
|
|
|
Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
|
|
---
|
|
libsepol/cil/src/cil_resolve_ast.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/cil/src/cil_resolve_ast.c b/libsepol/cil/src/cil_resolve_ast.c
|
|
index 70a60bdfa024..875758609494 100644
|
|
--- a/libsepol/cil/src/cil_resolve_ast.c
|
|
+++ b/libsepol/cil/src/cil_resolve_ast.c
|
|
@@ -3761,14 +3761,16 @@ int __cil_resolve_ast_node_helper(struct cil_tree_node *node, uint32_t *finished
|
|
enum cil_log_level lvl = CIL_ERR;
|
|
|
|
if (optstack != NULL) {
|
|
- lvl = CIL_WARN;
|
|
+ lvl = CIL_INFO;
|
|
|
|
struct cil_optional *opt = (struct cil_optional *)optstack->data;
|
|
struct cil_tree_node *opt_node = opt->datum.nodes->head->data;
|
|
- cil_tree_log(opt_node, lvl, "Disabling optional '%s'", opt->datum.name);
|
|
/* disable an optional if something failed to resolve */
|
|
opt->enabled = CIL_FALSE;
|
|
+ cil_tree_log(node, lvl, "Failed to resolve %s statement", cil_node_to_string(node));
|
|
+ cil_tree_log(opt_node, lvl, "Disabling optional '%s'", opt->datum.name);
|
|
rc = SEPOL_OK;
|
|
+ goto exit;
|
|
}
|
|
|
|
cil_tree_log(node, lvl, "Failed to resolve %s statement", cil_node_to_string(node));
|
|
--
|
|
2.23.0
|
|
|