From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-649142-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 65AB8138819
	for <garchives@archives.gentoo.org>; Wed, 11 Dec 2013 20:53:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7C3F0E0BC2;
	Wed, 11 Dec 2013 20:53:18 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id D7398E0BC2
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Dec 2013 20:53:17 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id A43F033F269
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Dec 2013 20:53:16 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 781D5D004C
	for <gentoo-commits@lists.gentoo.org>; Wed, 11 Dec 2013 20:53:14 +0000 (UTC)
From: "Sven Vermeulen" <swift@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" <swift@gentoo.org>
Message-ID: <1386795089.a6f37929a49613d714cd9ff316084dc295f06928.swift@gentoo>
Subject: [gentoo-commits] proj/hardened-docs:master commit in: xml/SCAP/
X-VCS-Repository: proj/hardened-docs
X-VCS-Files: xml/SCAP/gentoo-oval.xml
X-VCS-Directories: xml/SCAP/
X-VCS-Committer: swift
X-VCS-Committer-Name: Sven Vermeulen
X-VCS-Revision: a6f37929a49613d714cd9ff316084dc295f06928
X-VCS-Branch: master
Date: Wed, 11 Dec 2013 20:53:14 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: d633eeda-e5d7-4b4d-8758-9ee0b39958ca
X-Archives-Hash: 535ce77cd4021e2a8d8fe5324fa3045f

commit:     a6f37929a49613d714cd9ff316084dc295f06928
Author:     Sven Vermeulen <sven.vermeulen <AT> siphos <DOT> be>
AuthorDate: Wed Dec 11 20:51:29 2013 +0000
Commit:     Sven Vermeulen <swift <AT> gentoo <DOT> org>
CommitDate: Wed Dec 11 20:51:29 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-docs.git;a=commit;h=a6f37929

Fix QUOTA check (better output)

---
 xml/SCAP/gentoo-oval.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xml/SCAP/gentoo-oval.xml b/xml/SCAP/gentoo-oval.xml
index 611d021..693d59f 100644
--- a/xml/SCAP/gentoo-oval.xml
+++ b/xml/SCAP/gentoo-oval.xml
@@ -578,9 +578,9 @@
   </lin-def:partition_test>
 
   <ind-def:textfilecontent54_test id="oval:org.gentoo.dev.swift:tst:19"
-    version="1" check="at least one" check_existence="at_least_one_exists"
+    version="2" check="all" check_existence="at_least_one_exists"
     comment="Tests that CONFIG_QUOTA is in the kernel configuration">
-    <!-- The file containing kernel configuration -->
+    <!-- The file containing kernel configuration matching CONFIG_QUOTA -->
     <ind-def:object object_ref="oval:org.gentoo.dev.swift:obj:9" />
     <!-- Match for "^CONFIG_QUOTA=[ym]" -->
     <ind-def:state state_ref="oval:org.gentoo.dev.swift:ste:4" />
@@ -677,9 +677,9 @@
   </lin-def:partition_object>
 
   <ind-def:textfilecontent54_object id="oval:org.gentoo.dev.swift:obj:9"
-    version="1" comment="The file containing kernel configuration">
+    version="2" comment="The file containing kernel configuration CONFIG_QUOTA">
     <ind-def:filepath>/usr/src/linux/.config</ind-def:filepath>
-    <ind-def:pattern operation="pattern match">^CONFIG_.*</ind-def:pattern>
+    <ind-def:pattern operation="pattern match">CONFIG_QUOTA.*</ind-def:pattern>
     <ind-def:instance operation="greater than or equal" datatype="int">1</ind-def:instance>
   </ind-def:textfilecontent54_object>