Permalink
Browse files

Merge pull request #2086 from redhatrises/fix_pam_retry_check

Check pam_retry OVAL check for cracklib configuration only for OS versions under 7
  • Loading branch information...
mpreisler committed Jun 19, 2017
2 parents 378931e + 9467165 commit f50a946a69ed2577f9a3b523a012acdc78a63efa
Showing with 12 additions and 9 deletions.
  1. +12 −9 shared/templates/static/oval/accounts_password_pam_retry.xml
@@ -10,17 +10,20 @@
<description>The password retry should meet minimum requirements</description>
</metadata>
<criteria operator="OR" comment="Conditions for retry are satisfied">
<criteria operator="AND" comment="system is RHEL6 with pam_cracklib configured">
<extend_definition comment="RHEL6 OS installed" definition_ref="installed_OS_is_rhel6" />
<criteria operator="AND" comment="system with pam_cracklib configured">
<criteria operator="OR" comment="OSes with cracklib primarily used">
<extend_definition comment="RHEL6 OS installed" definition_ref="installed_OS_is_rhel6" />
<extend_definition comment="CentOS6 OS installed" definition_ref="installed_OS_is_centos6" />
</criteria>
<criterion comment="rhel6 pam_cracklib" test_ref="test_password_pam_cracklib_retry" />
</criteria>
<criteria operator="AND" comment="system is RHEL7 with pam_pwquality configured">
<extend_definition comment="RHEL7 OS installed" definition_ref="installed_OS_is_rhel7" />
<criterion comment="rhel7 pam_pwquality" test_ref="test_password_pam_pwquality_retry" />
</criteria>
<criteria operator="AND" comment="system is Fedora with pam_pwquality configured">
<extend_definition comment="Fedora OS installed" definition_ref="installed_OS_is_fedora" />
<criterion comment="Fedora pam_pwquality" test_ref="test_password_pam_pwquality_retry" />
<criteria operator="AND" comment="system with pam_pwquality configured">
<criteria operator="OR" comment="OSes with pwquality primarily used">
<extend_definition comment="RHEL7 OS installed" definition_ref="installed_OS_is_rhel7" />
<extend_definition comment="CentOS7 OS installed" definition_ref="installed_OS_is_centos7" />
<extend_definition comment="Fedora OS installed" definition_ref="installed_OS_is_fedora" />
</criteria>
<criterion comment="pam_pwquality" test_ref="test_password_pam_pwquality_retry" />
</criteria>
</criteria>
</definition>

0 comments on commit f50a946

Please sign in to comment.