diff options
60 files changed, 48 insertions, 12 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 28472f78..1d769f11 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -27,7 +27,7 @@ task: image_project: centos-cloud image_name: centos-7-v20190619 setup_script: - - yum install -y git autoconf automake gcc gcc-c++ zlib-devel openssl-devel libdb-devel readline-devel make libxslt perl-libwww-perl boost-devel + - yum install -y --disablerepo=google-cloud-sdk --disablerepo=google-compute-engine git autoconf automake gcc gcc-c++ zlib-devel openssl-devel libdb-devel readline-devel make libxslt perl-libwww-perl boost-devel - useradd -m build - chown -R build: . <<: *standard_build @@ -44,6 +44,7 @@ task: - schroot --begin-session --session-name stretch-build --chroot stretch env: CHROOT: schroot --run-session --chroot stretch-build --directory /tmp/cirrus-ci-build -- + - name: Debian 9 amd64 gce_instance: <<: *standard_gce_instance @@ -57,14 +58,33 @@ task: - ${CHROOT} chown -R build: . <<: *standard_build +freebsd_gce_instance: &freebsd_gce_instance + <<: *standard_gce_instance + platform: FreeBSD + image_project: freebsd-org-cloud-dev + # Need to use image_name for now: https://github.com/cirruslabs/cirrus-ci-docs/issues/422 + disk: 30 # Image is 29GB, VM can't be smaller + task: - name: FreeBSD 12.0 amd64 - gce_instance: - <<: *standard_gce_instance - image_project: freebsd-org-cloud-dev - image_name: freebsd-12-0-release-amd64 - disk: 30 # Image is 29GB, VM can't be smaller - platform: FreeBSD + matrix: + - name: FreeBSD 14.0 (pre) amd64 + gce_instance: + <<: *freebsd_gce_instance + image_family: freebsd-14-0-snap + - name: FreeBSD 13.0 amd64 + gce_instance: + <<: *freebsd_gce_instance + image_name: freebsd-13-0-current-amd64-v20190829 + image_family: freebsd-13-0 + - name: FreeBSD 12.3 amd64 + gce_instance: + <<: *freebsd_gce_instance + image_family: freebsd-12-3 + - name: FreeBSD 11.4 amd64 + gce_instance: + <<: *freebsd_gce_instance + image_family: freebsd-11-4 + setup_script: - pkg install -y git autoconf automake libxslt p5-libwww boost-libs - pw useradd build -m -w none diff --git a/bin/bbackupd/bbackupd-config.in b/bin/bbackupd/bbackupd-config.in index 43f63b4e..43f63b4e 100755..100644 --- a/bin/bbackupd/bbackupd-config.in +++ b/bin/bbackupd/bbackupd-config.in diff --git a/bin/bbstoreaccounts/bbstoreaccounts.cpp b/bin/bbstoreaccounts/bbstoreaccounts.cpp index 6a173680..1d4252fd 100644 --- a/bin/bbstoreaccounts/bbstoreaccounts.cpp +++ b/bin/bbstoreaccounts/bbstoreaccounts.cpp @@ -130,19 +130,35 @@ int main(int argc, const char *argv[]) // Read in the configuration file std::string errs; - std::auto_ptr<Configuration> config( + std::auto_ptr<Configuration> apConfig( Configuration::LoadAndVerify (configFilename, &BackupConfigFileVerify, errs)); - if(config.get() == 0 || !errs.empty()) + if(apConfig.get() == 0 || !errs.empty()) { BOX_ERROR("Invalid configuration file " << configFilename << ":" << errs); } +#ifndef WIN32 + // Handle changing to a different user, to match bbstored, to ensure that files don't end up + // owned by the wrong user. + const Configuration &serverConfig( + apConfig->GetSubConfiguration("Server")); + + if(serverConfig.KeyExists("User")) + { + // Config file specifies an user -- look up + UnixUser daemonUser(serverConfig.GetKeyValue("User").c_str()); + + // Change the process ID + daemonUser.ChangeProcessUser(); // temporary=false + } +#endif + // Initialise the raid file controller RaidFileController &rcontroller(RaidFileController::GetController()); - rcontroller.Initialise(config->GetKeyValue("RaidFileConf").c_str()); + rcontroller.Initialise(apConfig->GetKeyValue("RaidFileConf").c_str()); // Then... check we have two arguments if(argc < 2) @@ -158,7 +174,7 @@ int main(int argc, const char *argv[]) } std::string command = argv[0]; - BackupStoreAccountsControl control(*config, machineReadableOutput); + BackupStoreAccountsControl control(*apConfig, machineReadableOutput); // Now do the command. if(command == "create") diff --git a/bin/bbstored/bbstored-certs.in b/bin/bbstored/bbstored-certs.in index 10072a87..10072a87 100755..100644 --- a/bin/bbstored/bbstored-certs.in +++ b/bin/bbstored/bbstored-certs.in diff --git a/bin/bbstored/bbstored-config.in b/bin/bbstored/bbstored-config.in index 1efaf668..1efaf668 100755..100644 --- a/bin/bbstored/bbstored-config.in +++ b/bin/bbstored/bbstored-config.in diff --git a/cleanupforcvs.pl b/cleanupforcvs.pl index 3379a7ad..3379a7ad 100755..100644 --- a/cleanupforcvs.pl +++ b/cleanupforcvs.pl diff --git a/contrib/bbadmin/accounts.cgi b/contrib/bbadmin/accounts.cgi index d68b82c6..d68b82c6 100755..100644 --- a/contrib/bbadmin/accounts.cgi +++ b/contrib/bbadmin/accounts.cgi diff --git a/contrib/solaris/bbackupd-smf-method.in b/contrib/solaris/bbackupd-smf-method.in index 0ff610bf..0ff610bf 100755..100644 --- a/contrib/solaris/bbackupd-smf-method.in +++ b/contrib/solaris/bbackupd-smf-method.in diff --git a/contrib/solaris/bbstored-smf-method.in b/contrib/solaris/bbstored-smf-method.in index dbdb3e69..dbdb3e69 100755..100644 --- a/contrib/solaris/bbstored-smf-method.in +++ b/contrib/solaris/bbstored-smf-method.in diff --git a/contrib/windows/installer/boxbackup.mpi.in b/contrib/windows/installer/boxbackup.mpi.in index dc68f235..dc68f235 100755..100644 --- a/contrib/windows/installer/boxbackup.mpi.in +++ b/contrib/windows/installer/boxbackup.mpi.in diff --git a/contrib/windows/installer/tools/InstallService.bat b/contrib/windows/installer/tools/InstallService.bat index 80a342eb..80a342eb 100755..100644 --- a/contrib/windows/installer/tools/InstallService.bat +++ b/contrib/windows/installer/tools/InstallService.bat diff --git a/contrib/windows/installer/tools/KillBackupProcess.bat b/contrib/windows/installer/tools/KillBackupProcess.bat index 416d4a79..416d4a79 100755..100644 --- a/contrib/windows/installer/tools/KillBackupProcess.bat +++ b/contrib/windows/installer/tools/KillBackupProcess.bat diff --git a/contrib/windows/installer/tools/QueryOutputAll.bat b/contrib/windows/installer/tools/QueryOutputAll.bat index 2ab30a72..2ab30a72 100755..100644 --- a/contrib/windows/installer/tools/QueryOutputAll.bat +++ b/contrib/windows/installer/tools/QueryOutputAll.bat diff --git a/contrib/windows/installer/tools/QueryOutputCurrent.bat b/contrib/windows/installer/tools/QueryOutputCurrent.bat index d59ddbf1..d59ddbf1 100755..100644 --- a/contrib/windows/installer/tools/QueryOutputCurrent.bat +++ b/contrib/windows/installer/tools/QueryOutputCurrent.bat diff --git a/contrib/windows/installer/tools/ReloadConfig.bat b/contrib/windows/installer/tools/ReloadConfig.bat index 5fd44e83..5fd44e83 100755..100644 --- a/contrib/windows/installer/tools/ReloadConfig.bat +++ b/contrib/windows/installer/tools/ReloadConfig.bat diff --git a/contrib/windows/installer/tools/RemoveService.bat b/contrib/windows/installer/tools/RemoveService.bat index 881ec5b1..881ec5b1 100755..100644 --- a/contrib/windows/installer/tools/RemoveService.bat +++ b/contrib/windows/installer/tools/RemoveService.bat diff --git a/contrib/windows/installer/tools/RestartService.bat b/contrib/windows/installer/tools/RestartService.bat index 77092a69..77092a69 100755..100644 --- a/contrib/windows/installer/tools/RestartService.bat +++ b/contrib/windows/installer/tools/RestartService.bat diff --git a/contrib/windows/installer/tools/ShowUsage.bat b/contrib/windows/installer/tools/ShowUsage.bat index e6f69e9f..e6f69e9f 100755..100644 --- a/contrib/windows/installer/tools/ShowUsage.bat +++ b/contrib/windows/installer/tools/ShowUsage.bat diff --git a/contrib/windows/installer/tools/StartService.bat b/contrib/windows/installer/tools/StartService.bat index 1771238f..1771238f 100755..100644 --- a/contrib/windows/installer/tools/StartService.bat +++ b/contrib/windows/installer/tools/StartService.bat diff --git a/contrib/windows/installer/tools/StopService.bat b/contrib/windows/installer/tools/StopService.bat index 8e70d68d..8e70d68d 100755..100644 --- a/contrib/windows/installer/tools/StopService.bat +++ b/contrib/windows/installer/tools/StopService.bat diff --git a/contrib/windows/installer/tools/Sync.bat b/contrib/windows/installer/tools/Sync.bat index 30a04bec..30a04bec 100755..100644 --- a/contrib/windows/installer/tools/Sync.bat +++ b/contrib/windows/installer/tools/Sync.bat diff --git a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user index 51928554..51928554 100755..100644 --- a/infrastructure/cmake/build/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/build/bin_bbstored.vcxproj.user b/infrastructure/cmake/build/bin_bbstored.vcxproj.user index e48b8383..e48b8383 100755..100644 --- a/infrastructure/cmake/build/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/build/bin_bbstored.vcxproj.user diff --git a/infrastructure/cmake/build/test_backupstore.vcxproj.user b/infrastructure/cmake/build/test_backupstore.vcxproj.user index 79ef7571..79ef7571 100755..100644 --- a/infrastructure/cmake/build/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstore.vcxproj.user diff --git a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user index c0895191..c0895191 100755..100644 --- a/infrastructure/cmake/build/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/build/test_backupstorefix.vcxproj.user diff --git a/infrastructure/cmake/build/test_bbackupd.vcxproj.user b/infrastructure/cmake/build/test_bbackupd.vcxproj.user index 9ca2b5e9..9ca2b5e9 100755..100644 --- a/infrastructure/cmake/build/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/build/test_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/build/test_common.vcxproj.user b/infrastructure/cmake/build/test_common.vcxproj.user index 7a375f10..7a375f10 100755..100644 --- a/infrastructure/cmake/build/test_common.vcxproj.user +++ b/infrastructure/cmake/build/test_common.vcxproj.user diff --git a/infrastructure/cmake/build/test_httpserver.vcxproj.user b/infrastructure/cmake/build/test_httpserver.vcxproj.user index b2da015c..b2da015c 100755..100644 --- a/infrastructure/cmake/build/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/build/test_httpserver.vcxproj.user diff --git a/infrastructure/cmake/build/test_raidfile.vcxproj.user b/infrastructure/cmake/build/test_raidfile.vcxproj.user index d2c2fc34..d2c2fc34 100755..100644 --- a/infrastructure/cmake/build/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/build/test_raidfile.vcxproj.user diff --git a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user index 51928554..51928554 100755..100644 --- a/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user index e48b8383..e48b8383 100755..100644 --- a/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user +++ b/infrastructure/cmake/msvc/bin_bbstored.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user index 79ef7571..79ef7571 100755..100644 --- a/infrastructure/cmake/msvc/test_backupstore.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstore.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user index c0895191..c0895191 100755..100644 --- a/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user +++ b/infrastructure/cmake/msvc/test_backupstorefix.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user index 9ca2b5e9..9ca2b5e9 100755..100644 --- a/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user +++ b/infrastructure/cmake/msvc/test_bbackupd.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_common.vcxproj.user b/infrastructure/cmake/msvc/test_common.vcxproj.user index 7a375f10..7a375f10 100755..100644 --- a/infrastructure/cmake/msvc/test_common.vcxproj.user +++ b/infrastructure/cmake/msvc/test_common.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user index b2da015c..b2da015c 100755..100644 --- a/infrastructure/cmake/msvc/test_httpserver.vcxproj.user +++ b/infrastructure/cmake/msvc/test_httpserver.vcxproj.user diff --git a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user index d2c2fc34..d2c2fc34 100755..100644 --- a/infrastructure/cmake/msvc/test_raidfile.vcxproj.user +++ b/infrastructure/cmake/msvc/test_raidfile.vcxproj.user diff --git a/infrastructure/config.guess b/infrastructure/config.guess index b79252d6..b79252d6 100755..100644 --- a/infrastructure/config.guess +++ b/infrastructure/config.guess diff --git a/infrastructure/config.sub b/infrastructure/config.sub index 8b612ab8..8b612ab8 100755..100644 --- a/infrastructure/config.sub +++ b/infrastructure/config.sub diff --git a/infrastructure/makebuildenv.pl.in b/infrastructure/makebuildenv.pl.in index 48958ba1..48958ba1 100755..100644 --- a/infrastructure/makebuildenv.pl.in +++ b/infrastructure/makebuildenv.pl.in diff --git a/infrastructure/makedistribution.pl.in b/infrastructure/makedistribution.pl.in index 0ccd92be..0ccd92be 100755..100644 --- a/infrastructure/makedistribution.pl.in +++ b/infrastructure/makedistribution.pl.in diff --git a/infrastructure/setupexternal.pl b/infrastructure/setupexternal.pl index 87ec5560..87ec5560 100755..100644 --- a/infrastructure/setupexternal.pl +++ b/infrastructure/setupexternal.pl diff --git a/lib/bbackupquery/makedocumentation.pl.in b/lib/bbackupquery/makedocumentation.pl.in index 503ac9c8..503ac9c8 100755..100644 --- a/lib/bbackupquery/makedocumentation.pl.in +++ b/lib/bbackupquery/makedocumentation.pl.in diff --git a/lib/common/makeexception.pl.in b/lib/common/makeexception.pl.in index bddaa94a..bddaa94a 100755..100644 --- a/lib/common/makeexception.pl.in +++ b/lib/common/makeexception.pl.in diff --git a/lib/raidfile/raidfile-config.in b/lib/raidfile/raidfile-config.in index b8ea73a5..b8ea73a5 100755..100644 --- a/lib/raidfile/raidfile-config.in +++ b/lib/raidfile/raidfile-config.in diff --git a/lib/server/makeprotocol.pl.in b/lib/server/makeprotocol.pl.in index d6c0e216..d6c0e216 100755..100644 --- a/lib/server/makeprotocol.pl.in +++ b/lib/server/makeprotocol.pl.in diff --git a/lib/win32/MSG00001.bin b/lib/win32/MSG00001.bin Binary files differindex b4377b85..b4377b85 100755..100644 --- a/lib/win32/MSG00001.bin +++ b/lib/win32/MSG00001.bin diff --git a/lib/win32/bsd_getopt.h b/lib/win32/bsd_getopt.h index 3e2441ca..3e2441ca 100755..100644 --- a/lib/win32/bsd_getopt.h +++ b/lib/win32/bsd_getopt.h diff --git a/lib/win32/getopt_long.cpp b/lib/win32/getopt_long.cpp index af2833a1..af2833a1 100755..100644 --- a/lib/win32/getopt_long.cpp +++ b/lib/win32/getopt_long.cpp diff --git a/lib/win32/messages.h b/lib/win32/messages.h index 22290226..22290226 100755..100644 --- a/lib/win32/messages.h +++ b/lib/win32/messages.h diff --git a/lib/win32/messages.rc b/lib/win32/messages.rc index 116522b7..116522b7 100755..100644 --- a/lib/win32/messages.rc +++ b/lib/win32/messages.rc diff --git a/qdbm/misc/makevcdef b/qdbm/misc/makevcdef index 7b36e307..7b36e307 100755..100644 --- a/qdbm/misc/makevcdef +++ b/qdbm/misc/makevcdef diff --git a/runtest.pl.in b/runtest.pl.in index a864336b..a864336b 100755..100644 --- a/runtest.pl.in +++ b/runtest.pl.in diff --git a/test/backupstorefix/testfiles/testbackupstorefix.pl.in b/test/backupstorefix/testfiles/testbackupstorefix.pl.in index 483087f7..483087f7 100755..100644 --- a/test/backupstorefix/testfiles/testbackupstorefix.pl.in +++ b/test/backupstorefix/testfiles/testbackupstorefix.pl.in diff --git a/test/bbackupd/testfiles/extcheck1.pl.in b/test/bbackupd/testfiles/extcheck1.pl.in index c80ddc66..c80ddc66 100755..100644 --- a/test/bbackupd/testfiles/extcheck1.pl.in +++ b/test/bbackupd/testfiles/extcheck1.pl.in diff --git a/test/bbackupd/testfiles/extcheck2.pl.in b/test/bbackupd/testfiles/extcheck2.pl.in index 02c258f8..02c258f8 100755..100644 --- a/test/bbackupd/testfiles/extcheck2.pl.in +++ b/test/bbackupd/testfiles/extcheck2.pl.in diff --git a/test/bbackupd/testfiles/notifyscript.pl.in b/test/bbackupd/testfiles/notifyscript.pl.in index d3e324e9..d3e324e9 100755..100644 --- a/test/bbackupd/testfiles/notifyscript.pl.in +++ b/test/bbackupd/testfiles/notifyscript.pl.in diff --git a/test/bbackupd/testfiles/syncallowscript.pl.in b/test/bbackupd/testfiles/syncallowscript.pl.in index f2ef1171..f2ef1171 100755..100644 --- a/test/bbackupd/testfiles/syncallowscript.pl.in +++ b/test/bbackupd/testfiles/syncallowscript.pl.in diff --git a/test/crypto/testfiles/bfdlink.h b/test/crypto/testfiles/bfdlink.h index 29eeb661..29eeb661 100755..100644 --- a/test/crypto/testfiles/bfdlink.h +++ b/test/crypto/testfiles/bfdlink.h diff --git a/test/httpserver/testfiles/testrequests.pl b/test/httpserver/testfiles/testrequests.pl index fd4274b4..fd4274b4 100755..100644 --- a/test/httpserver/testfiles/testrequests.pl +++ b/test/httpserver/testfiles/testrequests.pl |