|
 |
0950b5 |
From 810c6774166d8b591300322e269acd6a1d3554ef Mon Sep 17 00:00:00 2001
|
|
|
0950b5 |
From: =?UTF-8?q?Jan=20=C4=8Cern=C3=BD?= <jcerny@redhat.com>
|
|
|
0950b5 |
Date: Tue, 5 Dec 2017 16:15:46 +0100
|
|
|
0950b5 |
Subject: [PATCH] RHBZ #1520493: Fix umask_for_daemons
|
|
|
0950b5 |
|
|
|
0950b5 |
OpenSCAP evaluated this rule as "error" because it tried to evauluate
|
|
|
0950b5 |
the variable 'var_umask_for_daemons_umask_as_number', which was defined
|
|
|
0950b5 |
as external, but in fact is created in other definition. OpenSCAP
|
|
|
0950b5 |
could not find its value. The fix is very similar to PR #1945.
|
|
|
0950b5 |
---
|
|
|
0950b5 |
shared/checks/oval/umask_for_daemons.xml | 8 ++------
|
|
|
0950b5 |
1 file changed, 2 insertions(+), 6 deletions(-)
|
|
|
0950b5 |
|
|
|
0950b5 |
diff --git a/shared/checks/oval/umask_for_daemons.xml b/shared/checks/oval/umask_for_daemons.xml
|
|
|
0950b5 |
index 7f54e4957..a8ce76275 100644
|
|
|
0950b5 |
--- a/shared/checks/oval/umask_for_daemons.xml
|
|
|
0950b5 |
+++ b/shared/checks/oval/umask_for_daemons.xml
|
|
|
0950b5 |
@@ -61,12 +61,6 @@
|
|
|
0950b5 |
</arithmetic>
|
|
|
0950b5 |
</local_variable>
|
|
|
0950b5 |
|
|
|
0950b5 |
-
|
|
|
0950b5 |
- the referenced 'var_umask_for_daemons_as_number' OVAL definition -->
|
|
|
0950b5 |
-
|
|
|
0950b5 |
- comment="Required umask converted from string to octal number"
|
|
|
0950b5 |
- datatype="int" version="1"/>
|
|
|
0950b5 |
-
|
|
|
0950b5 |
|
|
|
0950b5 |
comment="Test the retrieved /etc/init.d/functions umask value(s) match the var_umask_for_daemons requirement">
|
|
|
0950b5 |
<ind:object object_ref="obj_umask_for_daemons" />
|
|
|
0950b5 |
@@ -77,6 +71,8 @@
|
|
|
0950b5 |
<ind:var_ref>var_etc_init_d_functions_umask_as_number</ind:var_ref>
|
|
|
0950b5 |
</ind:variable_object>
|
|
|
0950b5 |
|
|
|
0950b5 |
+
|
|
|
0950b5 |
+ the referenced 'var_umask_for_daemons_as_number' OVAL definition -->
|
|
|
0950b5 |
<ind:variable_state id="ste_umask_for_daemons" version="1">
|
|
|
0950b5 |
<ind:value datatype="int" operation="bitwise and" var_ref="var_umask_for_daemons_umask_as_number" />
|
|
|
0950b5 |
</ind:variable_state>
|