Will now audit everything, even if rules are not selected
Fixes bug #7613
---
src/secstate/main.py | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/secstate/main.py b/src/secstate/main.py
index 711d335..3b748d8 100644
--- a/src/secstate/main.py
+++ b/src/secstate/main.py
@@ -656,18 +656,19 @@ class Secstate:
# If benchmark
if scanned_content.__dict__.has_key('oval'):
- if rule != None:
- if scanned_content.get_item(rule) == None:
- self.log.error("Benchmark '%(bench)s' does not
contain rule '%(id)s'" % {'bench':scanned_content.id,
-
'id':rule})
- return False
+ if all or (rule != None):
+ if rule != None:
+ if scanned_content.get_item(rule) == None:
+ self.log.error("Benchmark '%(bench)s' does
not contain rule '%(id)s'" % {'bench':scanned_content.id,
+
'id':rule})
+ return False
tmp_prof = oscap.xccdf.profile_new()
tmp_prof.id = '__tmp__'
for item in scanned_content.selections.keys():
sel = oscap.xccdf.select_new()
sel.item = item
- if item == rule or is_parent(scanned_content.get_item(item),
scanned_content.get_item(rule)):
+ if all or (item == rule) or
is_parent(scanned_content.get_item(item), scanned_content.get_item(rule)):
sel.selected = True
else:
sel.selected = False
--
1.7.2.2
Show replies by date