[Open-scap] [PATCH] Add checks to xccdf_rule_result

[Peter Vrabec]

Hi Josh,

I want to thanks you for our patches.

Note there are some changes in API: 
* export_target and import_source structures were removed. This simplify 
loading/exporting content little bit.
* setting oval_result_directives is also more user friendly since some time
* new high level API for OVAL agent will come soon. I hope it will be possible 
to write scanner applications in ~4 lines with it. :)

Peter.


On Friday, June 04, 2010 10:33:00 pm Josh Adams wrote:
> Changed macros so that xccdf_check's could be added to
> xccdf_rule_result's.
> ---
>  src/XCCDF/public/xccdf.h |    2 +-
>  src/XCCDF/result.c       |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/src/XCCDF/public/xccdf.h b/src/XCCDF/public/xccdf.h
> index d504ac6..fc6fce3 100644
> --- a/src/XCCDF/public/xccdf.h
> +++ b/src/XCCDF/public/xccdf.h
> @@ -2868,7 +2868,7 @@ bool xccdf_rule_result_add_ident(struct
> xccdf_rule_result *obj, struct xccdf_ide /// @memberof xccdf_rule_result
>  bool xccdf_rule_result_add_fix(struct xccdf_rule_result *obj, struct
> xccdf_fix *item); /// @memberof xccdf_rule_result
> -//bool xccdf_rule_result_add_check(struct xccdf_rule_result *obj, struct
> xccdf_check *item); +bool xccdf_rule_result_add_check(struct
> xccdf_rule_result *obj, struct xccdf_check *item); /// @memberof
> xccdf_rule_result
>  bool xccdf_rule_result_add_override(struct xccdf_rule_result *obj, struct
> xccdf_override *item); /// @memberof xccdf_rule_result
> diff --git a/src/XCCDF/result.c b/src/XCCDF/result.c
> index 5e676d0..1bf445a 100644
> --- a/src/XCCDF/result.c
> +++ b/src/XCCDF/result.c
> @@ -135,7 +135,7 @@ OSCAP_ACCESSOR_STRING(xccdf_rule_result, version)
>  OSCAP_ACCESSOR_STRING(xccdf_rule_result, idref)
>  OSCAP_IGETINS(xccdf_ident, xccdf_rule_result, idents, ident)
>  OSCAP_IGETINS(xccdf_fix, xccdf_rule_result, fixes, fix)
> -OSCAP_IGETTER(xccdf_check, xccdf_rule_result, checks)
> +OSCAP_IGETINS(xccdf_check, xccdf_rule_result, checks, check)
>  OSCAP_IGETINS_GEN(xccdf_override, xccdf_rule_result, overrides, override)
>  OSCAP_IGETINS_GEN(xccdf_message, xccdf_rule_result, messages, message)
>  OSCAP_IGETINS_GEN(xccdf_instance, xccdf_rule_result, instances, instance)