Imported Debian patch 2.5.0-1

[debian/amanda] / server-src / conffile.h

diff --git a/server-src/conffile.h b/server-src/conffile.h
index 1aecb34debe0390e5e76bc368abce7a9ddbc315a..ef6c165da3400fa0c534501fac36c2db2c0feaac 100644 (file)
--- a/server-src/conffile.h
+++ b/server-src/conffile.h
@@ -25,7 +25,7 @@
  *                        University of Maryland at College Park
  */
 /*
- * $Id: conffile.h,v 1.24.2.8.4.4.2.9 2003/01/04 03:35:54 martinea Exp $
+ * $Id: conffile.h,v 1.60 2005/12/21 19:07:50 paddy_s Exp $
  *
  * interface for config file reading code
  */
@@ -61,6 +61,7 @@ typedef enum conf_e {
     CNF_INPARALLEL,
     CNF_DUMPORDER,
     CNF_TIMEOUT,
+    CNF_BUMPPERCENT,
     CNF_BUMPSIZE,
     CNF_BUMPMULT,
     CNF_BUMPDAYS,
@@ -80,14 +81,13 @@ typedef enum conf_e {
     CNF_AMRECOVER_DO_FSF,
     CNF_AMRECOVER_CHECK_LABEL,
     CNF_AMRECOVER_CHANGER,
-    CNF_TAPERALGO
+    CNF_TAPERALGO,
+    CNF_DISPLAYUNIT,
+    CNF_KRB5KEYTAB,
+    CNF_KRB5PRINCIPAL,
+    CNF_LABEL_NEW_TAPES
 } confparm_t;
 
-typedef enum auth_e {
-    AUTH_BSD, AUTH_KRB4
-} auth_t;
-
-
 typedef struct tapetype_s {
     struct tapetype_s *next;
     int seen;
@@ -121,12 +121,28 @@ typedef struct tapetype_s {
 #define DS_HANOI       6       /* Tower of Hanoi (? ? ? ? ? ...) */
 #define DS_INCRONLY    7       /* Forced fulls (0 1 1 2 2 FORCE0 1 1 ...) */
 
+/* Estimate strategies */
+#define ES_CLIENT      0       /* client estimate */
+#define ES_SERVER      1       /* server estimate */
+#define ES_CALCSIZE    2       /* calcsize estimate */
+
 /* Compression types */
-#define COMP_NONE      0       /* No compression */
-#define COMP_FAST      1       /* Fast compression on client */
-#define COMP_BEST      2       /* Best compression on client */
-#define COMP_SERV_FAST 3       /* Fast compression on server */
-#define COMP_SERV_BEST 4       /* Best compression on server */
+typedef enum {
+    COMP_NONE,         /* No compression */
+    COMP_FAST,         /* Fast compression on client */
+    COMP_BEST,         /* Best compression on client */
+    COMP_CUST,         /* Custom compression on client */
+    COMP_SERV_FAST,    /* Fast compression on server */
+    COMP_SERV_BEST,    /* Best compression on server */
+    COMP_SERV_CUST     /* Custom compression on server */
+} comp_t;
+
+/* Encryption types */
+typedef enum {
+    ENCRYPT_NONE,              /* No encryption */
+    ENCRYPT_CUST,              /* Custom encryption on client */
+    ENCRYPT_SERV_CUST,         /* Custom encryption on server */
+} encrypt_t;
 
 #define ALGO_FIRST     0
 #define ALGO_FIRSTFIT  1
@@ -142,6 +158,10 @@ typedef struct dumptype_s {
 
     char *comment;
     char *program;
+    char *srvcompprog;
+    char *clntcompprog;
+    char *srv_encrypt;
+    char *clnt_encrypt;
     sl_t *exclude_file;
     sl_t *exclude_list;
     sl_t *include_file;
@@ -152,13 +172,24 @@ typedef struct dumptype_s {
     int dumpcycle;
     int maxcycle;
     int frequency;
-    int maxpromoteday;
-    auth_t auth;
+    char *security_driver;
     int maxdumps;
+    int maxpromoteday;
+    int bumppercent;
+    int bumpsize;
+    int bumpdays;
+    double bumpmult;
     time_t start_t;
     int strategy;
-    int compress;
+    int estimate;
+    comp_t compress;
+    encrypt_t encrypt;
+    char *srv_decrypt_opt;
+    char *clnt_decrypt_opt;
     float comprate[2]; /* first is full, second is incremental */
+    long tape_splitsize;
+    char *split_diskbuffer;
+    long fallback_splitsize;
     /* flag options */
     unsigned int record:1;
     unsigned int skip_incr:1;
@@ -171,6 +202,10 @@ typedef struct dumptype_s {
     /* seen flags */
     int s_comment;
     int s_program;
+    int s_srvcompprog;
+    int s_clntcompprog;
+    int s_srv_encrypt;
+    int s_clnt_encrypt;
     int s_exclude_file;
     int s_exclude_list;
     int s_include_file;
@@ -181,12 +216,20 @@ typedef struct dumptype_s {
     int s_dumpcycle;
     int s_maxcycle;
     int s_frequency;
-    int s_auth;
+    int s_security_driver;
     int s_maxdumps;
     int s_maxpromoteday;
+    int s_bumppercent;
+    int s_bumpsize;
+    int s_bumpdays;
+    int s_bumpmult;
     int s_start_t;
     int s_strategy;
+    int s_estimate;
     int s_compress;
+    int s_encrypt;
+    int s_srv_decrypt_opt;
+    int s_clnt_decrypt_opt;
     int s_comprate;
     int s_record;
     int s_skip_incr;
@@ -195,6 +238,9 @@ typedef struct dumptype_s {
     int s_kencrypt;
     int s_ignore;
     int s_index;
+    int s_tape_splitsize;
+    int s_split_diskbuffer;
+    int s_fallback_splitsize;
 } dumptype_t;
 
 /* A network interface */
@@ -265,6 +311,7 @@ extern int num_holdingdisks;
 int read_conffile P((char *filename));
 int getconf_seen P((confparm_t parameter));
 int getconf_int P((confparm_t parameter));
+am64_t getconf_am64 P((confparm_t parameter));
 double getconf_real P((confparm_t parameter));
 char *getconf_str P((confparm_t parameter));
 char *getconf_byname P((char *confname));
@@ -273,6 +320,7 @@ dumptype_t *read_dumptype P((char *name, FILE *from, char *fname, int *linenum))
 tapetype_t *lookup_tapetype P((char *identifier));
 interface_t *lookup_interface P((char *identifier));
 holdingdisk_t *getconf_holdingdisks P((void));
+long int getconf_unit_divisor P((void));
 
 int ColumnDataCount P((void));
 int StringToColumn P((char *s));
@@ -281,4 +329,6 @@ int SetColumDataFromString P((ColumnInfo* ci, char *s, char **errstr));
 
 char *taperalgo2str P((int taperalgo));
 
+/* this is in securityconf.h */
+char *generic_get_security_conf P((char *, void *));
 #endif /* ! CONFFILE_H */