Skip to content

Deprecating obsolete xinetd and runlevel tests per #309 and #304 #319

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.

Sign up for GitHub

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

Open
vanderpol wants to merge 1 commit into
base: 5.12.3_develop
Choose a base branch
from
+52 −2
Open

Deprecating obsolete xinetd and runlevel tests per #309 and #304 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions oval-schemas/unix-definitions-schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1735,6 +1735,17 @@
<oval:item target_namespace="http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#unix">runlevel_item</oval:item>
</oval:element_mapping>
</xsd:appinfo>
<xsd:appinfo>
<oval:deprecated_info>
<oval:version>5.12.3</oval:version>
<oval:reason>The runlevel_test has been deprecated because runlevel is obsolete. The runlevel_test may be removed in a future version of the language.</oval:reason>
</oval:deprecated_info>
<sch:pattern id="unix-def_runleveltst_dep">
<sch:rule context="unix-def:runlevel_test">
<sch:report test="true()">DEPRECATED TEST: <sch:value-of select="name()"/> ID: <sch:value-of select="@id"/></sch:report>
</sch:rule>
</sch:pattern>
</xsd:appinfo>
<xsd:appinfo>
<sch:pattern id="unix-def_runleveltst">
<sch:rule context="unix-def:runlevel_test/unix-def:object">
Expand Down Expand Up @@ -2699,6 +2710,19 @@
<oval:item target_namespace="http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#unix">xinetd_item</oval:item>
</oval:element_mapping>
</xsd:appinfo>

<xsd:appinfo>
<oval:deprecated_info>
<oval:version>5.12.3</oval:version>
<oval:reason>The xinetd_test has been deprecated because xinetd is obsolete. The xinetd_test may be removed in a future version of the language.</oval:reason>
</oval:deprecated_info>
<sch:pattern id="unix-def_xinetttst_dep">
<sch:rule context="unix-def:xinetd_test">
<sch:report test="true()">DEPRECATED TEST: <sch:value-of select="name()"/> ID: <sch:value-of select="@id"/></sch:report>
</sch:rule>
</sch:pattern>
</xsd:appinfo>

<xsd:appinfo>
<sch:pattern id="unix-def_xinetdtst">
<sch:rule context="unix-def:xinetd_test/unix-def:object">
Expand Down
30 changes: 28 additions & 2 deletions oval-schemas/unix-system-characteristics-schema.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,20 @@
<xsd:element name="runlevel_item" substitutionGroup="oval-sc:item">
<xsd:annotation>
<xsd:documentation>The runlevel item holds information about the start or kill state of a specified service at a given runlevel. Each runlevel item contains service name and runlevel information as well as start and kill information. It extends the standard ItemType as defined in the oval-system-characteristics schema and one should refer to the ItemType description for more information.</xsd:documentation>
</xsd:annotation>

<xsd:appinfo>
<oval:deprecated_info>
<oval:version>5.12.3</oval:version>
<oval:reason>The runlevel_item has been deprecated because runlevel is obsolete. The runlevel_item may be removed in a future version of the language.</oval:reason>
</oval:deprecated_info>
<sch:pattern id="unix-sc_runlevelitem_dep">
<sch:rule context="unix-sc:runlevel_item">
<sch:report test="true()">DEPRECATED ITEM: <sch:value-of select="name()"/> ID: <sch:value-of select="@id"/></sch:report>
</sch:rule>
</sch:pattern>
</xsd:appinfo>

</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="oval-sc:ItemType">
Expand Down Expand Up @@ -1177,7 +1190,20 @@
<xsd:element name="xinetd_item" substitutionGroup="oval-sc:item">
<xsd:annotation>
<xsd:documentation>The xinetd item holds information associated with different Internet services. It extends the standard ItemType as defined in the oval-system-characteristics schema and one should refer to the ItemType description for more information.</xsd:documentation>
</xsd:annotation>

<xsd:appinfo>
<oval:deprecated_info>
<oval:version>5.12.3</oval:version>
<oval:reason>The xinetd_item has been deprecated because xinetd is obsolete. The xinetd_item may be removed in a future version of the language.</oval:reason>
</oval:deprecated_info>
<sch:pattern id="unix-sc_xinetditem_dep">
<sch:rule context="unix-sc:xinetd_item">
<sch:report test="true()">DEPRECATED ITEM: <sch:value-of select="name()"/> ID: <sch:value-of select="@id"/></sch:report>
</sch:rule>
</sch:pattern>
</xsd:appinfo>

</xsd:annotation>
<xsd:complexType>
<xsd:complexContent>
<xsd:extension base="oval-sc:ItemType">
Expand Down