Skip to content

Commit 0933cfe

Browse files
committed
Fix Blueprint template to be self-contained
Remove would-be-redundant to mention implicit scap-security-guide and openscap-scanner packages.
1 parent d5204de commit 0933cfe

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

src/XCCDF_POLICY/xccdf_policy_remediate.c

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,15 +1150,7 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
11501150
"profile_id = \"%s\"\n"
11511151
"# If your hardening data stream is not part of the 'scap-security-guide' package\n"
11521152
"# provide the absolute path to it (from the root of the image filesystem).\n"
1153-
"# datastream = \"/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml\"\n\n"
1154-
"# If your hardening data stream is not part of the 'scap-security-guide' package\n"
1155-
"# you don't need this package to be installed in the image (section can be removed).\n"
1156-
"[[packages]]\n"
1157-
"name = \"scap-security-guide\"\n"
1158-
"version = \"*\"\n\n"
1159-
"[[packages]]\n"
1160-
"name = \"openscap-scanner\"\n"
1161-
"version = \"*\"\n\n",
1153+
"# datastream = \"/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml\"\n\n",
11621154
fix_header, profile_id, profile_title, benchmark_version_info, profile_id);
11631155
free(fix_header);
11641156
free(profile_title);

tests/API/XCCDF/unittests/test_remediation_blueprint.toml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,6 @@ profile_id = "xccdf_moc.elpmaxe.www_profile_common"
2929
# provide the absolute path to it (from the root of the image filesystem).
3030
# datastream = "/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml"
3131

32-
# If your hardening data stream is not part of the 'scap-security-guide' package
33-
# you don't need this package to be installed in the image (section can be removed).
34-
[[packages]]
35-
name = "scap-security-guide"
36-
version = "*"
37-
38-
[[packages]]
39-
name = "openscap-scanner"
40-
version = "*"
41-
4232
distro = rhel-80
4333

4434
[[packages]]

0 commit comments

Comments
 (0)