Blame SOURCES/bz1182242-0e3c7e68-Export-var_check-together.patch
|
 |
2f7d78 |
From 0e3c7e6833630d55d00ac3e91cdb2ae067fabcb6 Mon Sep 17 00:00:00 2001
|
|
|
2f7d78 |
From: Martin Preisler <mpreisle@redhat.com>
|
|
|
2f7d78 |
Date: Fri, 16 Jan 2015 15:57:31 +0100
|
|
|
2f7d78 |
Subject: [PATCH] Export @var_check together with @var_ref for objects
|
|
|
2f7d78 |
|
|
|
2f7d78 |
Addresses rhbz#1182242 and rhbz#1159289.
|
|
|
2f7d78 |
---
|
|
|
2f7d78 |
src/OVAL/oval_objectContent.c | 3 +--
|
|
|
2f7d78 |
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
2f7d78 |
|
|
|
2f7d78 |
diff --git a/src/OVAL/oval_objectContent.c b/src/OVAL/oval_objectContent.c
|
|
|
2f7d78 |
index eb59c25..ad620d9 100644
|
|
|
2f7d78 |
--- a/src/OVAL/oval_objectContent.c
|
|
|
2f7d78 |
+++ b/src/OVAL/oval_objectContent.c
|
|
|
2f7d78 |
@@ -403,9 +403,8 @@ xmlNode *oval_object_content_to_dom(struct oval_object_content *content, xmlDoc
|
|
|
2f7d78 |
struct oval_entity *entity = oval_object_content_get_entity(content);
|
|
|
2f7d78 |
content_node = oval_entity_to_dom(entity, doc, parent);
|
|
|
2f7d78 |
oval_check_t check = oval_object_content_get_varCheck(content);
|
|
|
2f7d78 |
- oval_entity_varref_type_t vtype = oval_entity_get_varref_type(entity);
|
|
|
2f7d78 |
|
|
|
2f7d78 |
- if (check != OVAL_CHECK_ALL || vtype != OVAL_ENTITY_VARREF_NONE)
|
|
|
2f7d78 |
+ if (check != OVAL_CHECK_ALL || xmlHasProp(content_node, BAD_CAST "var_ref"))
|
|
|
2f7d78 |
xmlNewProp(content_node, BAD_CAST "var_check", BAD_CAST oval_check_get_text(check));
|
|
|
2f7d78 |
}
|
|
|
2f7d78 |
break;
|
|
|
2f7d78 |
--
|
|
|
2f7d78 |
1.9.3
|
|
|
2f7d78 |
|