author | Michael Nestler <Michael.Nestler@Oracle.COM> |
Wed, 15 Oct 2014 09:26:27 -0700 | |
branch | s11u2-sru |
changeset 3398 | 344bcc9ffb11 |
parent 2971 | 5d740e74b68b |
permissions | -rw-r--r-- |
2971
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
1 |
This patch provides ports for oscap-info.c, sce_engince.c, |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
2 |
xccdf_policy.c, tailoring.c for solaris. |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
3 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
4 |
--- openscap-1.0.0/src/XCCDF_POLICY/xccdf_policy.c.~1~ 2013-11-09 23:54:47.459067475 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
5 |
+++ openscap-1.0.0/src/XCCDF_POLICY/xccdf_policy.c 2013-11-25 11:16:50.271326192 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
6 |
@@ -519,7 +519,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
7 |
if (r_value != NULL) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
8 |
selector = xccdf_refine_value_get_selector(r_value); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
9 |
/* This refine value changes the value content */ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
10 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
11 |
+ if (((unsigned int)xccdf_refine_value_get_oper(r_value)) > 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
12 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
13 |
if (xccdf_refine_value_get_oper(r_value) > 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
14 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
15 |
binding->operator = xccdf_refine_value_get_oper(r_value); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
16 |
} else binding->operator = xccdf_value_get_oper(value); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
17 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
18 |
@@ -2158,9 +2162,17 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
19 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
20 |
} else if (xccdf_item_get_type(item) == XCCDF_RULE) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
21 |
/* Perform all changes in rule */ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
22 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
23 |
+ if (((unsigned int)xccdf_refine_rule_get_role(r_rule)) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
24 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
25 |
if (xccdf_refine_rule_get_role(r_rule) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
26 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
27 |
xccdf_rule_set_role((struct xccdf_rule *) item, xccdf_refine_rule_get_role(r_rule)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
28 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
29 |
+ if (!(unsigned int)xccdf_refine_rule_get_severity(r_rule) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
30 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
31 |
if (!xccdf_refine_rule_get_severity(r_rule) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
32 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
33 |
xccdf_rule_set_severity((struct xccdf_rule *) item, xccdf_refine_rule_get_severity(r_rule)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
34 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
35 |
} else {}/* TODO oscap_err ? */; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
36 |
@@ -2384,7 +2396,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
37 |
if (r_rule == NULL) return item; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
38 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
39 |
new_item = (struct xccdf_item *) xccdf_rule_clone((struct xccdf_rule *) item); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
40 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
41 |
+ if (((unsigned int)xccdf_refine_rule_get_role(r_rule)) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
42 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
43 |
if (xccdf_refine_rule_get_role(r_rule) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
44 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
45 |
xccdf_rule_set_role((struct xccdf_rule *) new_item, xccdf_refine_rule_get_role(r_rule)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
46 |
if (xccdf_refine_rule_get_severity(r_rule) > 0) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
47 |
xccdf_rule_set_severity((struct xccdf_rule *) new_item, xccdf_refine_rule_get_severity(r_rule)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
48 |
--- openscap-1.0.0/src/OVAL/probes/probe/signal_handler.c.~1~ 2013-11-09 23:53:15.634238625 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
49 |
+++ openscap-1.0.0/src/OVAL/probes/probe/signal_handler.c 2013-11-25 11:36:03.599412046 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
50 |
@@ -125,9 +125,9 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
51 |
* cancelability), but at most 60 seconds per thread. |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
52 |
*/ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
53 |
for (; coll.cnt > 0; --coll.cnt) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
54 |
+ probe_worker_t *thr = coll.thr[coll.cnt - 1]; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
55 |
#if defined(HAVE_PTHREAD_TIMEDJOIN_NP) && defined(HAVE_CLOCK_GETTIME) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
56 |
struct timespec j_tm; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
57 |
- probe_worker_t *thr = coll.thr[coll.cnt - 1]; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
58 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
59 |
if (clock_gettime(CLOCK_REALTIME, &j_tm) == -1) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
60 |
dE("clock_gettime(CLOCK_REALTIME): %d, %s.\n", errno, strerror(errno)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
61 |
--- openscap-1.0.0/src/XCCDF/tailoring.c.~1~ 2013-11-25 11:57:25.181799219 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
62 |
+++ openscap-1.0.0/src/XCCDF/tailoring.c 2013-11-25 11:55:59.919560234 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
63 |
@@ -197,7 +197,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
64 |
xmlNode *tailoring_node = xmlNewNode(ns_xccdf, BAD_CAST "Tailoring"); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
65 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
66 |
const char *xccdf_version = xccdf_version_info_get_version(version_info); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
67 |
+#ifdef __USE_GNU |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
68 |
if (strverscmp(xccdf_version, "1.1") >= 0 && strverscmp(xccdf_version, "1.2") < 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
69 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
70 |
+ if (strcmp(xccdf_version, "1.1") >= 0 && strcmp(xccdf_version, "1.2") < 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
71 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
72 |
// XCCDF 1.1 does not support Tailoring! |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
73 |
// However we will allow Tailoring export if it is done to an external |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
74 |
// file. The namespace will be our custom xccdf-1.1-tailoring extension |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
75 |
@@ -214,7 +218,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
76 |
BAD_CAST "cdf-11-tailoring" |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
77 |
); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
78 |
} |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
79 |
+#ifdef __USE_GNU |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
80 |
else if (strverscmp(xccdf_version, "1.1") < 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
81 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
82 |
+ else if (strcmp(xccdf_version, "1.1") < 0) { |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
83 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
84 |
oscap_seterr(OSCAP_EFAMILY_XML, "XCCDF Tailoring isn't supported in XCCDF version '%s'," |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
85 |
"nor does openscap have a custom extension for this scenario. " |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
86 |
"XCCDF Tailoring requires XCCDF 1.1 and higher, 1.2 is recommended."); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
87 |
--- openscap-1.0.0/src/SCE/sce_engine.c.~1~ 2013-11-09 23:54:47.457067482 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
88 |
+++ openscap-1.0.0/src/SCE/sce_engine.c 2013-11-25 13:27:10.564328563 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
89 |
@@ -52,7 +52,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
90 |
{ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
91 |
char* href; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
92 |
char* basename; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
93 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
94 |
+ char* std_out; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
95 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
96 |
char* stdout; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
97 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
98 |
int exit_code; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
99 |
struct oscap_stringlist* environment_variables; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
100 |
xccdf_test_result_type_t xccdf_result; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
101 |
@@ -63,7 +67,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
102 |
struct sce_check_result* ret = oscap_alloc(sizeof(struct sce_check_result)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
103 |
ret->href = NULL; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
104 |
ret->basename = NULL; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
105 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
106 |
+ ret->std_out = NULL; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
107 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
108 |
ret->stdout = NULL; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
109 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
110 |
ret->environment_variables = oscap_stringlist_new(); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
111 |
ret->xccdf_result = XCCDF_RESULT_UNKNOWN; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
112 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
113 |
@@ -79,8 +87,13 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
114 |
oscap_free(v->href); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
115 |
if (v->basename) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
116 |
oscap_free(v->basename); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
117 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
118 |
+ if (v->std_out) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
119 |
+ oscap_free(v->std_out); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
120 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
121 |
if (v->stdout) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
122 |
oscap_free(v->stdout); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
123 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
124 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
125 |
oscap_stringlist_free(v->environment_variables); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
126 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
127 |
@@ -115,15 +128,25 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
128 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
129 |
void sce_check_result_set_stdout(struct sce_check_result* v, const char* _stdout) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
130 |
{ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
131 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
132 |
+ if (v->std_out) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
133 |
+ oscap_free(v->std_out); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
134 |
+ v->std_out = strdup(_stdout); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
135 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
136 |
if (v->stdout) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
137 |
oscap_free(v->stdout); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
138 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
139 |
v->stdout = strdup(_stdout); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
140 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
141 |
} |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
142 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
143 |
const char* sce_check_result_get_stdout(struct sce_check_result* v) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
144 |
{ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
145 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
146 |
+ return v->std_out; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
147 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
148 |
return v->stdout; |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
149 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
150 |
} |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
151 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
152 |
void sce_check_result_set_exit_code(struct sce_check_result* v, int exit_code) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
153 |
@@ -178,7 +201,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
154 |
oscap_string_iterator_free(it); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
155 |
fprintf(f, "\t</sceres:environment>\n"); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
156 |
fprintf(f, "\t<sceres:stdout><![CDATA[\n"); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
157 |
+#if defined(__SVR4) && defined(__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
158 |
+ fwrite(v->std_out, 1, strlen(v->std_out), f); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
159 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
160 |
fwrite(v->stdout, 1, strlen(v->stdout), f); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
161 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
162 |
fprintf(f, "\t]]></sceres:stdout>\n"); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
163 |
fprintf(f, "\t<sceres:exit_code>%i</sceres:exit_code>\n", sce_check_result_get_exit_code(v)); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
164 |
fprintf(f, "\t<sceres:result>%s</sceres:result>\n", xccdf_test_result_type_get_text(sce_check_result_get_xccdf_result(v))); |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
165 |
--- openscap-1.0.0/utils/oscap-info.c.~1~ 2012-12-14 02:13:18.113881933 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
166 |
+++ openscap-1.0.0/utils/oscap-info.c 2013-01-16 09:55:13.348770490 -0800 |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
167 |
@@ -34,7 +34,11 @@ |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
168 |
#include <time.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
169 |
#include <sys/types.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
170 |
#include <sys/stat.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
171 |
+#if defined(__SVR4) && defined (__sun) |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
172 |
+#include <limits.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
173 |
+#else |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
174 |
#include <linux/limits.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
175 |
+#endif |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
176 |
|
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
177 |
#include <oscap.h> |
5d740e74b68b
17859035 upgrade openscap-0.9.7 to openscap-1.0.0
Jacob Varughese <jacob.varughese@oracle.com>
parents:
diff
changeset
|
178 |
#include <oval_results.h> |