Imported Upstream version 2.5.1p3

[debian/amanda] / client-src / clientconf.c

diff --git a/client-src/clientconf.c b/client-src/clientconf.c
index e2a22465ca4ca297c4805ce2add45601ad14d477..bdb63c403fa39b4a1cede39ce7bf0e41becb39f3 100644 (file)
--- a/client-src/clientconf.c
+++ b/client-src/clientconf.c
@@ -25,7 +25,7 @@
  *                        University of Maryland at College Park
  */
 /*
- * $Id: clientconf.c,v 1.17 2006/07/25 19:36:48 martinea Exp $
+ * $Id: clientconf.c,v 1.17.2.2 2007/01/24 18:33:29 martinea Exp $
  *
  * read configuration file
  */
@@ -41,6 +41,10 @@
 #include "clientconf.h"
 #include "clock.h"
 
+#ifndef AMANDATES_FILE
+#define AMANDATES_FILE "/etc/amandates"
+#endif
+
 /* configuration parameters */
 static char *cln_config_dir = NULL;
 
@@ -295,7 +299,7 @@ init_defaults(void)
 #else
     conf_init_string(&client_conf[CLN_GNUTAR_LIST_DIR], NULL);
 #endif
-    conf_init_string(&client_conf[CLN_AMANDATES], "/etc/amandates");
+    conf_init_string(&client_conf[CLN_AMANDATES], AMANDATES_FILE);
     /* defaults for internal variables */
 
     conf_line_num = got_parserror = 0;
@@ -604,9 +608,6 @@ add_client_conf(
     nb_option = 0;
     for(command_option = client_options; command_option->name != NULL;
                                                        command_option++) {
-       if(strcasecmp(command_option->name, kt->keyword) == 0) {
-           return -1;
-       }
        nb_option++;
     }