diff --git a/core/src/cats/cats_backends.cc b/core/src/cats/cats_backends.cc index 547211f80cd..9f871110878 100644 --- a/core/src/cats/cats_backends.cc +++ b/core/src/cats/cats_backends.cc @@ -63,9 +63,9 @@ static struct backend_interface_mapping_t { static alist* loaded_backends = NULL; static std::vector backend_dirs; -void DbSetBackendDirs(std::vector&& new_backend_dirs) +void DbSetBackendDirs(std::vector& new_backend_dirs) { - backend_dirs = std::move(new_backend_dirs); + backend_dirs = new_backend_dirs; } static inline backend_interface_mapping_t* lookup_backend_interface_mapping( diff --git a/core/src/cats/cats_backends.h b/core/src/cats/cats_backends.h index 63d11af5f68..b8a7e708ac7 100644 --- a/core/src/cats/cats_backends.h +++ b/core/src/cats/cats_backends.h @@ -2,7 +2,7 @@ BAREOSĀ® - Backup Archiving REcovery Open Sourced Copyright (C) 2011-2016 Planets Communications B.V. - Copyright (C) 2013-2016 Bareos GmbH & Co. KG + Copyright (C) 2013-2020 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -74,7 +74,7 @@ struct backend_shared_library_t { #endif #if defined(HAVE_DYNAMIC_CATS_BACKENDS) -void DbSetBackendDirs(std::vector&& new_backend_dirs); +void DbSetBackendDirs(std::vector& new_backend_dirs); #endif void DbFlushBackends(void); BareosDb* db_init_database(JobControlRecord* jcr, diff --git a/core/src/dird/dbcheck.cc b/core/src/dird/dbcheck.cc index 14f0457fd13..18d2a62c33d 100644 --- a/core/src/dird/dbcheck.cc +++ b/core/src/dird/dbcheck.cc @@ -1089,7 +1089,7 @@ int main(int argc, char* argv[]) SetWorkingDirectory(me->working_directory); #if defined(HAVE_DYNAMIC_CATS_BACKENDS) - DbSetBackendDirs(std::move(me->backend_directories)); + DbSetBackendDirs(me->backend_directories); #endif /* @@ -1156,7 +1156,7 @@ int main(int argc, char* argv[]) #if defined(HAVE_DYNAMIC_CATS_BACKENDS) backend_directories.emplace_back(backend_directory); - DbSetBackendDirs(std::move(backend_directories)); + DbSetBackendDirs(backend_directories); #endif } diff --git a/core/src/dird/dbcopy/dbcopy.cc b/core/src/dird/dbcopy/dbcopy.cc index c1e3dfb932c..b7de34cae3e 100644 --- a/core/src/dird/dbcopy/dbcopy.cc +++ b/core/src/dird/dbcopy/dbcopy.cc @@ -111,7 +111,7 @@ class DbCopy { throw std::runtime_error("Could not find director resource."); } - DbSetBackendDirs(std::move(directordaemon::me->backend_directories)); + DbSetBackendDirs(directordaemon::me->backend_directories); } void ConnectToDatabases() diff --git a/core/src/dird/dird.cc b/core/src/dird/dird.cc index e7b1189ffdd..91667769722 100644 --- a/core/src/dird/dird.cc +++ b/core/src/dird/dird.cc @@ -379,7 +379,7 @@ int main(int argc, char* argv[]) Dmsg1(100, "backend path: %s\n", backend_dir.c_str()); } - DbSetBackendDirs(std::move(me->backend_directories)); + DbSetBackendDirs(me->backend_directories); #endif LoadDirPlugins(me->plugin_directory, me->plugin_names); diff --git a/core/src/stored/bscan.cc b/core/src/stored/bscan.cc index d9384b6d688..26e06ee4bed 100644 --- a/core/src/stored/bscan.cc +++ b/core/src/stored/bscan.cc @@ -356,7 +356,7 @@ int main(int argc, char* argv[]) #if defined(HAVE_DYNAMIC_CATS_BACKENDS) backend_directories.emplace_back(backend_directory); - DbSetBackendDirs(std::move(backend_directories)); + DbSetBackendDirs(backend_directories); #endif db = db_init_database(NULL, db_driver, db_name, db_user, db_password, db_host, diff --git a/core/src/tests/catalog.cc b/core/src/tests/catalog.cc index 354d4424a67..a43d2c4e014 100644 --- a/core/src/tests/catalog.cc +++ b/core/src/tests/catalog.cc @@ -1,7 +1,7 @@ /* BAREOSĀ® - Backup Archiving REcovery Open Sourced - Copyright (C) 2019-2019 Bareos GmbH & Co. KG + Copyright (C) 2019-2020 Bareos GmbH & Co. KG This program is Free Software; you can redistribute it and/or modify it under the terms of version three of the GNU Affero General Public @@ -111,7 +111,9 @@ void CatalogTest::SetUp() ASSERT_NE(jcr->impl->res.catalog, nullptr); - DbSetBackendDirs(std::vector{backend_dir}); + auto backenddir = std::vector{backend_dir}; + DbSetBackendDirs(backenddir); + db = directordaemon::GetDatabaseConnection(jcr); ASSERT_NE(db, nullptr);