scap_ds.h   scap_ds.h 
skipping to change at line 108 skipping to change at line 108
* ID of the datastream that should contain the XCCDF file. It will be * ID of the datastream that should contain the XCCDF file. It will be
* the only datastream in the resulting data-stream-collection. * the only datastream in the resulting data-stream-collection.
* *
* @returns * @returns
* 0 if no errors were encountered * 0 if no errors were encountered
* -1 in case of errors * -1 in case of errors
*/ */
int ds_sds_compose_from_xccdf(const char* xccdf_file, const char* target_da tastream); int ds_sds_compose_from_xccdf(const char* xccdf_file, const char* target_da tastream);
/** /**
* @brief append a new given component to the existing source datastream
*
* @param target_datastream
* Path of the existing source datastream into which the new component
* shall be added.
*
* @param datastream_id
* ID of the datastream into which the component shall be added.
* Null value indicates the very first datastream in the collection.
*
* @param new_component
* Path to the new component file (XCCDF, OVAL, or CPE Dictionary).
*
* @returns 0 in case of success
*/
int ds_sds_compose_add_component(const char *target_datastream, const char
*datastream_id, const char *new_component, bool extended);
/**
* @brief takes given source data stream and XCCDF result file and makes a result data stream * @brief takes given source data stream and XCCDF result file and makes a result data stream
* *
* @param sds_file * @param sds_file
* Path to the source data stream file that was used to generate the r esult XCCDF * Path to the source data stream file that was used to generate the r esult XCCDF
* *
* @param xccdf_result_file * @param xccdf_result_file
* Contains xccdf:TestResult(s) and the embedded Benchmark (optionally ). * Contains xccdf:TestResult(s) and the embedded Benchmark (optionally ).
* The embedded Benchmark (source data) will not be included in the re sult * The embedded Benchmark (source data) will not be included in the re sult
* data stream, we will instead bundle the source data stream. * data stream, we will instead bundle the source data stream.
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 19 lines changed or added


 xccdf_policy.h   xccdf_policy.h 
skipping to change at line 472 skipping to change at line 472
* Resolve benchmark by applying all refine_rules and refine_values to rule s / values * Resolve benchmark by applying all refine_rules and refine_values to rule s / values
* of benchmark. All properties in benchmark will be irreversible changed a nd user has to * of benchmark. All properties in benchmark will be irreversible changed a nd user has to
* load benchmark (from XML) again to discard these changes. * load benchmark (from XML) again to discard these changes.
* @param policy XCCDF policy containing rules/values that will be applied to benchmark rules/values. * @param policy XCCDF policy containing rules/values that will be applied to benchmark rules/values.
* @return true if process ends succesfuly or false in case of error * @return true if process ends succesfuly or false in case of error
* @memberof xccdf_policy * @memberof xccdf_policy
*/ */
bool xccdf_policy_resolve(struct xccdf_policy * policy); bool xccdf_policy_resolve(struct xccdf_policy * policy);
/** /**
* Generate remediation prescription (presumably a remediation script).
* @memberof xccdf_policy
* @param policy XCCDF Policy
* @param result XCCDF TestResult. This may be omitted to generate the pres
cription
* based solely on the XCCDF Policy (xccdf:Profile).
* @param sys Consider only those fixes that have @system attribute equal t
o sys
* @param output_fd write prescription to this file descriptor
* @returns zero on success, non-zero indicate partial (incomplete) output.
*/
int xccdf_policy_generate_fix(struct xccdf_policy *policy, struct xccdf_res
ult *result, const char *sys, int output_fd);
/**
* Clone the item and tailor it against given policy (profile) * Clone the item and tailor it against given policy (profile)
* @param policy Policy with profile * @param policy Policy with profile
* @param item XCCDF item to be tailored * @param item XCCDF item to be tailored
* @return new item that has to be freed by user * @return new item that has to be freed by user
*/ */
struct xccdf_item * xccdf_policy_tailor_item(struct xccdf_policy * policy, struct xccdf_item * item); struct xccdf_item * xccdf_policy_tailor_item(struct xccdf_policy * policy, struct xccdf_item * item);
/** /**
* xccdf_policy_model_get_files and xccdf_item_get_files each return oscap_ file_entries instead of raw strings * xccdf_policy_model_get_files and xccdf_item_get_files each return oscap_ file_entries instead of raw strings
*/ */
 End of changes. 1 change blocks. 
0 lines changed or deleted 15 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/