Imported Upstream version 2.6.0

[debian/amanda] / client-src / client_util.h

diff --git a/client-src/client_util.h b/client-src/client_util.h
index 559c957e1cd28d725f39aac925e2ff859163c5e5..b5ed362696bebe8ac1a5ce1cbd804e6b21a20f87 100644 (file)
--- a/client-src/client_util.h
+++ b/client-src/client_util.h
@@ -24,7 +24,7 @@
  * file named AUTHORS, in the root directory of this distribution.
  */
 /* 
- * $Id: client_util.h,v 1.1.2.10 2002/04/22 01:54:34 martinea Exp $
+ * $Id: client_util.h,v 1.14 2006/05/25 01:47:11 johnfranks Exp $
  *
  */
 
@@ -32,50 +32,66 @@
 #define CLIENT_UTIL_H
 
 #include "amanda.h"
+#include "conffile.h"
 #include "amfeatures.h"
 #include "sl.h"
+#include "util.h"              /* for bstrncmp() */
+#include "amandad.h"           /* for g_option_t */
 
 typedef struct option_s {
     char *str;
     int compress;
+    int encrypt;
+    char *srvcompprog;
+    char *clntcompprog;
+    char *srv_encrypt;
+    char *clnt_encrypt;
+    char *srv_decrypt_opt;
+    char *clnt_decrypt_opt;
     int no_record;
-    int bsd_auth;
     int createindex;
+    char *auth;
     sl_t *exclude_file;
     sl_t *exclude_list;
     sl_t *include_file;
     sl_t *include_list;
     int exclude_optional;
     int include_optional;
-#ifdef KRB4_SECURITY
-    int krb4_auth;
     int kencrypt;
-#endif
 } option_t;
 
-typedef struct g_option_s {
-    char *str;
-    am_feature_t *features;
-    char *hostname;
-    int maxdumps;
-} g_option_t;
-
-#define NO_COMPR   0
-#define COMPR_FAST 1
-#define COMPR_BEST 2
-#define COMPR_SERVER_FAST 3
-#define COMPR_SERVER_BEST 4
+typedef struct backup_support_option_s {
+    int config;
+    int host;
+    int disk;
+    int max_level;
+    int index_line;
+    int index_xml;
+    int message_line;
+    int message_xml;
+    int record;
+    int include_file;
+    int include_list;
+    int include_optional;
+    int exclude_file;
+    int exclude_list;
+    int exclude_optional;
+    int collection;
+} backup_support_option_t;
 
-char *build_exclude P((char *disk, char *device, option_t *options, int verbose));
-char *build_include P((char *disk, char *device, option_t *options, int verbose));
-void init_options P((option_t *options));
-option_t *parse_options P((char *str,
+char *build_exclude(char *disk, char *device, option_t *options, int verbose);
+char *build_include(char *disk, char *device, option_t *options, int verbose);
+void init_options(option_t *options);
+option_t *parse_options(char *str,
                           char *disk,
                           char *device,
-                          am_feature_t *fs,
-                          int verbose));
-
-void init_g_options P((g_option_t *g_options));
-g_option_t *parse_g_options P((char *str, int verbose));
+                          am_feature_t *features,
+                          int verbose);
+void output_tool_property(FILE *tool, option_t *options);
+char *fixup_relative(char *name, char *device);
+backup_support_option_t *backup_support_option(char *program,
+                                              g_option_t *g_options,
+                                              char *disk,
+                                              char *amdevice);
 
 #endif