Imported Upstream version 2.5.0

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

diff --git a/client-src/client_util.h b/client-src/client_util.h
index 559c957e1cd28d725f39aac925e2ff859163c5e5..ef8ef8e3f477a9e02b0585d5f83c48c801ba9ba1 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.12 2005/12/09 03:22:52 paddy_s Exp $
  *
  */
 
@@ -34,23 +34,27 @@
 #include "amanda.h"
 #include "amfeatures.h"
 #include "sl.h"
+#include "util.h"              /* for bstrncmp() */
 
 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 {
@@ -65,6 +69,12 @@ typedef struct g_option_s {
 #define COMPR_BEST 2
 #define COMPR_SERVER_FAST 3
 #define COMPR_SERVER_BEST 4
+#define COMPR_SERVER_CUST 5    /* server-side custom compression */
+#define COMPR_CUST 6            /* client-side custom compression */
+
+#define ENCRYPT_NONE         0 /* no encryption  */
+#define ENCRYPT_CUST         1 /* client-side custom encryption */
+#define ENCRYPT_SERV_CUST    2 /* server-side custom encryption */
 
 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));
@@ -72,7 +82,7 @@ void init_options P((option_t *options));
 option_t *parse_options P((char *str,
                           char *disk,
                           char *device,
-                          am_feature_t *fs,
+                          am_feature_t *features,
                           int verbose));
 
 void init_g_options P((g_option_t *g_options));