X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fdird_conf.h;h=570a3251af2a52c80bb4b57c6dbbf4298bfebe64;hb=3cd7f14201e385fe8025a58a07dd151bb27c13e3;hp=2689d89b0e7a80aca3d4b722262ba604dc255442;hpb=f52955c3e03b6fef083df5b77ce25a75213e2539;p=bacula%2Fbacula

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 2689d89b0e..570a3251af 100644
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -43,8 +43,9 @@
 #define R_POOL			      1009
 #define R_MSGS			      1010
 #define R_COUNTER		      1011
+#define R_FILEOPTIONS		      1012
 
-#define R_LAST			      R_COUNTER
+#define R_LAST			      R_FILEOPTIONS
 
 /*
  * Some resource attributes
@@ -84,6 +85,7 @@ struct s_jt {
 struct s_res_dir {
    RES	 hdr;
    int	 DIRport;		      /* where we listen -- UA port server port */
+   char *DIRaddr;		      /* bind address */
    char *password;		      /* Password for UA access */
    char *query_file;		      /* SQL query file */
    char *working_directory;	      /* WorkingDirectory */
@@ -91,8 +93,8 @@ struct s_res_dir {
    char *subsys_directory;	      /* SubsysDirectory */
    struct s_res_msgs *messages;       /* Daemon message handler */
    int	 MaxConcurrentJobs;
-   btime_t FDConnectTimeout;	      /* timeout for connect in seconds */
-   btime_t SDConnectTimeout;	      /* timeout in seconds */
+   utime_t FDConnectTimeout;	      /* timeout for connect in seconds */
+   utime_t SDConnectTimeout;	      /* timeout in seconds */
 };
 typedef struct s_res_dir DIRRES;
 
@@ -105,8 +107,8 @@ struct s_res_client {
 
    int	 FDport;		      /* Where File daemon listens */
    int	 AutoPrune;		      /* Do automatic pruning? */
-   btime_t FileRetention;	      /* file retention period in seconds */
-   btime_t JobRetention;	      /* job retention period in seconds */
+   utime_t FileRetention;	      /* file retention period in seconds */
+   utime_t JobRetention;	      /* job retention period in seconds */
    char *address;
    char *password;
    struct s_res_cat    *catalog;       /* Catalog resource */
@@ -126,6 +128,7 @@ struct s_res_store {
    char *password;
    char *media_type;
    char *dev_name;   
+   int	autochanger;		      /* set if autochanger */
 };
 typedef struct s_res_store STORE;
 
@@ -158,9 +161,10 @@ struct s_res_job {
    char *RestoreBootstrap;	      /* Bootstrap file */
    char *RunBeforeJob;		      /* Run program before Job */
    char *RunAfterJob;		      /* Run program after Job */
-   int	 RestoreOptions;	      /* How (overwrite, ..) */
-   btime_t MaxRunTime;		      /* max run time in seconds */
-   btime_t MaxStartDelay;	      /* max start delay in seconds */
+   char *WriteBootstrap;	      /* Where to write bootstrap Job updates */
+   int	 replace;		      /* How (overwrite, ..) */
+   utime_t MaxRunTime;		      /* max run time in seconds */
+   utime_t MaxStartDelay;	      /* max start delay in seconds */
    int PruneJobs;		      /* Force pruning of Jobs */
    int PruneFiles;		      /* Force pruning of Files */
    int PruneVolumes;		      /* Force pruning of Volumes */
@@ -190,8 +194,20 @@ struct s_res_fs {
    int exclude_size;
    int have_MD5;		      /* set if MD5 initialized */
    struct MD5Context md5c;	      /* MD5 of include/exclude */
+   char MD5[50];		      /* base 64 representation of MD5 */
 };
 typedef struct s_res_fs FILESET;
+
+/*
+ * FileOptions Resource (options for Includes)
+ */
+struct s_res_fo {
+   RES	hdr;
+
+   char opts[50];		      /* Options string */
+   struct s_applyto *applyto;	      /* applyto strings */
+}; 
+typedef struct s_res_fo FILEOPTIONS;
  
 
 /* 
@@ -241,8 +257,12 @@ struct s_res_pool {
    int	 catalog_files; 	      /* maintain file entries in catalog */
    int	 use_volume_once;	      /* write on volume only once */
    int	 accept_any_volume;	      /* accept any volume */
-   int	 max_volumes;		      /* max number of volumes */
-   btime_t VolRetention;	      /* volume retention period in seconds */
+   uint32_t max_volumes;	      /* max number of volumes */
+   utime_t VolRetention;	      /* volume retention period in seconds */
+   utime_t VolUseDuration;	      /* duration volume can be used */
+   uint32_t MaxVolJobs; 	      /* Maximum jobs on the Volume */
+   uint32_t MaxVolFiles;	      /* Maximum files on the Volume */
+   uint64_t MaxVolBytes;	      /* Maximum bytes on the Volume */
    int	 AutoPrune;		      /* default for pool auto prune */
    int	 Recycle;		      /* default for media recycle yes/no */
 };
@@ -264,6 +284,7 @@ union u_res {
    struct s_res_pool	res_pool;
    struct s_res_msgs	res_msgs;
    struct s_res_counter res_counter;
+   struct s_res_fo	res_fo;
    RES hdr;
 };
 
@@ -287,5 +308,6 @@ struct s_run {
    char mday[nbytes_for_bits(31)];    /* bit set for each day of month */
    char month[nbytes_for_bits(12)];   /* bit set for each month */
    char wday[nbytes_for_bits(7)];     /* bit set for each day of the week */
+   char wpos[nbytes_for_bits(5)];     /* week position */
 };
 typedef struct s_run RUN;