summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/util')
-rw-r--r--src/lib/util/options.c4
-rw-r--r--src/lib/util/options.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/util/options.c b/src/lib/util/options.c
index d2d88e77174..29a8a026a4d 100644
--- a/src/lib/util/options.c
+++ b/src/lib/util/options.c
@@ -544,7 +544,7 @@ int options_force_option_callback(core_options *opts, const char *optionname, co
of entries in an INI file
-------------------------------------------------*/
-int options_parse_ini_file(core_options *opts, core_file *inifile, int priority)
+int options_parse_ini_file(core_options *opts, core_file *inifile, int priority, int ignoreprio)
{
char buffer[4096];
@@ -594,7 +594,7 @@ int options_parse_ini_file(core_options *opts, core_file *inifile, int priority)
data = find_entry_data(opts, optionname, FALSE);
if (data == NULL)
{
- message(opts, OPTMSG_WARNING, "Warning: unknown option in INI: %s\n", optionname);
+ if (priority >= ignoreprio) message(opts, OPTMSG_WARNING, "Warning: unknown option in INI: %s\n", optionname);
continue;
}
if ((data->flags & (OPTION_DEPRECATED | OPTION_INTERNAL)) != 0)
diff --git a/src/lib/util/options.h b/src/lib/util/options.h
index 51a740666b8..f54853506e8 100644
--- a/src/lib/util/options.h
+++ b/src/lib/util/options.h
@@ -175,7 +175,7 @@ int options_parse_command_line(core_options *opts, int argc, char **argv, int pr
int options_force_option_callback(core_options *opts, const char *optionname, const char *newval, int priority);
/* parse option data from an INI file */
-int options_parse_ini_file(core_options *opts, core_file *inifile, int priority);
+int options_parse_ini_file(core_options *opts, core_file *inifile, int priority, int ignoreprio);