Remove some unused config keywords.

bareos · Dec 11, 2014 · b459035 · b459035
1 parent 8735c0b
commit b459035
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 7 deletions.
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
@@ -105,7 +105,6 @@ static RES_ITEM dir_items[] = {
    { "BackendDirectory", CFG_TYPE_ALIST_DIR, ITEM(res_dir.backend_directories), 0, CFG_ITEM_DEFAULT | CFG_ITEM_PLATFORM_SPECIFIC, _PATH_BAREOS_BACKENDDIR },
 #endif
    { "Subscriptions", CFG_TYPE_PINT32, ITEM(res_dir.subscriptions), 0, CFG_ITEM_DEFAULT, "0" },
-   { "SubSysDirectory", CFG_TYPE_DIR, ITEM(res_dir.subsys_directory), 0, 0, NULL },
    { "MaximumConcurrentJobs", CFG_TYPE_PINT32, ITEM(res_dir.MaxConcurrentJobs), 0, CFG_ITEM_DEFAULT, "1" },
    { "MaximumConsoleConnections", CFG_TYPE_PINT32, ITEM(res_dir.MaxConsoleConnect), 0, CFG_ITEM_DEFAULT, "20" },
    { "Password", CFG_TYPE_AUTOPASSWORD, ITEM(res_dir.password), 0, CFG_ITEM_REQUIRED, NULL },
@@ -446,7 +445,6 @@ static RES_ITEM pool_items[] = {
    { "Recycle", CFG_TYPE_BOOL, ITEM(res_pool.Recycle), 0, CFG_ITEM_DEFAULT, "true" },
    { "RecyclePool", CFG_TYPE_RES, ITEM(res_pool.RecyclePool), R_POOL, 0, NULL },
    { "ScratchPool", CFG_TYPE_RES, ITEM(res_pool.ScratchPool), R_POOL, 0, NULL },
-   { "CopyPool", CFG_TYPE_ALIST_RES, ITEM(res_pool.CopyPool), R_POOL, 0, NULL },
    { "Catalog", CFG_TYPE_RES, ITEM(res_pool.catalog), R_CATALOG, 0, NULL },
    { "FileRetention", CFG_TYPE_TIME, ITEM(res_pool.FileRetention), 0, 0, NULL },
    { "JobRetention", CFG_TYPE_TIME, ITEM(res_pool.JobRetention), 0, 0, NULL },
@@ -1696,9 +1694,6 @@ void free_resource(RES *sres, int type)
       if (res->res_dir.pid_directory) {
          free(res->res_dir.pid_directory);
       }
-      if (res->res_dir.subsys_directory) {
-         free(res->res_dir.subsys_directory);
-      }
       if (res->res_dir.backend_directories) {
          delete res->res_dir.backend_directories;
       }

diff --git a/src/dird/dird_conf.h b/src/dird/dird_conf.h
@@ -104,7 +104,6 @@ class DIRRES: public BRSRES {
    char *plugin_directory;            /* Plugin Directory */
    alist *plugin_names;               /* Plugin names to load */
    char *pid_directory;               /* PidDirectory */
-   char *subsys_directory;            /* SubsysDirectory */
    alist *backend_directories;        /* Backend Directories */
    MSGSRES *messages;                 /* Daemon message handler */
    uint32_t MaxConcurrentJobs;        /* Max concurrent jobs for whole director */
@@ -559,7 +558,6 @@ class POOLRES: public BRSRES {
    uint32_t action_on_purge;          /* action on purge, e.g. truncate the disk volume */
    POOLRES *RecyclePool;              /* RecyclePool destination when media is purged */
    POOLRES *ScratchPool;              /* ScratchPool source when requesting media */
-   alist *CopyPool;                   /* List of copy pools */
    CATRES *catalog;                   /* Catalog to be used */
    utime_t FileRetention;             /* file retention period in seconds */
    utime_t JobRetention;              /* job retention period in seconds */