diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2015-07-31 06:39:13 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2015-07-31 06:39:13 +0000 |
| commit | 7bd7cfd109f11326d17d098973ac6a942aaf1ba5 (patch) | |
| tree | c27dd0af11f255907f9f4196393a9ef7f25f1392 | |
| parent | c8b85e5be8ab0e58bd4f946dec4683a376df4381 (diff) | |
Add AccountNumber to list of config keys checked at runtime.
S3Stores don't have account numbers.
| -rw-r--r-- | bin/bbackupd/BackupDaemon.cpp | 1 | ||||
| -rw-r--r-- | lib/backupclient/BackupDaemonConfigVerify.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/bbackupd/BackupDaemon.cpp b/bin/bbackupd/BackupDaemon.cpp index fa55cdad..41b68d02 100644 --- a/bin/bbackupd/BackupDaemon.cpp +++ b/bin/bbackupd/BackupDaemon.cpp @@ -340,6 +340,7 @@ void BackupDaemon::SetupInInitialProcess() // verified by BackupDaemonConfigVerify. std::vector<std::string> requiredKeys; requiredKeys.push_back("StoreHostname"); + requiredKeys.push_back("AccountNumber"); requiredKeys.push_back("CertificateFile"); requiredKeys.push_back("PrivateKeyFile"); requiredKeys.push_back("TrustedCAsFile"); diff --git a/lib/backupclient/BackupDaemonConfigVerify.cpp b/lib/backupclient/BackupDaemonConfigVerify.cpp index 3be41df9..8390f2f3 100644 --- a/lib/backupclient/BackupDaemonConfigVerify.cpp +++ b/lib/backupclient/BackupDaemonConfigVerify.cpp @@ -82,8 +82,6 @@ static const ConfigurationVerify verifyserver[] = static const ConfigurationVerifyKey verifyrootkeys[] = { - ConfigurationVerifyKey("AccountNumber", - ConfigTest_Exists | ConfigTest_IsUint32), ConfigurationVerifyKey("UpdateStoreInterval", ConfigTest_Exists | ConfigTest_IsInt), ConfigurationVerifyKey("BackupErrorDelay", @@ -146,6 +144,8 @@ static const ConfigurationVerifyKey verifyrootkeys[] = ConfigurationVerifyKey("StoreHostname", 0), ConfigurationVerifyKey("StorePort", ConfigTest_IsInt, BOX_PORT_BBSTORED), + ConfigurationVerifyKey("AccountNumber", + ConfigTest_IsUint32), ConfigurationVerifyKey("CertificateFile", 0), ConfigurationVerifyKey("PrivateKeyFile", 0), ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_LastEntry), |