diff --git a/doc/xml/release/2024/2.54.xml b/doc/xml/release/2024/2.54.xml index dbcc535c9..ab49dd2a3 100644 --- a/doc/xml/release/2024/2.54.xml +++ b/doc/xml/release/2024/2.54.xml @@ -13,6 +13,19 @@

Fix permissions when restore run as root user.

+ + + + + + + + + + + +

Skip local repository duplicate check for SFTP.

+
diff --git a/src/config/load.c b/src/config/load.c index ad5d51345..b65630ccb 100644 --- a/src/config/load.c +++ b/src/config/load.c @@ -96,10 +96,9 @@ cfgLoadUpdateOption(void) { for (unsigned int optionIdx = 0; optionIdx < cfgOptionGroupIdxTotal(cfgOptGrpRepo); optionIdx++) { - // If the repo is local and either posix, cifs or sftp + // If the repo is local and either posix or cifs if (!cfgOptionIdxTest(cfgOptRepoHost, optionIdx) && (cfgOptionIdxStrId(cfgOptRepoType, optionIdx) == STORAGE_POSIX_TYPE || - cfgOptionIdxStrId(cfgOptRepoType, optionIdx) == STORAGE_SFTP_TYPE || cfgOptionIdxStrId(cfgOptRepoType, optionIdx) == STORAGE_CIFS_TYPE)) { // Ensure a local repo does not have the same path as another local repo of the same type diff --git a/test/src/module/config/loadTest.c b/test/src/module/config/loadTest.c index f845b5f8a..a8687b52a 100644 --- a/test/src/module/config/loadTest.c +++ b/test/src/module/config/loadTest.c @@ -118,27 +118,6 @@ testRun(void) "local repo1 and repo2 paths are both '/var/lib/pgbackrest' but must be different"); // ------------------------------------------------------------------------------------------------------------------------- -#ifdef HAVE_LIBSSH2 - TEST_TITLE("local default repo paths for sftp repo type must be different"); - - argList = strLstNew(); - hrnCfgArgRawZ(argList, cfgOptRepo, "2"); - hrnCfgArgKeyRawStrId(argList, cfgOptRepoType, 1, STORAGE_SFTP_TYPE); - hrnCfgArgKeyRawStrId(argList, cfgOptRepoType, 2, STORAGE_SFTP_TYPE); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHostUser, 1, "user1"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHostUser, 2, "user2"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHost, 1, "host1"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHost, 2, "host2"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHostKeyHashType, 1, "sha1"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpHostKeyHashType, 2, "md5"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpPrivateKeyFile, 1, "/keyfile1"); - hrnCfgArgKeyRawZ(argList, cfgOptRepoSftpPrivateKeyFile, 2, "/keyfile2"); - TEST_ERROR( - hrnCfgLoadP(cfgCmdInfo, argList), OptionInvalidValueError, - "local repo1 and repo2 paths are both '/var/lib/pgbackrest' but must be different"); -#endif // HAVE_LIBSSH2 - - // ------------------------------------------------------------------------------------------------------------------------- TEST_TITLE("local repo paths same but types different"); argList = strLstNew();