[PATCH] fixed use of invalid check types

[Jeffrey Blank]

per Peter's email ... more fixes to come

Jeffrey Blank (1):
  correcting checktypes used in test for accounts_nologin_for_system   
     fix accidental addition of argument to testcheck's oscap
    invocation...we get ovalresults anyway

RHEL6/input/checks/accounts_nologin_for_system.xml |    4 ++--
 RHEL6/input/checks/testcheck.py                    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

[PATCH] correcting checktypes used in test for accounts_nologin_for_system fix accidental addition of argument to testcheck's oscap invocation...we get ovalresults anyway

[Jeffrey Blank]

Signed-off-by: Jeffrey Blank 
---
 RHEL6/input/checks/accounts_nologin_for_system.xml |    4 ++--
 RHEL6/input/checks/testcheck.py                    |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RHEL6/input/checks/accounts_nologin_for_system.xml b/RHEL6/input/checks/accounts_nologin_for_system.xml
index 4cdccdf..fdca860 100644
--- a/RHEL6/input/checks/accounts_nologin_for_system.xml
+++ b/RHEL6/input/checks/accounts_nologin_for_system.xml
@@ -8,10 +8,10 @@
       <description>Login access to non-root system accounts should be disabled.</description>
     </metadata>
     <criteria>
-      <criterion comment="check /etc/passwd for /sbin/nologin on non root system accounts" test_ref="test_20068" />
+      <criterion comment="check /etc/passwd for /sbin/nologin on non root system accounts" test_ref="test_accounts_nologin_for_system" />
     </criteria>
   </definition>
-  <unix:password_test check="all" check_existence="none_exist" id="test_20068" comment="no system user unauthorized shell" version="1">
+  <unix:password_test check="none satisfy" id="test_accounts_nologin_for_system" comment="no system user unauthorized shell" version="1">
     <unix:object object_ref="object_accounts_nologin_for_system" />
     <unix:state state_ref="state_sys_user_unauth_shell" />
   </unix:password_test>
diff --git a/RHEL6/input/checks/testcheck.py b/RHEL6/input/checks/testcheck.py
index 95649c6..54d3f89 100755
--- a/RHEL6/input/checks/testcheck.py
+++ b/RHEL6/input/checks/testcheck.py
@@ -116,7 +116,7 @@ def main():

# content requires OVAL 5.8 support, which is only supported by openscap 0.8 or later
         # for RHEL 6, this implies installing openscap from source until RPM is released
-        subprocess.call("oscap oval eval --oval-results --results "+ fname + "-results " + fname, shell=True)
+        subprocess.call("oscap oval eval --results "+ fname + "-results " + fname, shell=True)
         # perhaps delete tempfile?
         definitions = ET.Element("definitions")
         tests = ET.Element("tests")