denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added a merge option to optionally reload files instead of merging them

Browse Source
This commit is contained in:
Martin Willi
2011-04-15 10:07:13 +02:00
parent ed49e9a303
commit 32973044b0
3 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/settings.h
+10 -6
View File
@@ -261,22 +261,25 @@ struct settings_t {
/**
* Load settings from the files matching the given pattern.
*
* Existing sections are extended, existing values replaced, by those found
* in the loaded files.
* If merge is TRUE, existing sections are extended, existing values
* replaced, by those found in the loaded files. If it is FALSE, existing
* sections are purged before reading the new config.
*
* @note If any of the files matching the pattern fails to load, no settings
* are added at all. So, it's all or nothing.
*
* @param pattern file pattern
* @param merge TRUE to merge config with existing values
* @return TRUE, if settings were loaded successfully
*/
bool (*load_files)(settings_t *this, char *pattern);
bool (*load_files)(settings_t *this, char *pattern, bool merge);
/**
* Load settings from the files matching the given pattern.
*
* Existing sections are extended, existing values replaced, by those found
* in the loaded files.
* If merge is TRUE, existing sections are extended, existing values
* replaced, by those found in the loaded files. If it is FALSE, existing
* sections are purged before reading the new config.
*
* All settings are loaded relative to the given section. The section is
* created, if it does not yet exist.
@@ -285,11 +288,12 @@ struct settings_t {
* are added at all. So, it's all or nothing.
*
* @param pattern file pattern
* @param merge TRUE to merge config with existing values
* @param section section name of parent section, printf style
* @param ... argument list for section
* @return TRUE, if settings were loaded successfully
*/
bool (*load_files_section)(settings_t *this, char *pattern,
bool (*load_files_section)(settings_t *this, char *pattern, bool merge,
char *section, ...);
/**