Commit f6834a5d authored by unknown's avatar unknown

A fix (bug #5056: defaults-extra-file throws no error when file is inaccessible).

parent 4d5fee8e
...@@ -164,9 +164,12 @@ int load_defaults(const char *conf_file, const char **groups, ...@@ -164,9 +164,12 @@ int load_defaults(const char *conf_file, const char **groups,
if (forced_default_file) if (forced_default_file)
{ {
if ((error= search_default_file(&args, &alloc, "", if ((error= search_default_file(&args, &alloc, "",
forced_default_file, "", &group)) < 0) forced_default_file, "", &group)))
{
fprintf(stderr, "Error reading '%s' file.\n", forced_default_file);
goto err; goto err;
} }
}
else if (dirname_length(conf_file)) else if (dirname_length(conf_file))
{ {
if ((error= search_default_file(&args, &alloc, NullS, conf_file, if ((error= search_default_file(&args, &alloc, NullS, conf_file,
...@@ -199,11 +202,14 @@ int load_defaults(const char *conf_file, const char **groups, ...@@ -199,11 +202,14 @@ int load_defaults(const char *conf_file, const char **groups,
else if (defaults_extra_file) else if (defaults_extra_file)
{ {
if (search_default_file(&args, &alloc, NullS, defaults_extra_file, if (search_default_file(&args, &alloc, NullS, defaults_extra_file,
default_ext, &group) < 0) default_ext, &group))
{
fprintf(stderr, "Error reading '%s' file.\n", defaults_extra_file);
goto err; /* Fatal error */ goto err; /* Fatal error */
} }
} }
} }
}
/* /*
Here error contains <> 0 only if we have a fully specified conf_file Here error contains <> 0 only if we have a fully specified conf_file
or a forced default file or a forced default file
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment