Blame SOURCES/scap-security-guide-0.1.53-remove_ub1404-PR_6154.patch

fe0dde
diff --git a/shared/templates/template_OVAL_service_disabled b/shared/templates/template_OVAL_service_disabled
fe0dde
index 941c289c43..61d3748688 100644
fe0dde
--- a/shared/templates/template_OVAL_service_disabled
fe0dde
+++ b/shared/templates/template_OVAL_service_disabled
fe0dde
@@ -85,36 +85,7 @@
fe0dde
 
fe0dde
 {{% else %}}
fe0dde
 
fe0dde
-  {{% if product == "ubuntu1404" %}}
fe0dde
-
fe0dde
-  
fe0dde
-  version="1">
fe0dde
-    {{{ oval_metadata("The " + SERVICENAME + " service should be disabled if possible.", affected_platforms=["multi_platform_all"]) }}}
fe0dde
-   <criteria comment="package {{{ PACKAGENAME }}} removed or service {{{ SERVICENAME }}} is not configured to start" operator="OR">
fe0dde
-    <criterion comment="{{{ PACKAGENAME }}} removed" test_ref="{{{ package_removed_test_id }}}" />
fe0dde
-
fe0dde
-    
fe0dde
-         https://github.com/OpenSCAP/openscap/blob/maint-1.2/src/OVAL/probes/unix/runlevel.c#L210
fe0dde
-
fe0dde
-         (attempt to use it will result into 'error' result), therefore we verify that there
fe0dde
-         DOES NOT exist some "S\d{2}ssh" service record in all of "/etc/rc*.d/" subfolders -->
fe0dde
-    <criterion comment="{{{ SERVICENAME }}} disabled in /etc/rc*.d" test_ref="test_{{{ SERVICENAME }}}_disabled" />
fe0dde
-
fe0dde
-    </criteria>
fe0dde
-  </definition>
fe0dde
-
fe0dde
-  
fe0dde
-  
fe0dde
-   comment="{{{ SERVICENAME }}} disabled in /etc/rc*.d" version="1" >
fe0dde
-   <unix:object object_ref="object_{{{ DAEMONNAME }}}_etc_rcd" />
fe0dde
-  </unix:file_test>
fe0dde
-
fe0dde
-  <unix:file_object id="object_{{{ DAEMONNAME }}}_etc_rcd" comment="/etc/rc*.d/S\d{2}{{{ DAEMONNAME }}}" version="1">
fe0dde
-    <unix:path operation="pattern match">^/etc/rc[0-6S]\.d$</unix:path>
fe0dde
-    <unix:filename operation="pattern match">^S\d{2}{{{ DAEMONNAME }}}$</unix:filename>
fe0dde
-  </unix:file_object>
fe0dde
-
fe0dde
-  {{% elif init_system != "systemd" %}}
fe0dde
+  {{% if init_system != "systemd" %}}
fe0dde
 
fe0dde
   {{# we are not using systemd, it doesn't matter if we can or cannot use OVAL 5.11, let us just use the runlevel test #}}
fe0dde
 
fe0dde