Skip to content

Commit

Permalink
Fix Blueprint template to be self-contained
Browse files Browse the repository at this point in the history
Remove would-be-redundant to mention implicit scap-security-guide
and openscap-scanner packages.
  • Loading branch information
evgenyz committed Feb 9, 2024
1 parent d5204de commit 0933cfe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 19 deletions.
10 changes: 1 addition & 9 deletions src/XCCDF_POLICY/xccdf_policy_remediate.c
Original file line number Diff line number Diff line change
Expand Up @@ -1150,15 +1150,7 @@ static int _write_script_header_to_fd(struct xccdf_policy *policy, struct xccdf_
"profile_id = \"%s\"\n"
"# If your hardening data stream is not part of the 'scap-security-guide' package\n"
"# provide the absolute path to it (from the root of the image filesystem).\n"
"# datastream = \"/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml\"\n\n"
"# If your hardening data stream is not part of the 'scap-security-guide' package\n"
"# you don't need this package to be installed in the image (section can be removed).\n"
"[[packages]]\n"
"name = \"scap-security-guide\"\n"
"version = \"*\"\n\n"
"[[packages]]\n"
"name = \"openscap-scanner\"\n"
"version = \"*\"\n\n",
"# datastream = \"/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml\"\n\n",
fix_header, profile_id, profile_title, benchmark_version_info, profile_id);
free(fix_header);
free(profile_title);
Expand Down
10 changes: 0 additions & 10 deletions tests/API/XCCDF/unittests/test_remediation_blueprint.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,6 @@ profile_id = "xccdf_moc.elpmaxe.www_profile_common"
# provide the absolute path to it (from the root of the image filesystem).
# datastream = "/usr/share/xml/scap/ssg/content/ssg-xxxxx-ds.xml"

# If your hardening data stream is not part of the 'scap-security-guide' package
# you don't need this package to be installed in the image (section can be removed).
[[packages]]
name = "scap-security-guide"
version = "*"

[[packages]]
name = "openscap-scanner"
version = "*"

distro = rhel-80

[[packages]]
Expand Down

0 comments on commit 0933cfe

Please sign in to comment.