X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fsrc%2Fdird%2Fdird_conf.h;h=020a086ffe1230cdf83c3406cfcbd7dde8d6a874;hb=6872bd694d98711846adaae124f19dfc88d8f2e0;hp=aef4215df906f83778fcba7dc51420cffe852a25;hpb=6fdcb9e90f21d33ead5138c4b1eaab8533995a33;p=bacula%2Fbacula diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h index aef4215df9..020a086ffe 100644 --- a/bacula/src/dird/dird_conf.h +++ b/bacula/src/dird/dird_conf.h @@ -6,320 +6,582 @@ * Version $Id$ */ /* - Copyright (C) 2000-2003 2002 Kern Sibbald and John Walker + Bacula® - The Network Backup Solution - This program is free software; you can redistribute it and/or - modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of - the License, or (at your option) any later version. + Copyright (C) 2000-2006 Free Software Foundation Europe e.V. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of + The main author of Bacula is Kern Sibbald, with contributions from + many others, a complete list can be found in the file AUTHORS. + This program is Free Software; you can redistribute it and/or + modify it under the terms of version two of the GNU General Public + License as published by the Free Software Foundation plus additions + that are listed in the file LICENSE. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public - License along with this program; if not, write to the Free - Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, - MA 02111-1307, USA. + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301, USA. - */ + Bacula® is a registered trademark of John Walker. + The licensor of Bacula is the Free Software Foundation Europe + (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich, + Switzerland, email:ftf@fsfeurope.org. +*/ /* NOTE: #includes at the end of this file */ /* - * Resource codes -- they must be sequential for indexing + * Resource codes -- they must be sequential for indexing */ -#define R_FIRST 1001 - -#define R_DIRECTOR 1001 -#define R_CLIENT 1002 -#define R_JOB 1003 -#define R_STORAGE 1004 -#define R_CATALOG 1005 -#define R_SCHEDULE 1006 -#define R_FILESET 1007 -#define R_GROUP 1008 -#define R_POOL 1009 -#define R_MSGS 1010 -#define R_COUNTER 1011 -#define R_FILEOPTIONS 1012 - -#define R_LAST R_FILEOPTIONS +enum { + R_DIRECTOR = 1001, + R_CLIENT, + R_JOB, + R_STORAGE, + R_CATALOG, + R_SCHEDULE, + R_FILESET, + R_POOL, + R_MSGS, + R_COUNTER, + R_CONSOLE, + R_JOBDEFS, + R_DEVICE, + R_FIRST = R_DIRECTOR, + R_LAST = R_DEVICE /* keep this updated */ +}; + /* * Some resource attributes */ -#define R_NAME 1020 -#define R_ADDRESS 1021 -#define R_PASSWORD 1022 -#define R_TYPE 1023 -#define R_BACKUP 1024 +enum { + R_NAME = 1020, + R_ADDRESS, + R_PASSWORD, + R_TYPE, + R_BACKUP +}; /* Used for certain KeyWord tables */ -struct s_kw { - char *name; - int token; +struct s_kw { + const char *name; + int token; }; /* Job Level keyword structure */ struct s_jl { - char *level_name; /* level keyword */ - int level; /* level */ - int job_type; /* JobType permitting this level */ + const char *level_name; /* level keyword */ + int level; /* level */ + int job_type; /* JobType permitting this level */ }; /* Job Type keyword structure */ struct s_jt { - char *type_name; + const char *type_name; int job_type; }; /* Definition of the contents of each Resource */ +/* Needed for forward references */ +class SCHED; +class CLIENT; +class FILESET; +class POOL; +class RUN; +class DEVICE; +class RUNSCRIPT; -/* - * Director Resource +/* + * Director Resource * */ -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 */ - char *pid_directory; /* PidDirectory */ - char *subsys_directory; /* SubsysDirectory */ - struct s_res_msgs *messages; /* Daemon message handler */ - int MaxConcurrentJobs; - utime_t FDConnectTimeout; /* timeout for connect in seconds */ - utime_t SDConnectTimeout; /* timeout in seconds */ +class DIRRES { +public: + RES hdr; + dlist *DIRaddrs; + char *password; /* Password for UA access */ + char *query_file; /* SQL query file */ + char *working_directory; /* WorkingDirectory */ + const char *scripts_directory; /* ScriptsDirectory */ + char *pid_directory; /* PidDirectory */ + char *subsys_directory; /* SubsysDirectory */ + MSGS *messages; /* Daemon message handler */ + uint32_t MaxConcurrentJobs; /* Max concurrent jobs for whole director */ + utime_t FDConnectTimeout; /* timeout for connect in seconds */ + utime_t SDConnectTimeout; /* timeout in seconds */ + char *tls_ca_certfile; /* TLS CA Certificate File */ + char *tls_ca_certdir; /* TLS CA Certificate Directory */ + char *tls_certfile; /* TLS Server Certificate File */ + char *tls_keyfile; /* TLS Server Key File */ + char *tls_dhfile; /* TLS Diffie-Hellman Parameters */ + alist *tls_allowed_cns; /* TLS Allowed Clients */ + TLS_CONTEXT *tls_ctx; /* Shared TLS Context */ + bool tls_enable; /* Enable TLS */ + bool tls_require; /* Require TLS */ + bool tls_verify_peer; /* TLS Verify Client Certificate */ + + /* Methods */ + char *name() const; }; -typedef struct s_res_dir DIRRES; + +inline char *DIRRES::name() const { return hdr.name; } /* - * Client Resource - * + * Device Resource + * This resource is a bit different from the other resources + * because it is not defined in the Director + * by DEVICE { ... }, but rather by a "reference" such as + * DEVICE = xxx; Then when the Director connects to the + * SD, it requests the information about the device. */ -struct s_res_client { - RES hdr; +class DEVICE { +public: + RES hdr; - int FDport; /* Where File daemon listens */ - int AutoPrune; /* Do automatic pruning? */ - 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 */ + bool found; /* found with SD */ + int num_writers; /* number of writers */ + int max_writers; /* = 1 for files */ + int reserved; /* number of reserves */ + int num_drives; /* for autochanger */ + bool autochanger; /* set if device is autochanger */ + bool open; /* drive open */ + bool append; /* in append mode */ + bool read; /* in read mode */ + bool labeled; /* Volume name valid */ + bool offline; /* not available */ + bool autoselect; /* can be selected via autochanger */ + uint32_t PoolId; + char ChangerName[MAX_NAME_LENGTH]; + char VolumeName[MAX_NAME_LENGTH]; + char MediaType[MAX_NAME_LENGTH]; + + /* Methods */ + char *name() const; }; -typedef struct s_res_client CLIENT; + +inline char *DEVICE::name() const { return hdr.name; } /* - * Store Resource - * + * Console ACL positions */ -struct s_res_store { - RES hdr; +enum { + Job_ACL = 0, + Client_ACL, + Storage_ACL, + Schedule_ACL, + Run_ACL, + Pool_ACL, + Command_ACL, + FileSet_ACL, + Catalog_ACL, + Where_ACL, + Num_ACL /* keep last */ +}; - int SDport; /* port where Directors connect */ - int SDDport; /* data port for File daemon */ - char *address; - char *password; - char *media_type; - char *dev_name; - int autochanger; /* set if autochanger */ +/* + * Console Resource + */ +class CONRES { +public: + RES hdr; + char *password; /* UA server password */ + alist *ACL_lists[Num_ACL]; /* pointers to ACLs */ + char *tls_ca_certfile; /* TLS CA Certificate File */ + char *tls_ca_certdir; /* TLS CA Certificate Directory */ + char *tls_certfile; /* TLS Server Certificate File */ + char *tls_keyfile; /* TLS Server Key File */ + char *tls_dhfile; /* TLS Diffie-Hellman Parameters */ + alist *tls_allowed_cns; /* TLS Allowed Clients */ + TLS_CONTEXT *tls_ctx; /* Shared TLS Context */ + bool tls_enable; /* Enable TLS */ + bool tls_require; /* Require TLS */ + bool tls_verify_peer; /* TLS Verify Client Certificate */ + + /* Methods */ + char *name() const; }; -typedef struct s_res_store STORE; + +inline char *CONRES::name() const { return hdr.name; } + /* * Catalog Resource * */ -struct s_res_cat { - RES hdr; +class CAT { +public: + RES hdr; - int db_port; /* Port -- not yet implemented */ - char *db_address; /* host name for remote access */ - char *db_socket; /* Socket for local access */ + int db_port; /* Port */ + char *db_address; /* host name for remote access */ + char *db_socket; /* Socket for local access */ char *db_password; char *db_user; char *db_name; + int mult_db_connections; /* set if multiple connections wanted */ + + /* Methods */ + char *name() const; }; -typedef struct s_res_cat CAT; + +inline char *CAT::name() const { return hdr.name; } + /* - * Job Resource + * Client Resource + * + */ +class CLIENT { +public: + RES hdr; + + int FDport; /* Where File daemon listens */ + utime_t FileRetention; /* file retention period in seconds */ + utime_t JobRetention; /* job retention period in seconds */ + char *address; + char *password; + CAT *catalog; /* Catalog resource */ + uint32_t MaxConcurrentJobs; /* Maximume concurrent jobs */ + uint32_t NumConcurrentJobs; /* number of concurrent jobs running */ + char *tls_ca_certfile; /* TLS CA Certificate File */ + char *tls_ca_certdir; /* TLS CA Certificate Directory */ + char *tls_certfile; /* TLS Client Certificate File */ + char *tls_keyfile; /* TLS Client Key File */ + TLS_CONTEXT *tls_ctx; /* Shared TLS Context */ + bool tls_enable; /* Enable TLS */ + bool tls_require; /* Require TLS */ + bool AutoPrune; /* Do automatic pruning? */ + + /* Methods */ + char *name() const; +}; + +inline char *CLIENT::name() const { return hdr.name; } + + +/* + * Store Resource * */ -struct s_res_job { - RES hdr; - - int JobType; /* job type (backup, verify, restore */ - int level; /* default backup/verify level */ - int RestoreJobId; /* What -- JobId to restore */ - char *RestoreWhere; /* Where on disk to restore -- directory */ - char *RestoreBootstrap; /* Bootstrap file */ - char *RunBeforeJob; /* Run program before Job */ - char *RunAfterJob; /* Run program after Job */ - 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 PrefixLinks; /* prefix soft links with Where path */ - int PruneJobs; /* Force pruning of Jobs */ - int PruneFiles; /* Force pruning of Files */ - int PruneVolumes; /* Force pruning of Volumes */ - int SpoolAttributes; /* Set to spool attributes in SD */ - - struct s_res_msgs *messages; /* How and where to send messages */ - struct s_res_sch *schedule; /* When -- Automatic schedule */ - struct s_res_client *client; /* Who to backup */ - struct s_res_fs *fileset; /* What to backup -- Fileset */ - struct s_res_store *storage; /* Where is device -- Storage daemon */ - struct s_res_pool *pool; /* Where is media -- Media Pool */ +class STORE { +public: + RES hdr; + + int SDport; /* port where Directors connect */ + int SDDport; /* data port for File daemon */ + char *address; + char *password; + char *media_type; + alist *device; /* Alternate devices for this Storage */ + uint32_t MaxConcurrentJobs; /* Maximume concurrent jobs */ + uint32_t NumConcurrentJobs; /* number of concurrent jobs running */ + char *tls_ca_certfile; /* TLS CA Certificate File */ + char *tls_ca_certdir; /* TLS CA Certificate Directory */ + char *tls_certfile; /* TLS Client Certificate File */ + char *tls_keyfile; /* TLS Client Key File */ + TLS_CONTEXT *tls_ctx; /* Shared TLS Context */ + bool tls_enable; /* Enable TLS */ + bool tls_require; /* Require TLS */ + bool enabled; /* Set if device is enabled */ + bool autochanger; /* set if autochanger */ + int64_t StorageId; /* Set from Storage DB record */ + int drives; /* number of drives in autochanger */ + + /* Methods */ + char *dev_name() const; + char *name() const; }; -typedef struct s_res_job JOB; + +inline char *STORE::dev_name() const +{ + DEVICE *dev = (DEVICE *)device->first(); + return dev->hdr.name; +} + +inline char *STORE::name() const { return hdr.name; } /* - * File Options Resource (options for Includes) + * This is a sort of "unified" store that has both the + * storage pointer and the text of where the pointer was + * found. */ -struct s_res_fo { - RES hdr; - - char opts[20]; /* Options string */ - int replace; /* How (overwrite, ...) */ - char **applyto; /* applyto strings */ - int num_applyto; /* number of appyto strings */ -}; -typedef struct s_res_fo FILEOPTIONS; - -struct s_incexc_item { - char opts[20]; /* options string */ - FILEOPTIONS **fileopts; /* file options array */ - int num_fileopts; /* number of above */ - char name[1]; /* include/exclude name */ +class USTORE { +public: + STORE *store; + POOLMEM *store_source; + + /* Methods */ + USTORE() { store = NULL; store_source = get_pool_memory(PM_MESSAGE); + *store_source = 0; }; + ~USTORE() { destroy(); } + void set_source(const char *where); + void destroy(); }; -typedef struct s_incexc_item INCEXE; -/* - * FileSet Resource - * +inline void USTORE::destroy() +{ + if (store_source) { + free_pool_memory(store_source); + store_source = NULL; + } +} + + +inline void USTORE::set_source(const char *where) +{ + if (!store_source) { + store_source = get_pool_memory(PM_MESSAGE); + } + pm_strcpy(store_source, where); +} + + +/* + * Job Resource */ -struct s_res_fs { - RES hdr; +class JOB { +public: + RES hdr; + + int JobType; /* job type (backup, verify, restore */ + int JobLevel; /* default backup/verify level */ + int Priority; /* Job priority */ + int RestoreJobId; /* What -- JobId to restore */ + char *RestoreWhere; /* Where on disk to restore -- directory */ + char *RestoreBootstrap; /* Bootstrap file */ + alist *RunScripts; /* Run {client} program {after|before} Job */ + union { + char *WriteBootstrap; /* Where to write bootstrap Job updates */ + char *WriteVerifyList; /* List of changed files */ + }; + int replace; /* How (overwrite, ..) */ + utime_t MaxRunTime; /* max run time in seconds */ + utime_t MaxWaitTime; /* max blocking time in seconds */ + utime_t FullMaxWaitTime; /* Max Full job wait time */ + utime_t DiffMaxWaitTime; /* Max Differential job wait time */ + utime_t IncMaxWaitTime; /* Max Incremental job wait time */ + utime_t MaxStartDelay; /* max start delay in seconds */ + utime_t RescheduleInterval; /* Reschedule interval */ + utime_t JobRetention; /* job retention period in seconds */ + uint32_t MaxConcurrentJobs; /* Maximum concurrent jobs */ + int RescheduleTimes; /* Number of times to reschedule job */ + bool RescheduleOnError; /* Set to reschedule on error */ + bool PrefixLinks; /* prefix soft links with Where path */ + bool PruneJobs; /* Force pruning of Jobs */ + bool PruneFiles; /* Force pruning of Files */ + bool PruneVolumes; /* Force pruning of Volumes */ + bool SpoolAttributes; /* Set to spool attributes in SD */ + bool spool_data; /* Set to spool data in SD */ + bool rerun_failed_levels; /* Upgrade to rerun failed levels */ + bool PreferMountedVolumes; /* Prefer vols mounted rather than new one */ + bool write_part_after_job; /* Set to write part after job in SD */ + bool enabled; /* Set if job enabled */ + + MSGS *messages; /* How and where to send messages */ + SCHED *schedule; /* When -- Automatic schedule */ + CLIENT *client; /* Who to backup */ + FILESET *fileset; /* What to backup -- Fileset */ + alist *storage; /* Where is device -- list of Storage to be used */ + POOL *pool; /* Where is media -- Media Pool */ + POOL *full_pool; /* Pool for Full backups */ + POOL *inc_pool; /* Pool for Incremental backups */ + POOL *diff_pool; /* Pool for Differental backups */ + char *selection_pattern; + int selection_type; + union { + JOB *verify_job; /* Job name to verify */ + }; + JOB *jobdefs; /* Job defaults */ + alist *run_cmds; /* Run commands */ + uint32_t NumConcurrentJobs; /* number of concurrent jobs running */ + + /* Methods */ + char *name() const; +}; - INCEXE **include_array; /* array of incexe structures */ - int num_includes; /* number in array */ - int include_size; /* array size */ - INCEXE **exclude_array; - int num_excludes; - int exclude_size; - int have_MD5; /* set if MD5 initialized */ - struct MD5Context md5c; /* MD5 of include/exclude */ - char MD5[30]; /* base 64 representation of MD5 */ +inline char *JOB::name() const { return hdr.name; } + +#undef MAX_FOPTS +#define MAX_FOPTS 34 + +/* File options structure */ +struct FOPTS { + char opts[MAX_FOPTS]; /* options string */ + alist regex; /* regex string(s) */ + alist regexdir; /* regex string(s) for directories */ + alist regexfile; /* regex string(s) for files */ + alist wild; /* wild card strings */ + alist wilddir; /* wild card strings for directories */ + alist wildfile; /* wild card strings for files */ + alist wildbase; /* wild card strings for files without '/' */ + alist base; /* list of base names */ + alist fstype; /* file system type limitation */ + alist drivetype; /* drive type limitation */ + char *reader; /* reader program */ + char *writer; /* writer program */ }; -typedef struct s_res_fs FILESET; - -/* - * Schedule Resource + +/* This is either an include item or an exclude item */ +struct INCEXE { + FOPTS *current_opts; /* points to current options structure */ + FOPTS **opts_list; /* options list */ + int num_opts; /* number of options items */ + alist name_list; /* filename list -- holds char * */ +}; + +/* + * FileSet Resource * */ -struct s_res_sch { - RES hdr; - - struct s_run *run; +class FILESET { +public: + RES hdr; + + bool new_include; /* Set if new include used */ + INCEXE **include_items; /* array of incexe structures */ + int num_includes; /* number in array */ + INCEXE **exclude_items; + int num_excludes; + bool have_MD5; /* set if MD5 initialized */ + struct MD5Context md5c; /* MD5 of include/exclude */ + char MD5[30]; /* base 64 representation of MD5 */ + bool ignore_fs_changes; /* Don't force Full if FS changed */ + bool enable_vss; /* Enable Volume Shadow Copy */ + + /* Methods */ + char *name() const; }; -typedef struct s_res_sch SCHED; + +inline char *FILESET::name() const { return hdr.name; } /* - * Group Resource (not used) + * Schedule Resource * */ -struct s_res_group { - RES hdr; +class SCHED { +public: + RES hdr; + + RUN *run; }; -typedef struct s_res_group GROUP; /* * Counter Resource */ -struct s_res_counter { - RES hdr; - - int32_t MinValue; /* Minimum value */ - int32_t MaxValue; /* Maximum value */ - int Global; /* global/local */ - char *WrapCounter; /* Wrap counter name */ +class COUNTER { +public: + RES hdr; + + int32_t MinValue; /* Minimum value */ + int32_t MaxValue; /* Maximum value */ + int32_t CurrentValue; /* Current value */ + COUNTER *WrapCounter; /* Wrap counter name */ + CAT *Catalog; /* Where to store */ + bool created; /* Created in DB */ + /* Methods */ + char *name() const; }; -typedef struct s_res_counter COUNTER; + +inline char *COUNTER::name() const { return hdr.name; } /* - * Pool Resource + * Pool Resource * */ -struct s_res_pool { - RES hdr; - - struct s_res_counter counter; /* Counter resources */ - char *pool_type; /* Pool type */ - char *label_format; /* Label format string */ - int use_catalog; /* maintain catalog for media */ - int catalog_files; /* maintain file entries in catalog */ - int use_volume_once; /* write on volume only once */ - int accept_any_volume; /* accept any volume */ - 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 */ +class POOL { +public: + RES hdr; + + char *pool_type; /* Pool type */ + char *label_format; /* Label format string */ + char *cleaning_prefix; /* Cleaning label prefix */ + int32_t LabelType; /* Bacula/ANSI/IBM label type */ + 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 */ + utime_t MigrationTime; /* Time to migrate to next pool */ + uint64_t MigrationHighBytes; /* When migration starts */ + uint64_t MigrationLowBytes; /* When migration stops */ + POOL *NextPool; /* Next pool for migration */ + alist *storage; /* Where is device -- list of Storage to be used */ + bool use_catalog; /* maintain catalog for media */ + bool catalog_files; /* maintain file entries in catalog */ + bool use_volume_once; /* write on volume only once */ + bool purge_oldest_volume; /* purge oldest volume */ + bool recycle_oldest_volume; /* attempt to recycle oldest volume */ + bool recycle_current_volume; /* attempt recycle of current volume */ + bool AutoPrune; /* default for pool auto prune */ + bool Recycle; /* default for media recycle yes/no */ + + /* Methods */ + char *name() const; }; -typedef struct s_res_pool POOL; + +inline char *POOL::name() const { return hdr.name; } + + /* Define the Union of all the above * resource structure definitions. */ -union u_res { - struct s_res_dir res_dir; - struct s_res_client res_client; - struct s_res_store res_store; - struct s_res_cat res_cat; - struct s_res_job res_job; - struct s_res_fs res_fs; - struct s_res_sch res_sch; - struct s_res_group res_group; - 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; +union URES { + DIRRES res_dir; + CONRES res_con; + CLIENT res_client; + STORE res_store; + CAT res_cat; + JOB res_job; + FILESET res_fs; + SCHED res_sch; + POOL res_pool; + MSGS res_msgs; + COUNTER res_counter; + DEVICE res_dev; + RES hdr; + RUNSCRIPT res_runscript; }; -typedef union u_res URES; /* Run structure contained in Schedule Resource */ -struct s_run { - struct s_run *next; /* points to next run record */ - int level; /* level override */ - int job_type; - POOL *pool; /* Pool override */ - STORE *storage; /* Storage override */ - MSGS *msgs; /* Messages override */ +class RUN { +public: + RUN *next; /* points to next run record */ + int level; /* level override */ + int Priority; /* priority override */ + int job_type; + bool spool_data; /* Data spooling override */ + bool spool_data_set; /* Data spooling override given */ + bool write_part_after_job; /* Write part after job override */ + bool write_part_after_job_set; /* Write part after job override given */ + + POOL *pool; /* Pool override */ + POOL *full_pool; /* Pool override */ + POOL *inc_pool; /* Pool override */ + POOL *diff_pool; /* Pool override */ + STORE *storage; /* Storage override */ + MSGS *msgs; /* Messages override */ char *since; int level_no; - int minute; /* minute to run job */ - time_t last_run; /* last time run */ - time_t next_run; /* next time to run */ + int minute; /* minute to run job */ + time_t last_run; /* last time run */ + time_t next_run; /* next time to run */ char hour[nbytes_for_bits(24)]; /* bit set for each hour */ 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 */ + char wom[nbytes_for_bits(5)]; /* week of month */ + char woy[nbytes_for_bits(54)]; /* week of year */ }; -typedef struct s_run RUN;