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
/
amservice.c
diff --git
a/server-src/amservice.c
b/server-src/amservice.c
index 22c98c7f93b3ccc75748b260d4915cef88c2d821..a6763651c5568c770f1fb480bae88408ff6a0f63 100644
(file)
--- a/
server-src/amservice.c
+++ b/
server-src/amservice.c
@@
-33,7
+33,6
@@
#include "conffile.h"
#include "packet.h"
#include "protocol.h"
#include "conffile.h"
#include "packet.h"
#include "protocol.h"
-#include "version.h"
#include "server_util.h"
#include "amfeatures.h"
#include "server_util.h"
#include "amfeatures.h"
@@
-51,8
+50,7
@@
int main(int argc, char **argv);
void
usage(void)
{
void
usage(void)
{
- error(_("Usage: amservice%s [-o configoption]* [-f input_file] host auth service"),
- versionsuffix());
+ error(_("Usage: amservice [-o configoption]* [-f input_file] host auth service"));
/*NOTREACHED*/
}
/*NOTREACHED*/
}
@@
-61,7
+59,7
@@
main(
int argc,
char ** argv)
{
int argc,
char ** argv)
{
- config_over
writ
es_t *cfg_ovr;
+ config_over
rid
es_t *cfg_ovr;
char *hostname;
char *auth;
char *service;
char *hostname;
char *auth;
char *service;
@@
-93,18
+91,18
@@
main(
dbopen(DBG_SUBDIR_SERVER);
dbopen(DBG_SUBDIR_SERVER);
-
erroutput_type = ERR_INTERACTIVE
;
+
add_amanda_log_handler(amanda_log_stderr)
;
our_features = am_init_feature_set();
our_feature_string = am_feature_to_string(our_features);
/* process arguments */
our_features = am_init_feature_set();
our_feature_string = am_feature_to_string(our_features);
/* process arguments */
- cfg_ovr = new_config_over
writ
es(argc/2);
+ cfg_ovr = new_config_over
rid
es(argc/2);
input_file = stdin;
while((opt = getopt(argc, argv, "o:f:")) != EOF) {
switch(opt) {
input_file = stdin;
while((opt = getopt(argc, argv, "o:f:")) != EOF) {
switch(opt) {
- case 'o': add_config_over
writ
e_opt(cfg_ovr, optarg);
+ case 'o': add_config_over
rid
e_opt(cfg_ovr, optarg);
break;
case 'f': if (*optarg == '/') {
input_file = fopen(optarg, "r");
break;
case 'f': if (*optarg == '/') {
input_file = fopen(optarg, "r");
@@
-125,8
+123,8
@@
main(
if(argc < 3) usage();
/* set a default config */
if(argc < 3) usage();
/* set a default config */
+ set_config_overrides(cfg_ovr);
config_init(CONFIG_INIT_CLIENT, NULL);
config_init(CONFIG_INIT_CLIENT, NULL);
- apply_config_overwrites(cfg_ovr);
dbrename(get_config_name(), DBG_SUBDIR_SERVER);
if (config_errors(NULL) >= CFGERR_WARNINGS) {
dbrename(get_config_name(), DBG_SUBDIR_SERVER);
if (config_errors(NULL) >= CFGERR_WARNINGS) {