- Tweak catalog make scripts.

[bacula/bacula] / bacula / src / dird / dird_conf.h

diff --git a/bacula/src/dird/dird_conf.h b/bacula/src/dird/dird_conf.h
index 0108c6a997687ab76117f38b56256e65ac49f72a..f4387202c372cdfa6170c0dcf10402345b2704a5 100644 (file)
--- a/bacula/src/dird/dird_conf.h
+++ b/bacula/src/dird/dird_conf.h
@@ -77,13 +77,13 @@ struct s_jt {
 
 /* Definition of the contents of each Resource */
 /* Needed for forward references */
-struct SCHED;
-struct CLIENT;
-struct FILESET;
-struct POOL;
-struct RUN;
-struct DEVICE;
-struct RUNSCRIPT;
+class SCHED;
+class CLIENT;
+class FILESET;
+class POOL;
+class RUN;
+class DEVICE;
+class RUNSCRIPT;
 
 /*
  *   Director Resource
@@ -113,8 +113,13 @@ public:
    bool tls_enable;                   /* Enable TLS */
    bool tls_require;                  /* Require TLS */
    bool tls_verify_peer;              /* TLS Verify Client Certificate */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *DIRRES::name() const { return hdr.name; }
+
 /*
  * Device Resource
  *  This resource is a bit different from the other resources
@@ -143,8 +148,13 @@ public:
    char ChangerName[MAX_NAME_LENGTH];
    char VolumeName[MAX_NAME_LENGTH];
    char MediaType[MAX_NAME_LENGTH];
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *DEVICE::name() const { return hdr.name; }
+
 /*
  * Console ACL positions
  */
@@ -179,8 +189,13 @@ public:
    bool tls_enable;                   /* Enable TLS */
    bool tls_require;                  /* Require TLS */
    bool tls_verify_peer;              /* TLS Verify Client Certificate */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *CONRES::name() const { return hdr.name; }
+
 
 /*
  *   Catalog Resource
@@ -197,8 +212,13 @@ public:
    char *db_user;
    char *db_name;
    int   mult_db_connections;         /* set if multiple connections wanted */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *CAT::name() const { return hdr.name; }
+
 
 /*
  *   Client Resource
@@ -224,8 +244,14 @@ public:
    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
  *
@@ -317,7 +343,7 @@ public:
    POOL      *pool;                   /* Where is media -- Media Pool */
    POOL      *full_pool;              /* Pool for Full backups */
    POOL      *inc_pool;               /* Pool for Incremental backups */
-   POOL      *dif_pool;               /* Pool for Differental backups */
+   POOL      *diff_pool;              /* Pool for Differental backups */
    POOL      *next_pool;              /* Next Pool for Migration */
    char      *selection_pattern;
    int        selection_type;
@@ -327,8 +353,13 @@ public:
    JOB       *jobdefs;                /* Job defaults */
    alist     *run_cmds;               /* Run commands */
    uint32_t NumConcurrentJobs;        /* number of concurrent jobs running */
+
+   /* Methods */
+   char *name() const;
 };
 
+inline char *JOB::name() const { return hdr.name; }
+
 #undef  MAX_FOPTS
 #define MAX_FOPTS 34
 
@@ -374,8 +405,12 @@ public:
    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;
 };
 
+inline char *FILESET::name() const { return hdr.name; }
 
 /*
  *   Schedule Resource
@@ -401,8 +436,12 @@ public:
    COUNTER *WrapCounter;              /* Wrap counter name */
    CAT     *Catalog;                  /* Where to store */
    bool     created;                  /* Created in DB */
+   /* Methods */
+   char *name() const;
 };
 
+inline char *COUNTER::name() const { return hdr.name; }
+
 /*
  *   Pool Resource
  *
@@ -429,14 +468,18 @@ public:
    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  accept_any_volume;           /* accept any volume */
    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;
 };
 
+inline char *POOL::name() const { return hdr.name; }
+
 
 
 
@@ -477,7 +520,7 @@ public:
    POOL *pool;                        /* Pool override */
    POOL *full_pool;                   /* Pool override */
    POOL *inc_pool;                    /* Pool override */
-   POOL *dif_pool;                    /* Pool override */
+   POOL *diff_pool;                   /* Pool override */
    STORE *storage;                    /* Storage override */
    MSGS *msgs;                        /* Messages override */
    char *since;