| author | Drew Fisher <drew.fisher@oracle.com> |
| Thu, 23 Mar 2017 08:04:21 -0700 | |
| changeset 7801 | 0dc67d04f8bb |
| parent 5111 | e68e059c3456 |
| permissions | -rw-r--r-- |
|
5111
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
1 |
This patch adds the smf, smfproperty and virtualization probes to the list |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
2 |
of supported probes. |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
3 |
This patch has been submitted upstream, but is being negotiated am hoping |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
4 |
to have it accepted by 2015-Dec-15. |
|
1369
20813e08fff3
16186483 Port openscap 0.9.7 to solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1136
diff
changeset
|
5 |
|
|
5111
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
6 |
--- openscap-1.2.6/src/OVAL/oval_probe.c.~1~ 2015-11-12 10:51:29.490353461 -0800 |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
7 |
+++ openscap-1.2.6/src/OVAL/oval_probe.c 2015-11-12 10:54:01.882198119 -0800 |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
8 |
@@ -91,7 +91,10 @@ |
|
1136
226e8d9d2ff0
16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
OVAL_PROBE_EXTERNAL(OVAL_UNIX_FILEEXTENDEDATTRIBUTE, "fileextendedattribute"), |
|
226e8d9d2ff0
16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"), |
|
5111
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
11 |
OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"), |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
12 |
- OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink") |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
13 |
+ OVAL_PROBE_EXTERNAL(OVAL_UNIX_SYMLINK, "symlink"), |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
14 |
+ OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"), |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
15 |
+ OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY,"smfproperty"), |
|
e68e059c3456
22188277 upgrade openscap to 1.2.6
Jacob Varughese <jacob.varughese@oracle.com>
parents:
1369
diff
changeset
|
16 |
+ OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_VIRTUALIZATIONINFO, "virtualizationinfo") |
|
1136
226e8d9d2ff0
16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
}; |
|
226e8d9d2ff0
16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
18 |
|
|
226e8d9d2ff0
16186528 Implement SMF probe to support the OVAL schema for solaris
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
19 |
#define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0]) |