remove special case for root console from GetTlsPskByFullyQualifiedRe…

…sourceName
bareos · Sep 4, 2018 · 76bb573 · 76bb573
1 parent b087605
commit 76bb573
Showing 1 changed file with 4 additions and 11 deletions.
diff --git a/core/src/dird/dird_conf.cc b/core/src/dird/dird_conf.cc
@@ -3783,18 +3783,11 @@ static void PrintConfigCb(ResourceItem *items, int i, PoolMem &cfg_str, bool hid
 static void ConfigReadyCallback(ConfigurationParser &my_config)
 {
 
-   const std::string ua("*UserAgent*");
-
    bool success = false;
-   if (fq_name == ua) {
-      psk_return_value = me->password.value;
-      success = true;
-   } else {
-      ConsoleResource *res = reinterpret_cast<ConsoleResource*>(my_config->GetResWithName(R_CONSOLE, fq_name.c_str()));
-      if(res) {
-         psk_return_value = res->password.value;
-         success = true;
-      }
+   ConsoleResource *res = reinterpret_cast<ConsoleResource*>(my_config->GetResWithName(R_CONSOLE, fq_name.c_str()));
+   if(res) {
+     psk_return_value = res->password.value;
+     success = true;
    }
    return success;
 }