summaryrefslogtreecommitdiff
path: root/lib/backupclient/BackupDaemonConfigVerify.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'lib/backupclient/BackupDaemonConfigVerify.cpp')
-rw-r--r--lib/backupclient/BackupDaemonConfigVerify.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/lib/backupclient/BackupDaemonConfigVerify.cpp b/lib/backupclient/BackupDaemonConfigVerify.cpp
index dfef5b03..3104ae8e 100644
--- a/lib/backupclient/BackupDaemonConfigVerify.cpp
+++ b/lib/backupclient/BackupDaemonConfigVerify.cpp
@@ -114,12 +114,25 @@ static const ConfigurationVerifyKey verifyrootkeys[] =
ConfigurationVerifyKey("NotifyAlways", ConfigTest_IsBool, false),
// option to disable the suppression of duplicate notifications
+<<<<<<< HEAD
+=======
+ ConfigurationVerifyKey("MaxUploadRate", ConfigTest_IsInt),
+ // optional maximum speed of uploads in kbytes per second
+
+ ConfigurationVerifyKey("TcpNice", ConfigTest_IsBool, false),
+ // optional enable of tcp nice/background mode
+
+>>>>>>> 0.12
ConfigurationVerifyKey("CertificateFile", ConfigTest_Exists),
ConfigurationVerifyKey("PrivateKeyFile", ConfigTest_Exists),
ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_Exists),
ConfigurationVerifyKey("KeysFile", ConfigTest_Exists),
ConfigurationVerifyKey("DataDirectory",
ConfigTest_Exists | ConfigTest_LastEntry),
+<<<<<<< HEAD
+=======
+
+>>>>>>> 0.12
};
const ConfigurationVerify BackupDaemonConfigVerify =