diff options
Diffstat (limited to 'lib/backupclient')
| -rw-r--r-- | lib/backupclient/BackupClientRestore.cpp | 6 | ||||
| -rw-r--r-- | lib/backupclient/BackupDaemonConfigVerify.cpp | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/backupclient/BackupClientRestore.cpp b/lib/backupclient/BackupClientRestore.cpp index d3300604..295a4252 100644 --- a/lib/backupclient/BackupClientRestore.cpp +++ b/lib/backupclient/BackupClientRestore.cpp @@ -277,7 +277,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, "out of the way of restored directory. " "Use specific restore with ID to " "restore this object."); - if(::unlink(rLocalDirectoryName.c_str()) != 0) + if(EMU_UNLINK(rLocalDirectoryName.c_str()) != 0) { BOX_LOG_SYS_ERROR("Failed to delete " "file '" << @@ -513,7 +513,7 @@ static int BackupClientRestoreDir(BackupProtocolCallable &rConnection, // files already there. if(ObjectExists(localFilename) != ObjectExists_NoObject && - ::unlink(localFilename.c_str()) != 0) + EMU_UNLINK(localFilename.c_str()) != 0) { BOX_LOG_SYS_ERROR("Failed to delete " "file '" << localFilename << @@ -912,7 +912,7 @@ int BackupClientRestore(BackupProtocolCallable &rConnection, } // Delete the resume information file - ::unlink(params.mRestoreResumeInfoFilename.c_str()); + EMU_UNLINK(params.mRestoreResumeInfoFilename.c_str()); return params.ContinuedAfterError ? Restore_CompleteWithErrors : Restore_Complete; diff --git a/lib/backupclient/BackupDaemonConfigVerify.cpp b/lib/backupclient/BackupDaemonConfigVerify.cpp index 865ee413..e28e26ff 100644 --- a/lib/backupclient/BackupDaemonConfigVerify.cpp +++ b/lib/backupclient/BackupDaemonConfigVerify.cpp @@ -8,10 +8,11 @@ // -------------------------------------------------------------------------- #include "Box.h" + +#include "BackupConstants.h" #include "BackupDaemonConfigVerify.h" -#include "Daemon.h" #include "BoxPortsAndFiles.h" -#include "BackupConstants.h" +#include "Daemon.h" #include "MemLeakFindOn.h" @@ -148,7 +149,9 @@ static const ConfigurationVerifyKey verifyrootkeys[] = ConfigTest_IsUint32), ConfigurationVerifyKey("CertificateFile", 0), ConfigurationVerifyKey("PrivateKeyFile", 0), - ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_LastEntry), + ConfigurationVerifyKey("TrustedCAsFile", 0), + ConfigurationVerifyKey("SSLSecurityLevel", ConfigTest_IsInt | ConfigTest_LastEntry, + BOX_DEFAULT_SSL_SECURITY_LEVEL), }; const ConfigurationVerify BackupDaemonConfigVerify = |