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 3.1.0
[debian/amanda]
/
server-src
/
amtrmlog.c
diff --git
a/server-src/amtrmlog.c
b/server-src/amtrmlog.c
index 530fcf5b8af5aeab92f7db1d8a7fbcdce369c83c..9afc7960d62b795a641fdaf956a85de84895c79b 100644
(file)
--- a/
server-src/amtrmlog.c
+++ b/
server-src/amtrmlog.c
@@
-37,7
+37,6
@@
#include "diskfile.h"
#include "tapefile.h"
#include "find.h"
#include "diskfile.h"
#include "tapefile.h"
#include "find.h"
-#include "version.h"
int amtrmidx_debug = 0;
int amtrmidx_debug = 0;
@@
-65,7
+64,7
@@
main(
char *conf_tapelist;
char *conf_logdir;
int dumpcycle;
char *conf_tapelist;
char *conf_logdir;
int dumpcycle;
- config_over
writ
es_t *cfg_ovr = NULL;
+ config_over
rid
es_t *cfg_ovr = NULL;
/*
* Configure program for internationalization:
/*
* Configure program for internationalization:
@@
-84,7
+83,7
@@
main(
/* Don't die when child closes pipe */
signal(SIGPIPE, SIG_IGN);
/* Don't die when child closes pipe */
signal(SIGPIPE, SIG_IGN);
- cfg_ovr = extract_commandline_config_over
writ
es(&argc, &argv);
+ cfg_ovr = extract_commandline_config_over
rid
es(&argc, &argv);
if (argc > 1 && strcmp(argv[1], "-t") == 0) {
amtrmidx_debug = 1;
if (argc > 1 && strcmp(argv[1], "-t") == 0) {
amtrmidx_debug = 1;
@@
-98,10
+97,10
@@
main(
}
dbopen(DBG_SUBDIR_SERVER);
}
dbopen(DBG_SUBDIR_SERVER);
- dbprintf(_("%s: version %s\n"), argv[0],
version()
);
+ dbprintf(_("%s: version %s\n"), argv[0],
VERSION
);
+ set_config_overrides(cfg_ovr);
config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
config_init(CONFIG_INIT_EXPLICIT_NAME, argv[1]);
- apply_config_overwrites(cfg_ovr);
conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
read_diskfile(conf_diskfile, &diskl);
conf_diskfile = config_dir_relative(getconf_str(CNF_DISKFILE));
read_diskfile(conf_diskfile, &diskl);