projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 2.6.1
[debian/amanda]
/
server-src
/
amlogroll.c
diff --git
a/server-src/amlogroll.c
b/server-src/amlogroll.c
index 7875815975622c4bf9539c0076ce9fd259baf4f2..a20ef36266364f1fbc17ce4a6ff0100a09f258cd 100644
(file)
--- a/
server-src/amlogroll.c
+++ b/
server-src/amlogroll.c
@@
-77,15
+77,21
@@
main(
/* read configuration files */
/* read configuration files */
- config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD | CONFIG_INIT_FATAL,
- cfg_opt);
+ config_init(CONFIG_INIT_EXPLICIT_NAME | CONFIG_INIT_USE_CWD, cfg_opt);
apply_config_overwrites(cfg_ovr);
apply_config_overwrites(cfg_ovr);
+ if (config_errors(NULL) >= CFGERR_WARNINGS) {
+ config_print_errors();
+ if (config_errors(NULL) >= CFGERR_ERRORS) {
+ g_critical(_("errors processing config file"));
+ }
+ }
+
safe_cd(); /* must happen after config_init */
check_running_as(RUNNING_AS_DUMPUSER);
safe_cd(); /* must happen after config_init */
check_running_as(RUNNING_AS_DUMPUSER);
- dbrename(
config_name
, DBG_SUBDIR_SERVER);
+ dbrename(
get_config_name()
, DBG_SUBDIR_SERVER);
conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfname = vstralloc(conf_logdir, "/", "log", NULL);
conf_logdir = config_dir_relative(getconf_str(CNF_LOGDIR));
logfname = vstralloc(conf_logdir, "/", "log", NULL);