Fixed broken build issues on solaris.

GovReady · Apr 14, 2014 · b426229 · b426229
1 parent cfdd1df
commit b426229
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/OVAL/probes/probe/signal_handler.c b/src/OVAL/probes/probe/signal_handler.c
@@ -125,9 +125,9 @@ void *probe_signal_handler(void *arg)
 			 * cancelability), but at most 60 seconds per thread.
 			 */
 			for (; coll.cnt > 0; --coll.cnt) {
+				probe_worker_t *thr = coll.thr[coll.cnt - 1];
 #if defined(HAVE_PTHREAD_TIMEDJOIN_NP) && defined(HAVE_CLOCK_GETTIME)
 				struct timespec j_tm;
-				probe_worker_t *thr = coll.thr[coll.cnt - 1];
 
 				if (clock_gettime(CLOCK_REALTIME, &j_tm) == -1) {
 					dE("clock_gettime(CLOCK_REALTIME): %d, %s.\n", errno, strerror(errno));

diff --git a/src/OVAL/probes/unix/solaris/isainfo.c b/src/OVAL/probes/unix/solaris/isainfo.c
@@ -92,8 +92,12 @@ int read_sysinfo(probe_ctx *ctx) {
 	if (sysinfo(SI_ARCHITECTURE_K, result.kernel_isa, MAX_STR_RESULT) == -1) {
 		return err;
 	}
-
+#if defined(__SVR4) && defined(__sun)
+	if ((sysinfo(SI_ARCHITECTURE_32, result.application_isa, MAX_STR_RESULT) == -1) &&
+	   (sysinfo(SI_ARCHITECTURE_64, result.application_isa, MAX_STR_RESULT) == -1)) {
+#else
 	if (sysinfo(SI_ARCHITECTURE_NATIVE, result.application_isa, MAX_STR_RESULT) == -1) {
+#endif
 		return err;
 	}
 

diff --git a/src/XCCDF/tailoring.c b/src/XCCDF/tailoring.c
@@ -233,7 +233,11 @@ xmlNodePtr xccdf_tailoring_to_dom(struct xccdf_tailoring *tailoring, xmlDocPtr d
 	xmlNode *tailoring_node = xmlNewNode(ns_xccdf, BAD_CAST "Tailoring");
 
 	const char *xccdf_version = xccdf_version_info_get_version(version_info);
+#ifdef __USE_GNU
 	if (strverscmp(xccdf_version, "1.1") >= 0 && strverscmp(xccdf_version, "1.2") < 0) {
+#else
+	if (strcmp(xccdf_version, "1.1") >= 0 && strcmp(xccdf_version, "1.2") < 0) {
+#endif
 		// XCCDF 1.1 does not support Tailoring!
 		// However we will allow Tailoring export if it is done to an external
 		// file. The namespace will be our custom xccdf-1.1-tailoring extension
@@ -250,7 +254,11 @@ xmlNodePtr xccdf_tailoring_to_dom(struct xccdf_tailoring *tailoring, xmlDocPtr d
 			BAD_CAST "cdf-11-tailoring"
 		);
 	}
+#ifdef __USE_GNU
 	else if (strverscmp(xccdf_version, "1.1") < 0) {
+#else
+	else if (strcmp(xccdf_version, "1.1") < 0) {
+#endif
 		oscap_seterr(OSCAP_EFAMILY_XML, "XCCDF Tailoring isn't supported in XCCDF version '%s',"
 			"nor does openscap have a custom extension for this scenario. "
 			"XCCDF Tailoring requires XCCDF 1.1 and higher, 1.2 is recommended.");