1 This patch provides the implementation of the smfproperty probe |
1 This patch provides the implementation of the virtualizationinfo probe |
2 on solaris. |
2 on solaris. |
3 This patch will be contributed upstream by 2015-Aug-01. |
3 This patch will be contributed upstream by 2015-Dec-15. |
4 --- openscap-1.2.3/src/OVAL/oval_probe.c.~3~ 2015-06-09 10:47:16.093295773 -0700 |
|
5 +++ openscap-1.2.3/src/OVAL/oval_probe.c 2015-06-09 10:45:27.608974352 -0700 |
|
6 @@ -92,7 +92,8 @@ |
|
7 OVAL_PROBE_EXTERNAL(OVAL_UNIX_GCONF, "gconf"), |
|
8 OVAL_PROBE_EXTERNAL(OVAL_UNIX_ROUTINGTABLE, "routingtable"), |
|
9 OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMF, "smf"), |
|
10 - OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY, "smfproperty") |
|
11 + OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_SMFPROPERTY, "smfproperty"), |
|
12 + OVAL_PROBE_EXTERNAL(OVAL_SOLARIS_VIRTUALIZATIONINFO, "virtualizationinfo") |
|
13 }; |
|
14 |
|
15 #define __PROBE_META_COUNT (sizeof OSCAP_GSYM(__probe_meta)/sizeof OSCAP_GSYM(__probe_meta)[0]) |
|
16 --- openscap-1.2.3/src/OVAL/public/oval_types.h.~2~ 2015-06-09 12:38:09.977190833 -0700 |
|
17 +++ openscap-1.2.3/src/OVAL/public/oval_types.h 2015-06-09 12:40:10.173236122 -0700 |
|
18 @@ -239,7 +239,8 @@ |
|
19 OVAL_SOLARIS_PATCH54 = OVAL_FAMILY_SOLARIS + 5, |
|
20 OVAL_SOLARIS_NDD = OVAL_FAMILY_SOLARIS + 6, |
|
21 OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7, |
|
22 - OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8 |
|
23 + OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8, |
|
24 + OVAL_SOLARIS_VIRTUALIZATIONINFO = OVAL_FAMILY_SOLARIS + 9 |
|
25 } oval_solaris_subtype_t; |
|
26 |
|
27 /// Unix subtypes |
|
28 --- openscap-1.2.3/configure.ac.~4~ 2015-06-09 10:49:21.540749400 -0700 |
4 --- openscap-1.2.3/configure.ac.~4~ 2015-06-09 10:49:21.540749400 -0700 |
29 +++ openscap-1.2.3/configure.ac 2015-06-09 10:54:00.258561346 -0700 |
5 +++ openscap-1.2.3/configure.ac 2015-06-09 10:54:00.258561346 -0700 |
30 @@ -261,6 +261,10 @@ |
6 @@ -261,6 +261,10 @@ |
31 probe_smfproperty_req_deps_missing= |
7 probe_smfproperty_req_deps_missing= |
32 probe_smfproperty_opt_deps_ok=yes |
8 probe_smfproperty_opt_deps_ok=yes |
326 + return PROBE_ENOOBJ; |
302 + return PROBE_ENOOBJ; |
327 + } |
303 + } |
328 + return get_environment_settings(ctx); |
304 + return get_environment_settings(ctx); |
329 +} |
305 +} |
330 +#endif |
306 +#endif |
|
307 --- openscap-1.2.6/src/OVAL/public/oval_types.h.~1~ 2015-11-10 17:27:49.662710013 -0800 |
|
308 +++ openscap-1.2.6/src/OVAL/public/oval_types.h 2015-11-10 17:28:59.300311475 -0800 |
|
309 @@ -238,7 +238,9 @@ |
|
310 OVAL_SOLARIS_SMF = OVAL_FAMILY_SOLARIS + 4, |
|
311 OVAL_SOLARIS_PATCH54 = OVAL_FAMILY_SOLARIS + 5, |
|
312 OVAL_SOLARIS_NDD = OVAL_FAMILY_SOLARIS + 6, |
|
313 - OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7 |
|
314 + OVAL_SOLARIS_PACKAGECHECK = OVAL_FAMILY_SOLARIS + 7, |
|
315 + OVAL_SOLARIS_SMFPROPERTY = OVAL_FAMILY_SOLARIS + 8, |
|
316 + OVAL_SOLARIS_VIRTUALIZATIONINFO = OVAL_FAMILY_SOLARIS + 9 |
|
317 } oval_solaris_subtype_t; |
|
318 |
|
319 /// Unix subtypes |