Mark subsysdirectory as deprecated.

SubSysDirectory is not used anywhere but it could be some people have it in their configs so for now its deprecated and will be removed in a future version.
bareos · Dec 11, 2014 · 4fafcce · 4fafcce
1 parent bd373aa
commit 4fafcce
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/src/dird/dird_conf.c b/src/dird/dird_conf.c
@@ -105,6 +105,7 @@ 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), CFG_ITEM_DEPRECATED, 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 },
@@ -1694,6 +1695,9 @@ 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,6 +104,7 @@ 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 */

diff --git a/src/filed/filed_conf.c b/src/filed/filed_conf.c
@@ -83,7 +83,7 @@ static RES_ITEM cli_items[] = {
    { "fdsourceaddress", CFG_TYPE_ADDRESSES_ADDRESS, ITEM(res_client.FDsrc_addr), 0, CFG_ITEM_DEFAULT, "0" },
    { "workingdirectory", CFG_TYPE_DIR, ITEM(res_client.working_directory), 0, CFG_ITEM_DEFAULT, _PATH_BAREOS_WORKINGDIR },
    { "piddirectory", CFG_TYPE_DIR, ITEM(res_client.pid_directory), 0, CFG_ITEM_DEFAULT, _PATH_BAREOS_PIDDIR },
-   { "subsysdirectory", CFG_TYPE_DIR, ITEM(res_client.subsys_directory), 0, 0, NULL },
+   { "subsysdirectory", CFG_TYPE_DIR, ITEM(res_client.subsys_directory), CFG_ITEM_DEPRECATED, 0, NULL },
    { "plugindirectory", CFG_TYPE_DIR, ITEM(res_client.plugin_directory), 0, 0, NULL },
    { "pluginnames", CFG_TYPE_PLUGIN_NAMES, ITEM(res_client.plugin_names), 0, 0, NULL },
    { "scriptsdirectory", CFG_TYPE_DIR, ITEM(res_client.scripts_directory), 0, 0, NULL },

diff --git a/src/stored/stored.conf.in b/src/stored/stored.conf.in
@@ -11,7 +11,6 @@ Storage {
   SDPort = @sd_port@                  # Directors port
   WorkingDirectory = "@working_dir@"
   Pid Directory = "@piddir@"
-  Subsys Directory = "@subsysdir@"
 }
 
 #

diff --git a/src/stored/stored_conf.c b/src/stored/stored_conf.c
@@ -64,7 +64,7 @@ static RES_ITEM store_items[] = {
    { "sdsourceaddress", CFG_TYPE_ADDRESSES_ADDRESS, ITEM(res_store.SDsrc_addr), 0, CFG_ITEM_DEFAULT, "0" },
    { "workingdirectory", CFG_TYPE_DIR, ITEM(res_store.working_directory), 0, CFG_ITEM_DEFAULT, _PATH_BAREOS_WORKINGDIR },
    { "piddirectory", CFG_TYPE_DIR, ITEM(res_store.pid_directory), 0, CFG_ITEM_DEFAULT, _PATH_BAREOS_PIDDIR },
-   { "subsysdirectory", CFG_TYPE_DIR, ITEM(res_store.subsys_directory), 0, 0, NULL },
+   { "subsysdirectory", CFG_TYPE_DIR, ITEM(res_store.subsys_directory), CFG_ITEM_DEPRECATED, 0, NULL },
 #if defined(HAVE_DYNAMIC_SD_BACKENDS)
    { "backenddirectory", CFG_TYPE_ALIST_DIR, ITEM(res_store.backend_directories), 0, CFG_ITEM_DEFAULT, _PATH_BAREOS_BACKENDDIR },
 #endif