[Open-scap] [PATCH] Add XCCDF_POLICY to swig and fix RHEL 5 support

[Peter Vrabec]

Thanks Ed,

your patch was applied.

Peter.

On Friday 21 May 2010 07:42:30 pm Ed Sealing wrote:
> Added XCCDF_POLICY header file to swig interface. Added blank functions
> for unimplemented XCCDF_POLICY functions. Updated rpminfo.c rpmcryptoFree
> definition for RHEL 5 compiling errors.
> ---
>  src/OVAL/probes/unix/linux/rpminfo.c |    2 +-
>  src/XCCDF_POLICY/xccdf_policy.c      |   14 ++++++++++++++
>  swig/openscap.i                      |    2 ++
>  3 files changed, 17 insertions(+), 1 deletions(-)
> 
> diff --git a/src/OVAL/probes/unix/linux/rpminfo.c
> b/src/OVAL/probes/unix/linux/rpminfo.c index 8181172..6fe90d4 100644
> --- a/src/OVAL/probes/unix/linux/rpminfo.c
> +++ b/src/OVAL/probes/unix/linux/rpminfo.c
> @@ -59,7 +59,7 @@
>  #ifdef HAVE_LIBRPM44
>  #include <rpm/header.h>
>  #define headerFormat(_h, _fmt, _emsg) headerSprintf((_h),( _fmt),
> rpmTagTable, rpmHeaderFormats, (_emsg)) -#define rpmFreeCrypto while(0)
> +#define rpmFreeCrypto() while(0)
>  #endif
> 
>  #ifndef _A
> diff --git a/src/XCCDF_POLICY/xccdf_policy.c
> b/src/XCCDF_POLICY/xccdf_policy.c index 9a19c28..b566264 100644
> --- a/src/XCCDF_POLICY/xccdf_policy.c
> +++ b/src/XCCDF_POLICY/xccdf_policy.c
> @@ -1030,6 +1030,20 @@ void xccdf_policy_import_results(struct xccdf_policy
> *policy, char *import_names void xccdf_policy_export_results(struct
> xccdf_policy *policy, char *scoring_model_namespace, struct
> oscap_export_target *target) { }
> 
> +
> +bool xccdf_value_binding_add_refine_rule(struct xccdf_value_binding
> *binding, struct xccdf_refine_rule *rule) { +	//TODO
> +}
> +
> +bool xccdf_value_binding_add_refine_value(struct xccdf_value_binding
> *binding, struct xccdf_refine_value *value) { +	//TODO
> +}
> +
> +bool xccdf_value_binding_add_setvalue(struct xccdf_value_binding *binding,
> struct xccdf_setvalue *value) { +	//TODO
> +}
> +
> +
>  void xccdf_policy_model_free(struct xccdf_policy_model * model) {
> 
>          xccdf_benchmark_free(model->benchmark);
> diff --git a/swig/openscap.i b/swig/openscap.i
> index da55b50..be5db15 100644
> --- a/swig/openscap.i
> +++ b/swig/openscap.i
> @@ -181,8 +181,10 @@
>  %module openscap
>  %{
>   #include "../src/XCCDF/public/xccdf.h"
> + #include "../src/XCCDF_POLICY/public/xccdf_policy.h"
>  %}
>  %include "../src/XCCDF/public/xccdf.h"
> +%include "../src/XCCDF_POLICY/public/xccdf_policy.h"
>  #endif
> 
>  /*%typemap(in) value[ANY] {