filed: added R_STORAGE to resource ids

bareos · Sep 6, 2018 · 912b81c · 912b81c
1 parent dc2ac32
commit 912b81c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/core/src/filed/filed_conf.cc b/core/src/filed/filed_conf.cc
@@ -253,11 +253,12 @@ static void ParseConfigCb(LEX *lc, ResourceItem *item, int index, int pass)
 
 static void ConfigReadyCallback(ConfigurationParser &my_config)
 {
-  std::map<int, std::string> map;
-  map.insert(std::make_pair(R_DIRECTOR, "R_DIRECTOR"));
-  map.insert(std::make_pair(R_CLIENT, "R_CLIENT"));
-//  map.insert(std::make_pair(R_STORAGE, "R_STORAGE"));
-  map.insert(std::make_pair(R_MSGS, "R_MSGS"));
+  std::map<int, std::string> map{
+    {R_DIRECTOR, "R_DIRECTOR"},
+    {R_CLIENT, "R_CLIENT"},
+    {R_STORAGE, "R_STORAGE"},
+    {R_MSGS, "R_MSGS"}
+  };
   my_config.InitializeQualifiedResourceNameTypeConverter(map);
 
 }

diff --git a/core/src/filed/filed_conf.h b/core/src/filed/filed_conf.h
@@ -40,8 +40,9 @@ enum {
    R_DIRECTOR = 1001,
    R_CLIENT,
    R_MSGS,
+   R_STORAGE,
    R_FIRST = R_DIRECTOR,
-   R_LAST = R_MSGS                    /* keep this updated */
+   R_LAST = R_STORAGE                    /* keep this updated */
 };
 
 /*