Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update owner macros to allow | between owners #13113

Merged
merged 1 commit into from
Mar 12, 2025

Conversation

ericeberry
Copy link
Contributor

Description:

  • Update describe_file_group_owner and describe_file_owner too allow multiple owners and properly show the chgrp or chown command with only one owner.

Rationale:

  • Allow multiple owners and only shown one owner in the command

@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Feb 26, 2025
Copy link

openshift-ci bot commented Feb 26, 2025

Hi @ericeberry. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Feb 26, 2025
Copy link

github-actions bot commented Feb 27, 2025

This datastream diff is auto generated by the check Compare DS/Generate Diff.
Due to the excessive size of the diff, it has been trimmed to fit the 65535-character limit.

Click here to see the trimmed diff
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sudoersd'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sudoersd
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sudoersd
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/sudoers.d Directory
 
 [description]:
-To properly set the group owner of /etc/sudoers.d, run the command: $ sudo chgrp root /etc/sudoers.d
+To properly set the group owner of /etc/sudoers.d, run the command:
+$ sudo chgrp root /etc/sudoers.d
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sudoersd' differs.
--- ocil:ssg-directory_groupowner_etc_sudoersd_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_sudoersd_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/sudoers.d
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/sudoers.d does not have a group owner of
 root
-      Is it the case that /etc/sudoers.d does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_sudoersd'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_sudoersd
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_sudoersd
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/sudoers.d Directory
 
 [description]:
-To properly set the owner of /etc/sudoers.d, run the command: $ sudo chown root /etc/sudoers.d
+To properly set the owner of /etc/sudoers.d, run the command:
+$ sudo chown root /etc/sudoers.d
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_sudoers'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_sudoers
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_sudoers
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/sudoers File
 
 [description]:
-To properly set the group owner of /etc/sudoers, run the command: $ sudo chgrp root /etc/sudoers
+To properly set the group owner of /etc/sudoers, run the command:
+$ sudo chgrp root /etc/sudoers
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_sudoers' differs.
--- ocil:ssg-file_groupowner_etc_sudoers_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_sudoers_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/sudoers
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/sudoers does not have a group owner of
 root
-      Is it the case that /etc/sudoers does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_sudoers'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_sudoers
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_sudoers
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/sudoers File
 
 [description]:
-To properly set the owner of /etc/sudoers, run the command: $ sudo chown root /etc/sudoers
+To properly set the owner of /etc/sudoers, run the command:
+$ sudo chown root /etc/sudoers
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_sudo_dedicated_group' differs.
--- ocil:ssg-sudo_dedicated_group_ocil:questionnaire:1
+++ ocil:ssg-sudo_dedicated_group_ocil:questionnaire:1
@@ -3,5 +3,9 @@
 $ ls -lL /usr/bin/sudo
 If properly configured, the output should indicate the following group-owner:
 
-      Is it the case that /usr/bin/sudo does not have a group owner of <sub idref="var_sudo_dedicated_group" />?
+   
+  
+      Is it the case that /usr/bin/sudo does not have a group owner of
+<sub idref="var_sudo_dedicated_group" />
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/issue, run the command:
-$ sudo chgrp root /etc/issue
+
+  $ sudo chgrp root /etc/issue
 
 [reference]:
 1.7.5

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue' differs.
--- ocil:ssg-file_groupowner_etc_issue_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_issue_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/issue
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/issue does not have a group owner of
 root
-      Is it the case that /etc/issue does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue_net'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue_net
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue_net
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/issue.net, run the command:
-$ sudo chgrp root /etc/issue.net
+
+  $ sudo chgrp root /etc/issue.net
 
 [reference]:
 1.7.6

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_issue_net' differs.
--- ocil:ssg-file_groupowner_etc_issue_net_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_issue_net_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/issue.net
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/issue.net does not have a group owner of
 root
-      Is it the case that /etc/issue.net does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_motd'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_motd
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_motd
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/motd, run the command:
-$ sudo chgrp root /etc/motd
+
+  $ sudo chgrp root /etc/motd
 
 [reference]:
 1.7.4

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_motd' differs.
--- ocil:ssg-file_groupowner_etc_motd_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_motd_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/motd
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/motd does not have a group owner of
 root
-      Is it the case that /etc/motd does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_issue'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_issue
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_issue
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/issue, run the command:
-$ sudo chown root /etc/issue
+
+  $ sudo chown root /etc/issue
 
 [reference]:
 1.7.5

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_issue_net'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_issue_net
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_issue_net
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/issue.net, run the command:
-$ sudo chown root /etc/issue.net
+
+  $ sudo chown root /etc/issue.net
 
 [reference]:
 1.7.6

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_motd'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_motd
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_motd
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/motd, run the command:
-$ sudo chown root /etc/motd
+
+  $ sudo chown root /etc/motd
 
 [reference]:
 1.7.4

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_grub2_cfg'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_grub2_cfg
+++ xccdf_org.ssgproject.content_rule_file_groupowner_grub2_cfg
@@ -8,7 +8,8 @@
 destruction or modification of the file.
 
 To properly set the group owner of /boot/grub2/grub.cfg, run the command:
-$ sudo chgrp root /boot/grub2/grub.cfg
+
+  $ sudo chgrp root /boot/grub2/grub.cfg
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_grub2_cfg' differs.
--- ocil:ssg-file_groupowner_grub2_cfg_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_grub2_cfg_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /boot/grub2/grub.cfg
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /boot/grub2/grub.cfg does not have a group owner of
 root
-      Is it the case that /boot/grub2/grub.cfg does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_user_cfg'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_user_cfg
+++ xccdf_org.ssgproject.content_rule_file_groupowner_user_cfg
@@ -7,7 +7,8 @@
 group to prevent reading or modification of the file.
 
 To properly set the group owner of /boot/grub2/user.cfg, run the command:
-$ sudo chgrp root /boot/grub2/user.cfg
+
+  $ sudo chgrp root /boot/grub2/user.cfg
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_user_cfg' differs.
--- ocil:ssg-file_groupowner_user_cfg_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_user_cfg_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /boot/grub2/user.cfg
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /boot/grub2/user.cfg does not have a group owner of
 root
-      Is it the case that /boot/grub2/user.cfg does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_grub2_cfg'.
--- xccdf_org.ssgproject.content_rule_file_owner_grub2_cfg
+++ xccdf_org.ssgproject.content_rule_file_owner_grub2_cfg
@@ -8,7 +8,8 @@
 or modification of the file.
 
 To properly set the owner of /boot/grub2/grub.cfg, run the command:
-$ sudo chown root /boot/grub2/grub.cfg
+
+  $ sudo chown root /boot/grub2/grub.cfg
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_user_cfg'.
--- xccdf_org.ssgproject.content_rule_file_owner_user_cfg
+++ xccdf_org.ssgproject.content_rule_file_owner_user_cfg
@@ -7,7 +7,8 @@
 user to prevent reading or modification of the file.
 
 To properly set the owner of /boot/grub2/user.cfg, run the command:
-$ sudo chown root /boot/grub2/user.cfg
+
+  $ sudo chown root /boot/grub2/user.cfg
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_efi_grub2_cfg'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_efi_grub2_cfg
+++ xccdf_org.ssgproject.content_rule_file_groupowner_efi_grub2_cfg
@@ -8,7 +8,8 @@
 destruction or modification of the file.
 
 To properly set the group owner of /boot/efi/EFI/redhat/grub.cfg, run the command:
-$ sudo chgrp root /boot/efi/EFI/redhat/grub.cfg
+
+  $ sudo chgrp root /boot/efi/EFI/redhat/grub.cfg
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_efi_grub2_cfg' differs.
--- ocil:ssg-file_groupowner_efi_grub2_cfg_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_efi_grub2_cfg_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /boot/efi/EFI/redhat/grub.cfg
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /boot/efi/EFI/redhat/grub.cfg does not have a group owner of
 root
-      Is it the case that /boot/efi/EFI/redhat/grub.cfg does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_efi_user_cfg'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_efi_user_cfg
+++ xccdf_org.ssgproject.content_rule_file_groupowner_efi_user_cfg
@@ -7,7 +7,8 @@
 root group to prevent reading or modification of the file.
 
 To properly set the group owner of /boot/efi/EFI/redhat/user.cfg, run the command:
-$ sudo chgrp root /boot/efi/EFI/redhat/user.cfg
+
+  $ sudo chgrp root /boot/efi/EFI/redhat/user.cfg
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_efi_user_cfg' differs.
--- ocil:ssg-file_groupowner_efi_user_cfg_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_efi_user_cfg_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /boot/efi/EFI/redhat/user.cfg
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /boot/efi/EFI/redhat/user.cfg does not have a group owner of
 root
-      Is it the case that /boot/efi/EFI/redhat/user.cfg does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_efi_grub2_cfg'.
--- xccdf_org.ssgproject.content_rule_file_owner_efi_grub2_cfg
+++ xccdf_org.ssgproject.content_rule_file_owner_efi_grub2_cfg
@@ -8,7 +8,8 @@
 or modification of the file.
 
 To properly set the owner of /boot/efi/EFI/redhat/grub.cfg, run the command:
-$ sudo chown root /boot/efi/EFI/redhat/grub.cfg
+
+  $ sudo chown root /boot/efi/EFI/redhat/grub.cfg
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_efi_user_cfg'.
--- xccdf_org.ssgproject.content_rule_file_owner_efi_user_cfg
+++ xccdf_org.ssgproject.content_rule_file_owner_efi_user_cfg
@@ -7,7 +7,8 @@
 user to prevent reading or modification of the file.
 
 To properly set the owner of /boot/efi/EFI/redhat/user.cfg, run the command:
-$ sudo chown root /boot/efi/EFI/redhat/user.cfg
+
+  $ sudo chown root /boot/efi/EFI/redhat/user.cfg
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_ipsecd'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_ipsecd
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_ipsecd
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/ipsec.d Directory
 
 [description]:
-To properly set the group owner of /etc/ipsec.d, run the command: $ sudo chgrp root /etc/ipsec.d
+To properly set the group owner of /etc/ipsec.d, run the command:
+$ sudo chgrp root /etc/ipsec.d
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_ipsecd' differs.
--- ocil:ssg-directory_groupowner_etc_ipsecd_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_ipsecd_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/ipsec.d
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/ipsec.d does not have a group owner of
 root
-      Is it the case that /etc/ipsec.d does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_ipsecd'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_ipsecd
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_ipsecd
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/ipsec.d Directory
 
 [description]:
-To properly set the owner of /etc/ipsec.d, run the command: $ sudo chown root /etc/ipsec.d
+To properly set the owner of /etc/ipsec.d, run the command:
+$ sudo chown root /etc/ipsec.d
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_conf'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_conf
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_conf
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/ipsec.conf File
 
 [description]:
-To properly set the group owner of /etc/ipsec.conf, run the command: $ sudo chgrp root /etc/ipsec.conf
+To properly set the group owner of /etc/ipsec.conf, run the command:
+$ sudo chgrp root /etc/ipsec.conf
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_conf' differs.
--- ocil:ssg-file_groupowner_etc_ipsec_conf_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_ipsec_conf_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/ipsec.conf
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/ipsec.conf does not have a group owner of
 root
-      Is it the case that /etc/ipsec.conf does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_secrets'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_secrets
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_secrets
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/ipsec.secrets File
 
 [description]:
-To properly set the group owner of /etc/ipsec.secrets, run the command: $ sudo chgrp root /etc/ipsec.secrets
+To properly set the group owner of /etc/ipsec.secrets, run the command:
+$ sudo chgrp root /etc/ipsec.secrets
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_ipsec_secrets' differs.
--- ocil:ssg-file_groupowner_etc_ipsec_secrets_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_ipsec_secrets_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/ipsec.secrets
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/ipsec.secrets does not have a group owner of
 root
-      Is it the case that /etc/ipsec.secrets does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_conf'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_conf
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_conf
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/ipsec.conf File
 
 [description]:
-To properly set the owner of /etc/ipsec.conf, run the command: $ sudo chown root /etc/ipsec.conf
+To properly set the owner of /etc/ipsec.conf, run the command:
+$ sudo chown root /etc/ipsec.conf
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_secrets'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_secrets
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_ipsec_secrets
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/ipsec.secrets File
 
 [description]:
-To properly set the owner of /etc/ipsec.secrets, run the command: $ sudo chown root /etc/ipsec.secrets
+To properly set the owner of /etc/ipsec.secrets, run the command:
+$ sudo chown root /etc/ipsec.secrets
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_iptables'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_iptables
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_iptables
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/iptables Directory
 
 [description]:
-To properly set the group owner of /etc/iptables, run the command: $ sudo chgrp root /etc/iptables
+To properly set the group owner of /etc/iptables, run the command:
+$ sudo chgrp root /etc/iptables
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_iptables' differs.
--- ocil:ssg-directory_groupowner_etc_iptables_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_iptables_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/iptables
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/iptables does not have a group owner of
 root
-      Is it the case that /etc/iptables does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_iptables'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_iptables
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_iptables
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/iptables Directory
 
 [description]:
-To properly set the owner of /etc/iptables, run the command: $ sudo chown root /etc/iptables
+To properly set the owner of /etc/iptables, run the command:
+$ sudo chown root /etc/iptables
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_nftables'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_nftables
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_nftables
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/nftables Directory
 
 [description]:
-To properly set the group owner of /etc/nftables, run the command: $ sudo chgrp root /etc/nftables
+To properly set the group owner of /etc/nftables, run the command:
+$ sudo chgrp root /etc/nftables
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_nftables' differs.
--- ocil:ssg-directory_groupowner_etc_nftables_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_nftables_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/nftables
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/nftables does not have a group owner of
 root
-      Is it the case that /etc/nftables does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_nftables'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_nftables
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_nftables
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/nftables Directory
 
 [description]:
-To properly set the owner of /etc/nftables, run the command: $ sudo chown root /etc/nftables
+To properly set the owner of /etc/nftables, run the command:
+$ sudo chown root /etc/nftables
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_crypttab'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_crypttab
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_crypttab
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/crypttab File
 
 [description]:
-To properly set the group owner of /etc/crypttab, run the command: $ sudo chgrp root /etc/crypttab
+To properly set the group owner of /etc/crypttab, run the command:
+$ sudo chgrp root /etc/crypttab
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_crypttab' differs.
--- ocil:ssg-file_groupowner_etc_crypttab_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_crypttab_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/crypttab
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/crypttab does not have a group owner of
 root
-      Is it the case that /etc/crypttab does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_systemmap'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_systemmap
+++ xccdf_org.ssgproject.content_rule_file_groupowner_systemmap
@@ -9,7 +9,8 @@
 
 
 To properly set the group owner of /boot/System.map*, run the command:
-$ sudo chgrp root /boot/System.map*
+
+  $ sudo chgrp root /boot/System.map*
 
 [reference]:
 R29

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_systemmap' differs.
--- ocil:ssg-file_groupowner_systemmap_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_systemmap_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /boot/System.map*
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /boot/System.map* does not have a group owner of
 root
-      Is it the case that /boot/System.map* does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_crypttab'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_crypttab
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_crypttab
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/crypttab File
 
 [description]:
-To properly set the owner of /etc/crypttab, run the command: $ sudo chown root /etc/crypttab
+To properly set the owner of /etc/crypttab, run the command:
+$ sudo chown root /etc/crypttab
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_systemmap'.
--- xccdf_org.ssgproject.content_rule_file_owner_systemmap
+++ xccdf_org.ssgproject.content_rule_file_owner_systemmap
@@ -9,7 +9,8 @@
 
 
 To properly set the owner of /boot/System.map*, run the command:
-$ sudo chown root /boot/System.map*
+
+  $ sudo chown root /boot/System.map*
 
 [reference]:
 R29

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_etc_security_opasswd'.
--- xccdf_org.ssgproject.content_rule_file_etc_security_opasswd
+++ xccdf_org.ssgproject.content_rule_file_etc_security_opasswd
@@ -3,8 +3,14 @@
 Verify Permissions and Ownership of Old Passwords File
 
 [description]:
-To properly set the owner of /etc/security/opasswd, run the command: $ sudo chown root /etc/security/opasswd 
-To properly set the group owner of /etc/security/opasswd, run the command: $ sudo chgrp root /etc/security/opasswd
+To properly set the owner of /etc/security/opasswd, run the command:
+$ sudo chown root /etc/security/opasswd 
+
+
+To properly set the group owner of /etc/security/opasswd, run the command:
+$ sudo chgrp root /etc/security/opasswd
+
+
 To properly set the permissions of /etc/security/opasswd, run the command: $ sudo chmod 0600 /etc/security/opasswd
 
 [reference]:

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_etc_security_opasswd' differs.
--- ocil:ssg-file_etc_security_opasswd_ocil:questionnaire:1
+++ ocil:ssg-file_etc_security_opasswd_ocil:questionnaire:1
@@ -7,11 +7,16 @@
 run the command:
 $ ls -lL /etc/security/opasswd
 If properly configured, the output should indicate the following group-owner:
-root
+
+  root 
+  
+
 To check the permissions of /etc/security/opasswd,
 run the command:
 $ ls -l /etc/security/opasswd
 If properly configured, the output should indicate the following permissions:
 0600
-      Is it the case that /etc/security/opasswd does not have an owner of root and /etc/security/opasswd does not have a group owner of root and /etc/security/opasswd does not have unix mode 0600?
+      Is it the case that /etc/security/opasswd does not have an owner of root and /etc/security/opasswd does not have a group owner of
+root
+and /etc/security/opasswd does not have unix mode 0600?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_group'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_group
+++ xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_group
@@ -3,7 +3,8 @@
 Verify Group Who Owns Backup group File
 
 [description]:
-To properly set the group owner of /etc/group-, run the command: $ sudo chgrp root /etc/group-
+To properly set the group owner of /etc/group-, run the command:
+$ sudo chgrp root /etc/group-
 
 [reference]:
 CCI-000366

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_group' differs.
--- ocil:ssg-file_groupowner_backup_etc_group_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_backup_etc_group_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/group-
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/group- does not have a group owner of
 root
-      Is it the case that /etc/group- does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_gshadow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_gshadow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_gshadow
@@ -3,7 +3,8 @@
 Verify Group Who Owns Backup gshadow File
 
 [description]:
-To properly set the group owner of /etc/gshadow-, run the command: $ sudo chgrp root /etc/gshadow-
+To properly set the group owner of /etc/gshadow-, run the command:
+$ sudo chgrp root /etc/gshadow-
 
 [reference]:
 CCI-000366

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_gshadow' differs.
--- ocil:ssg-file_groupowner_backup_etc_gshadow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_backup_etc_gshadow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/gshadow-
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/gshadow- does not have a group owner of
 root
-      Is it the case that /etc/gshadow- does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_passwd'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_passwd
+++ xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_passwd
@@ -3,7 +3,8 @@
 Verify Group Who Owns Backup passwd File
 
 [description]:
-To properly set the group owner of /etc/passwd-, run the command: $ sudo chgrp root /etc/passwd-
+To properly set the group owner of /etc/passwd-, run the command:
+$ sudo chgrp root /etc/passwd-
 
 [reference]:
 CCI-000366

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_passwd' differs.
--- ocil:ssg-file_groupowner_backup_etc_passwd_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_backup_etc_passwd_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/passwd-
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/passwd- does not have a group owner of
 root
-      Is it the case that /etc/passwd- does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_shadow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_shadow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_shadow
@@ -3,7 +3,8 @@
 Verify User Who Owns Backup shadow File
 
 [description]:
-To properly set the group owner of /etc/shadow-, run the command: $ sudo chgrp root /etc/shadow-
+To properly set the group owner of /etc/shadow-, run the command:
+$ sudo chgrp root /etc/shadow-
 
 [reference]:
 CCI-000366

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_backup_etc_shadow' differs.
--- ocil:ssg-file_groupowner_backup_etc_shadow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_backup_etc_shadow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/shadow-
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/shadow- does not have a group owner of
 root
-      Is it the case that /etc/shadow- does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_group'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_group
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_group
@@ -3,7 +3,8 @@
 Verify Group Who Owns group File
 
 [description]:
-To properly set the group owner of /etc/group, run the command: $ sudo chgrp root /etc/group
+To properly set the group owner of /etc/group, run the command:
+$ sudo chgrp root /etc/group
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_group' differs.
--- ocil:ssg-file_groupowner_etc_group_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_group_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/group
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/group does not have a group owner of
 root
-      Is it the case that /etc/group does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_gshadow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_gshadow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_gshadow
@@ -3,7 +3,8 @@
 Verify Group Who Owns gshadow File
 
 [description]:
-To properly set the group owner of /etc/gshadow, run the command: $ sudo chgrp root /etc/gshadow
+To properly set the group owner of /etc/gshadow, run the command:
+$ sudo chgrp root /etc/gshadow
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_gshadow' differs.
--- ocil:ssg-file_groupowner_etc_gshadow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_gshadow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/gshadow
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/gshadow does not have a group owner of
 root
-      Is it the case that /etc/gshadow does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_passwd'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_passwd
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_passwd
@@ -3,7 +3,8 @@
 Verify Group Who Owns passwd File
 
 [description]:
-To properly set the group owner of /etc/passwd, run the command: $ sudo chgrp root /etc/passwd
+To properly set the group owner of /etc/passwd, run the command:
+$ sudo chgrp root /etc/passwd
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_passwd' differs.
--- ocil:ssg-file_groupowner_etc_passwd_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_passwd_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/passwd
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/passwd does not have a group owner of
 root
-      Is it the case that /etc/passwd does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_shadow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_shadow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_shadow
@@ -3,7 +3,8 @@
 Verify Group Who Owns shadow File
 
 [description]:
-To properly set the group owner of /etc/shadow, run the command: $ sudo chgrp root /etc/shadow
+To properly set the group owner of /etc/shadow, run the command:
+$ sudo chgrp root /etc/shadow
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_shadow' differs.
--- ocil:ssg-file_groupowner_etc_shadow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_shadow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/shadow
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/shadow does not have a group owner of
 root
-      Is it the case that /etc/shadow does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_shells'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_shells
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_shells
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/shells, run the command:
-$ sudo chgrp root /etc/shells
+
+  $ sudo chgrp root /etc/shells
 
 [reference]:
 AC-3

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_shells' differs.
--- ocil:ssg-file_groupowner_etc_shells_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_shells_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/shells
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/shells does not have a group owner of
 root
-      Is it the case that /etc/shells does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_backup_etc_group'.
--- xccdf_org.ssgproject.content_rule_file_owner_backup_etc_group
+++ xccdf_org.ssgproject.content_rule_file_owner_backup_etc_group
@@ -3,7 +3,8 @@
 Verify User Who Owns Backup group File
 
 [description]:
-To properly set the owner of /etc/group-, run the command: $ sudo chown root /etc/group-
+To properly set the owner of /etc/group-, run the command:
+$ sudo chown root /etc/group-
 
 [reference]:
 CCI-000366

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_backup_etc_gshadow'.
--- xccdf_org.ssgproject.content_rule_file_owner_backup_etc_gshadow
+++ xccdf_org.ssgproject.content_rule_file_owner_backup_etc_gshadow
@@ -3,7 +3,8 @@
 Verify User Who Owns Backup gshadow File
 
 [description]:
-To properly set the owner of /etc/gshadow-, run the command: $ sudo chown root /etc/gshadow-
+To properly set the owner of /etc/gshadow-, run the command:
+$ sudo chown root /etc/gshadow-
 
 [reference]:
 CCI-000366

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_backup_etc_passwd'.
--- xccdf_org.ssgproject.content_rule_file_owner_backup_etc_passwd
+++ xccdf_org.ssgproject.content_rule_file_owner_backup_etc_passwd
@@ -3,7 +3,8 @@
 Verify User Who Owns Backup passwd File
 
 [description]:
-To properly set the owner of /etc/passwd-, run the command: $ sudo chown root /etc/passwd-
+To properly set the owner of /etc/passwd-, run the command:
+$ sudo chown root /etc/passwd-
 
 [reference]:
 CCI-000366

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_backup_etc_shadow'.
--- xccdf_org.ssgproject.content_rule_file_owner_backup_etc_shadow
+++ xccdf_org.ssgproject.content_rule_file_owner_backup_etc_shadow
@@ -3,7 +3,8 @@
 Verify Group Who Owns Backup shadow File
 
 [description]:
-To properly set the owner of /etc/shadow-, run the command: $ sudo chown root /etc/shadow-
+To properly set the owner of /etc/shadow-, run the command:
+$ sudo chown root /etc/shadow-
 
 [reference]:
 CCI-000366

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_group'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_group
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_group
@@ -3,7 +3,8 @@
 Verify User Who Owns group File
 
 [description]:
-To properly set the owner of /etc/group, run the command: $ sudo chown root /etc/group
+To properly set the owner of /etc/group, run the command:
+$ sudo chown root /etc/group
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_gshadow'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_gshadow
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_gshadow
@@ -3,7 +3,8 @@
 Verify User Who Owns gshadow File
 
 [description]:
-To properly set the owner of /etc/gshadow, run the command: $ sudo chown root /etc/gshadow
+To properly set the owner of /etc/gshadow, run the command:
+$ sudo chown root /etc/gshadow
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_passwd'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_passwd
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_passwd
@@ -3,7 +3,8 @@
 Verify User Who Owns passwd File
 
 [description]:
-To properly set the owner of /etc/passwd, run the command: $ sudo chown root /etc/passwd
+To properly set the owner of /etc/passwd, run the command:
+$ sudo chown root /etc/passwd
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_shadow'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_shadow
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_shadow
@@ -3,7 +3,8 @@
 Verify User Who Owns shadow File
 
 [description]:
-To properly set the owner of /etc/shadow, run the command: $ sudo chown root /etc/shadow
+To properly set the owner of /etc/shadow, run the command:
+$ sudo chown root /etc/shadow
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_shells'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_shells
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_shells
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/shells, run the command:
-$ sudo chown root /etc/shells
+
+  $ sudo chown root /etc/shells
 
 [reference]:
 AC-3

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_var_log
+++ xccdf_org.ssgproject.content_rule_file_groupowner_var_log
@@ -3,7 +3,8 @@
 Verify Group Who Owns /var/log Directory
 
 [description]:
-To properly set the group owner of /var/log, run the command: $ sudo chgrp root /var/log
+To properly set the group owner of /var/log, run the command:
+$ sudo chgrp root /var/log
 
 [reference]:
 CCI-001314

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log' differs.
--- ocil:ssg-file_groupowner_var_log_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_var_log_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /var/log
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /var/log does not have a group owner of
 root
-      Is it the case that /var/log does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages
+++ xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages
@@ -3,7 +3,8 @@
 Verify Group Who Owns /var/log/messages File
 
 [description]:
-To properly set the group owner of /var/log/messages, run the command: $ sudo chgrp root /var/log/messages
+To properly set the group owner of /var/log/messages, run the command:
+$ sudo chgrp root /var/log/messages
 
 [reference]:
 CCI-001314

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_messages' differs.
--- ocil:ssg-file_groupowner_var_log_messages_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_var_log_messages_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /var/log/messages
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /var/log/messages does not have a group owner of
 root
-      Is it the case that /var/log/messages does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_syslog'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_var_log_syslog
+++ xccdf_org.ssgproject.content_rule_file_groupowner_var_log_syslog
@@ -3,7 +3,8 @@
 Verify Group Who Owns /var/log/syslog File
 
 [description]:
-To properly set the group owner of /var/log/syslog, run the command: $ sudo chgrp adm /var/log/syslog
+To properly set the group owner of /var/log/syslog, run the command:
+$ sudo chgrp adm /var/log/syslog
 
 [reference]:
 CCI-001314

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_var_log_syslog' differs.
--- ocil:ssg-file_groupowner_var_log_syslog_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_var_log_syslog_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /var/log/syslog
 If properly configured, the output should indicate the following group-owner:
+
+  adm 
+  
+      Is it the case that /var/log/syslog does not have a group owner of
 adm
-      Is it the case that /var/log/syslog does not have a group owner of adm?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_var_log'.
--- xccdf_org.ssgproject.content_rule_file_owner_var_log
+++ xccdf_org.ssgproject.content_rule_file_owner_var_log
@@ -3,7 +3,8 @@
 Verify User Who Owns /var/log Directory
 
 [description]:
-To properly set the owner of /var/log, run the command: $ sudo chown root /var/log
+To properly set the owner of /var/log, run the command:
+$ sudo chown root /var/log
 
 [reference]:
 CCI-001314

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_var_log_messages'.
--- xccdf_org.ssgproject.content_rule_file_owner_var_log_messages
+++ xccdf_org.ssgproject.content_rule_file_owner_var_log_messages
@@ -3,7 +3,8 @@
 Verify User Who Owns /var/log/messages File
 
 [description]:
-To properly set the owner of /var/log/messages, run the command: $ sudo chown root /var/log/messages
+To properly set the owner of /var/log/messages, run the command:
+$ sudo chown root /var/log/messages
 
 [reference]:
 CCI-001314

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_var_log_syslog'.
--- xccdf_org.ssgproject.content_rule_file_owner_var_log_syslog
+++ xccdf_org.ssgproject.content_rule_file_owner_var_log_syslog
@@ -3,7 +3,8 @@
 Verify User Who Owns /var/log/syslog File
 
 [description]:
-To properly set the owner of /var/log/syslog, run the command: $ sudo chown root /var/log/syslog
+To properly set the owner of /var/log/syslog, run the command:
+$ sudo chown root /var/log/syslog
 
 [reference]:
 CCI-001314

New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sysctld'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sysctld
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sysctld
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/sysctl.d Directory
 
 [description]:
-To properly set the group owner of /etc/sysctl.d, run the command: $ sudo chgrp root /etc/sysctl.d
+To properly set the group owner of /etc/sysctl.d, run the command:
+$ sudo chgrp root /etc/sysctl.d
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_sysctld' differs.
--- ocil:ssg-directory_groupowner_etc_sysctld_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_sysctld_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/sysctl.d
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/sysctl.d does not have a group owner of
 root
-      Is it the case that /etc/sysctl.d does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_sysctld'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_sysctld
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_sysctld
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/sysctl.d Directory
 
 [description]:
-To properly set the owner of /etc/sysctl.d, run the command: $ sudo chown root /etc/sysctl.d
+To properly set the owner of /etc/sysctl.d, run the command:
+$ sudo chown root /etc/sysctl.d
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_selinux'.
--- xccdf_org.ssgproject.content_rule_directory_groupowner_etc_selinux
+++ xccdf_org.ssgproject.content_rule_directory_groupowner_etc_selinux
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/selinux Directory
 
 [description]:
-To properly set the group owner of /etc/selinux, run the command: $ sudo chgrp root /etc/selinux
+To properly set the group owner of /etc/selinux, run the command:
+$ sudo chgrp root /etc/selinux
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_directory_groupowner_etc_selinux' differs.
--- ocil:ssg-directory_groupowner_etc_selinux_ocil:questionnaire:1
+++ ocil:ssg-directory_groupowner_etc_selinux_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/selinux
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/selinux does not have a group owner of
 root
-      Is it the case that /etc/selinux does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_directory_owner_etc_selinux'.
--- xccdf_org.ssgproject.content_rule_directory_owner_etc_selinux
+++ xccdf_org.ssgproject.content_rule_directory_owner_etc_selinux
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/selinux Directory
 
 [description]:
-To properly set the owner of /etc/selinux, run the command: $ sudo chown root /etc/selinux
+To properly set the owner of /etc/selinux, run the command:
+$ sudo chown root /etc/selinux
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_sestatus_conf'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_sestatus_conf
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_sestatus_conf
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/sestatus.conf File
 
 [description]:
-To properly set the group owner of /etc/sestatus.conf, run the command: $ sudo chgrp root /etc/sestatus.conf
+To properly set the group owner of /etc/sestatus.conf, run the command:
+$ sudo chgrp root /etc/sestatus.conf
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_sestatus_conf' differs.
--- ocil:ssg-file_groupowner_etc_sestatus_conf_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_sestatus_conf_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/sestatus.conf
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/sestatus.conf does not have a group owner of
 root
-      Is it the case that /etc/sestatus.conf does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_sestatus_conf'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_sestatus_conf
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_sestatus_conf
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/sestatus.conf File
 
 [description]:
-To properly set the owner of /etc/sestatus.conf, run the command: $ sudo chown root /etc/sestatus.conf
+To properly set the owner of /etc/sestatus.conf, run the command:
+$ sudo chown root /etc/sestatus.conf
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_d'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_d
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_d
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/cron.d, run the command:
-$ sudo chgrp root /etc/cron.d
+
+  $ sudo chgrp root /etc/cron.d
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_d' differs.
--- ocil:ssg-file_groupowner_cron_d_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_d_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.d
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.d does not have a group owner of
 root
-      Is it the case that /etc/cron.d does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_daily'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_daily
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_daily
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/cron.daily, run the command:
-$ sudo chgrp root /etc/cron.daily
+
+  $ sudo chgrp root /etc/cron.daily
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_daily' differs.
--- ocil:ssg-file_groupowner_cron_daily_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_daily_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.daily
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.daily does not have a group owner of
 root
-      Is it the case that /etc/cron.daily does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_hourly'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_hourly
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_hourly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/cron.hourly, run the command:
-$ sudo chgrp root /etc/cron.hourly
+
+  $ sudo chgrp root /etc/cron.hourly
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_hourly' differs.
--- ocil:ssg-file_groupowner_cron_hourly_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_hourly_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.hourly
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.hourly does not have a group owner of
 root
-      Is it the case that /etc/cron.hourly does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_monthly'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_monthly
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_monthly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/cron.monthly, run the command:
-$ sudo chgrp root /etc/cron.monthly
+
+  $ sudo chgrp root /etc/cron.monthly
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_monthly' differs.
--- ocil:ssg-file_groupowner_cron_monthly_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_monthly_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.monthly
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.monthly does not have a group owner of
 root
-      Is it the case that /etc/cron.monthly does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_weekly'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_weekly
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_weekly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/cron.weekly, run the command:
-$ sudo chgrp root /etc/cron.weekly
+
+  $ sudo chgrp root /etc/cron.weekly
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_weekly' differs.
--- ocil:ssg-file_groupowner_cron_weekly_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_weekly_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.weekly
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.weekly does not have a group owner of
 root
-      Is it the case that /etc/cron.weekly does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_crontab'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_crontab
+++ xccdf_org.ssgproject.content_rule_file_groupowner_crontab
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/crontab, run the command:
-$ sudo chgrp root /etc/crontab
+
+  $ sudo chgrp root /etc/crontab
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_crontab' differs.
--- ocil:ssg-file_groupowner_crontab_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_crontab_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/crontab
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/crontab does not have a group owner of
 root
-      Is it the case that /etc/crontab does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_d'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_d
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_d
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/cron.d, run the command:
-$ sudo chown root /etc/cron.d
+
+  $ sudo chown root /etc/cron.d
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_daily'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_daily
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_daily
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/cron.daily, run the command:
-$ sudo chown root /etc/cron.daily
+
+  $ sudo chown root /etc/cron.daily
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_hourly'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_hourly
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_hourly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/cron.hourly, run the command:
-$ sudo chown root /etc/cron.hourly
+
+  $ sudo chown root /etc/cron.hourly
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_monthly'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_monthly
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_monthly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/cron.monthly, run the command:
-$ sudo chown root /etc/cron.monthly
+
+  $ sudo chown root /etc/cron.monthly
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_weekly'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_weekly
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_weekly
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/cron.weekly, run the command:
-$ sudo chown root /etc/cron.weekly
+
+  $ sudo chown root /etc/cron.weekly
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_crontab'.
--- xccdf_org.ssgproject.content_rule_file_owner_crontab
+++ xccdf_org.ssgproject.content_rule_file_owner_crontab
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the owner of /etc/crontab, run the command:
-$ sudo chown root /etc/crontab
+
+  $ sudo chown root /etc/crontab
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_at_allow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_at_allow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_at_allow
@@ -6,7 +6,8 @@
 If /etc/at.allow exists, it must be group-owned by root.
 
 To properly set the group owner of /etc/at.allow, run the command:
-$ sudo chgrp root /etc/at.allow
+
+  $ sudo chgrp root /etc/at.allow
 
 [reference]:
 4.1.2.1

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_at_allow' differs.
--- ocil:ssg-file_groupowner_at_allow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_at_allow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/at.allow
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/at.allow does not have a group owner of
 root
-      Is it the case that /etc/at.allow does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_allow'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_cron_allow
+++ xccdf_org.ssgproject.content_rule_file_groupowner_cron_allow
@@ -6,7 +6,8 @@
 If /etc/cron.allow exists, it must be group-owned by root.
 
 To properly set the group owner of /etc/cron.allow, run the command:
-$ sudo chgrp root /etc/cron.allow
+
+  $ sudo chgrp root /etc/cron.allow
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_cron_allow' differs.
--- ocil:ssg-file_groupowner_cron_allow_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_cron_allow_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/cron.allow
 If properly configured, the output should indicate the following group-owner:
+
+  root 
+  
+      Is it the case that /etc/cron.allow does not have a group owner of
 root
-      Is it the case that /etc/cron.allow does not have a group owner of root?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_cron_allow'.
--- xccdf_org.ssgproject.content_rule_file_owner_cron_allow
+++ xccdf_org.ssgproject.content_rule_file_owner_cron_allow
@@ -6,7 +6,8 @@
 If /etc/cron.allow exists, it must be owned by root.
 
 To properly set the owner of /etc/cron.allow, run the command:
-$ sudo chown root /etc/cron.allow
+
+  $ sudo chown root /etc/cron.allow
 
 [reference]:
 12

New content has different text for rule 'xccdf_org.ssgproject.content_rule_http_configure_log_file_ownership'.
--- xccdf_org.ssgproject.content_rule_http_configure_log_file_ownership
+++ xccdf_org.ssgproject.content_rule_http_configure_log_file_ownership
@@ -7,10 +7,14 @@
 the path for httpd logs is /var/log/httpd/
 
 To properly set the owner of /var/log/httpd, run the command:
-$ sudo chown root /var/log/httpd 
+
+  $ sudo chown root /var/log/httpd 
+  
+
 
 To properly set the owner of /var/log/httpd/*, run the command:
-$ sudo chown root /var/log/httpd/*
+
+  $ sudo chown root /var/log/httpd/*
 
 [rationale]:
 A major tool in exploring the web site use, attempted use, unusual conditions,

OCIL for rule 'xccdf_org.ssgproject.content_rule_http_configure_log_file_ownership' differs.
--- ocil:ssg-http_configure_log_file_ownership_ocil:questionnaire:1
+++ ocil:ssg-http_configure_log_file_ownership_ocil:questionnaire:1
@@ -1,8 +1,13 @@
 
 To properly set the owner of /var/log/httpd, run the command:
-$ sudo chown root /var/log/httpd 
+
+  $ sudo chown root /var/log/httpd 
+  
+
 
 To properly set the owner of /var/log/httpd/*, run the command:
-$ sudo chown root /var/log/httpd/* 
+
+  $ sudo chown root /var/log/httpd/* 
+  
       Is it the case that ?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_chrony_keys'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_etc_chrony_keys
+++ xccdf_org.ssgproject.content_rule_file_groupowner_etc_chrony_keys
@@ -3,7 +3,8 @@
 Verify Group Who Owns /etc/chrony.keys File
 
 [description]:
-To properly set the group owner of /etc/chrony.keys, run the command: $ sudo chgrp chrony /etc/chrony.keys
+To properly set the group owner of /etc/chrony.keys, run the command:
+$ sudo chgrp chrony /etc/chrony.keys
 
 [reference]:
 R50

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_etc_chrony_keys' differs.
--- ocil:ssg-file_groupowner_etc_chrony_keys_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_etc_chrony_keys_ocil:questionnaire:1
@@ -2,6 +2,10 @@
 run the command:
 $ ls -lL /etc/chrony.keys
 If properly configured, the output should indicate the following group-owner:
+
+  chrony 
+  
+      Is it the case that /etc/chrony.keys does not have a group owner of
 chrony
-      Is it the case that /etc/chrony.keys does not have a group owner of chrony?
+?
       
New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_owner_etc_chrony_keys'.
--- xccdf_org.ssgproject.content_rule_file_owner_etc_chrony_keys
+++ xccdf_org.ssgproject.content_rule_file_owner_etc_chrony_keys
@@ -3,7 +3,8 @@
 Verify User Who Owns /etc/chrony.keys File
 
 [description]:
-To properly set the owner of /etc/chrony.keys, run the command: $ sudo chown root /etc/chrony.keys
+To properly set the owner of /etc/chrony.keys, run the command:
+$ sudo chown root /etc/chrony.keys
 
 [reference]:
 R50

New content has different text for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_sshd_config'.
--- xccdf_org.ssgproject.content_rule_file_groupowner_sshd_config
+++ xccdf_org.ssgproject.content_rule_file_groupowner_sshd_config
@@ -4,7 +4,8 @@
 
 [description]:
 To properly set the group owner of /etc/ssh/sshd_config, run the command:
-$ sudo chgrp root /etc/ssh/sshd_config
+
+  $ sudo chgrp root /etc/ssh/sshd_config
 
 [reference]:
 12

OCIL for rule 'xccdf_org.ssgproject.content_rule_file_groupowner_sshd_config' differs.
--- ocil:ssg-file_groupowner_sshd_config_ocil:questionnaire:1
+++ ocil:ssg-file_groupowner_sshd_config_ocil:questionnaire:1
@@ -

... The diff is trimmed here ...

@dodys dodys self-assigned this Feb 27, 2025
@ericeberry ericeberry marked this pull request as ready for review March 10, 2025 15:36
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Mar 10, 2025
@dodys dodys added this to the 0.1.77 milestone Mar 11, 2025
Copy link
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs a rebase, it cannot have a merge commit, see check failure

Update owner macros to allow | between owners

Update owner macros to allow | between owners

Update owner macros to allow | between owners

Fix failing Ubuntu tests for file_groupowner_var_log

Tests were failing because syslog group does not exist in podman
containers. The added test scenario ensures that rsyslog is
installed and the syslog group exists.
Copy link

codeclimate bot commented Mar 11, 2025

Code Climate has analyzed commit b01b82a and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 62.0% (0.0% change).

View more on Code Climate.

Copy link
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, thanks!

@dodys dodys merged commit e96903e into ComplianceAsCode:master Mar 12, 2025
99 of 102 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-ok-to-test Used by openshift-ci bot.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants