| xccdf_benchmark.h | xccdf_benchmark.h | |||
|---|---|---|---|---|
| skipping to change at line 1834 | skipping to change at line 1834 | |||
| * @memberof xccdf_benchmark | * @memberof xccdf_benchmark | |||
| * @param id ID | * @param id ID | |||
| * @return Item with given ID | * @return Item with given ID | |||
| * @retval NULL if no such item exists | * @retval NULL if no such item exists | |||
| */ | */ | |||
| struct xccdf_item *xccdf_benchmark_get_item(const struct xccdf_benchmark *b enchmark, const char *id); | struct xccdf_item *xccdf_benchmark_get_item(const struct xccdf_benchmark *b enchmark, const char *id); | |||
| /** | /** | |||
| * Get a registered member of xccdf_benchmakr by ID. | * Get a registered member of xccdf_benchmakr by ID. | |||
| * @memberof xccdf_benchmark | * @memberof xccdf_benchmark | |||
| * @param type of member: either XCCDF_ITEM, XCCDF_PROFILE, or XCCDF_TESTRE SULT | * @param type of member: either XCCDF_ITEM, XCCDF_PROFILE, or XCCDF_RESULT | |||
| * @return xccdf_item with given ID and type | * @return xccdf_item with given ID and type | |||
| * @return NULL if no such member exists | * @return NULL if no such member exists | |||
| */ | */ | |||
| struct xccdf_item *xccdf_benchmark_get_member(const struct xccdf_benchmark *benchmark, xccdf_type_t type, const char *key); | struct xccdf_item *xccdf_benchmark_get_member(const struct xccdf_benchmark *benchmark, xccdf_type_t type, const char *key); | |||
| /** | /** | |||
| * Get an iterator to the benchmark legal notices. | * Get an iterator to the benchmark legal notices. | |||
| * @memberof xccdf_benchmark | * @memberof xccdf_benchmark | |||
| * @see xccdf_notice | * @see xccdf_notice | |||
| */ | */ | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| xccdf_session.h | xccdf_session.h | |||
|---|---|---|---|---|
| /** | /** | |||
| * @addtogroup XCCDF | * @addtogroup XCCDF | |||
| * @{ | * @{ | |||
| * @addtogroup Session | * @addtogroup Session | |||
| * @{ | * @{ | |||
| * | * | |||
| * @file xccdf_session.h | * @file xccdf_session.h | |||
| * High Level API for OpenSCAP XCCDF operations. | * High Level API for OpenSCAP XCCDF operations. | |||
| * @author Simon Lukasik <slukasik@redhat.com>i | * @author Simon Lukasik <slukasik@redhat.com> | |||
| */ | */ | |||
| /* | /* | |||
| * Copyright 2013 Red Hat Inc., Durham, North Carolina. | * Copyright 2013 Red Hat Inc., Durham, North Carolina. | |||
| * All Rights Reserved. | * All Rights Reserved. | |||
| * | * | |||
| * This library is free software; you can redistribute it and/or | * This library is free software; you can redistribute it and/or | |||
| * modify it under the terms of the GNU Lesser General Public | * modify it under the terms of the GNU Lesser General Public | |||
| * License as published by the Free Software Foundation; either | * License as published by the Free Software Foundation; either | |||
| * version 2.1 of the License, or (at your option) any later version. | * version 2.1 of the License, or (at your option) any later version. | |||
| skipping to change at line 394 | skipping to change at line 394 | |||
| /** | /** | |||
| * Get count of OVAL agent sessions in the xccdf_session. | * Get count of OVAL agent sessions in the xccdf_session. | |||
| * @memberof xccdf_session | * @memberof xccdf_session | |||
| * @param session XCCDF Session | * @param session XCCDF Session | |||
| * @returns number of OVAL agents. | * @returns number of OVAL agents. | |||
| */ | */ | |||
| unsigned int xccdf_session_get_oval_agents_count(const struct xccdf_session *session); | unsigned int xccdf_session_get_oval_agents_count(const struct xccdf_session *session); | |||
| /** | /** | |||
| * Query if the result of evaluation contains FAL or UNKNOWN rule-result el ements. | * Query if the result of evaluation contains FAIL, ERROR, or UNKNOWN rule- result elements. | |||
| * @memberof xccdf_session | * @memberof xccdf_session | |||
| * @param session XCCDF Session | * @param session XCCDF Session | |||
| * @returns Exists such rule-result r . r = FAIL | r = UNKNOWN rule-result | * @returns Exists such rule-result r . r = FAIL | r = UNKNOWN | r = ERROR | |||
| */ | */ | |||
| bool xccdf_session_contains_fail_result(const struct xccdf_session *session ); | bool xccdf_session_contains_fail_result(const struct xccdf_session *session ); | |||
| /** | /** | |||
| * Run XCCDF Remediation. It uses XCCDF Policy and XCCDF TestResult from th e session | * Run XCCDF Remediation. It uses XCCDF Policy and XCCDF TestResult from th e session | |||
| * and modifies the TestResult. This also drops and recreate OVAL Agent Ses sion, thus | * and modifies the TestResult. This also drops and recreate OVAL Agent Ses sion, thus | |||
| * users are advised to run @ref xccdf_session_export_oval first. | * users are advised to run @ref xccdf_session_export_oval first. | |||
| * @memberof xccdf_session | * @memberof xccdf_session | |||
| * @param session XCCDF Session | * @param session XCCDF Session | |||
| * @returns zero on success | * @returns zero on success | |||
| */ | */ | |||
| int xccdf_session_remediate(struct xccdf_session *session); | int xccdf_session_remediate(struct xccdf_session *session); | |||
| /** | ||||
| * Load xccdf:TestResult to the session from file and prepare session for r | ||||
| emediation. | ||||
| * This function assumes that the session internals has the policy_model pr | ||||
| epared, | ||||
| * it calculates all the other internals which might be needed for remediat | ||||
| ion. | ||||
| * @memberof xccdf_session | ||||
| * @param session XCCDF Session | ||||
| * @param testresult_id ID of the TestResult element in the file (the NULL | ||||
| value stands | ||||
| * for the last TestResult). | ||||
| * @returns zero on success. | ||||
| */ | ||||
| int xccdf_session_build_policy_from_testresult(struct xccdf_session *sessio | ||||
| n, const char *testresult_id); | ||||
| /// @} | /// @} | |||
| /// @} | /// @} | |||
| #endif | #endif | |||
| End of changes. 4 change blocks. | ||||
| 3 lines changed or deleted | 20 lines changed or added | |||