33 lines
1.6 KiB
Diff
33 lines
1.6 KiB
Diff
From 2a7e57d7714e9931ec4d43a0d25269258dd4af2a Mon Sep 17 00:00:00 2001
|
|
From: Watson Sato <wsato@redhat.com>
|
|
Date: Tue, 17 May 2022 10:24:26 +0200
|
|
Subject: [PATCH] Do not include symlink_state in 5.10 content
|
|
|
|
The symlink_test, object and state were added in OVAL 5.11. These
|
|
elements should not be included in OVAL 5.10 content because they break
|
|
validation.
|
|
---
|
|
shared/templates/sysctl/oval.template | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/shared/templates/sysctl/oval.template b/shared/templates/sysctl/oval.template
|
|
index e21b0344cb6..207052664a4 100644
|
|
--- a/shared/templates/sysctl/oval.template
|
|
+++ b/shared/templates/sysctl/oval.template
|
|
@@ -222,7 +222,6 @@
|
|
<unix:filepath operation="equals" var_ref="local_var_conf_files_{{{ SYSCTLID }}}" />
|
|
<filter action="exclude">state_symlink_points_outside_usual_dirs_{{{ SYSCTLID }}}</filter>
|
|
</unix:symlink_object>
|
|
-{{% endif %}}
|
|
|
|
<!-- The state matches symlinks that don't point to the default dirs, i.e. paths that are not:
|
|
^/etc/sysctl.conf$
|
|
@@ -232,6 +231,7 @@
|
|
<unix:symlink_state comment="State that matches symlinks referencing files not in the default dirs" id="state_symlink_points_outside_usual_dirs_{{{ SYSCTLID }}}" version="1">
|
|
<unix:canonical_path operation="pattern match">^(?!(\/etc\/sysctl\.conf$|(\/etc|\/run|\/usr\/lib)\/sysctl\.d\/)).*$</unix:canonical_path>
|
|
</unix:symlink_state>
|
|
+{{% endif %}}
|
|
|
|
<local_variable comment="List of conf files" datatype="string" id="local_var_conf_files_{{{ SYSCTLID }}}" version="1">
|
|
<object_component object_ref="object_static_set_unfiltered_sysctls_{{{ SYSCTLID }}}" item_field="filepath" />
|