[Box Backup-commit] COMMIT r3591 - in box/trunk: bin/bbackupd lib/backupclient

subversion at boxbackup.org subversion at boxbackup.org
Fri Jul 31 07:39:14 BST 2015


Author: chris
Date: 2015-07-31 06:39:13 +0000 (Fri, 31 Jul 2015)
New Revision: 3591

Modified:
   box/trunk/bin/bbackupd/BackupDaemon.cpp
   box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp
Log:
Add AccountNumber to list of config keys checked at runtime.

S3Stores don't have account numbers.

Modified: box/trunk/bin/bbackupd/BackupDaemon.cpp
===================================================================
--- box/trunk/bin/bbackupd/BackupDaemon.cpp	2015-07-25 19:17:37 UTC (rev 3590)
+++ box/trunk/bin/bbackupd/BackupDaemon.cpp	2015-07-31 06:39:13 UTC (rev 3591)
@@ -340,6 +340,7 @@
 	// 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");

Modified: box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp
===================================================================
--- box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp	2015-07-25 19:17:37 UTC (rev 3590)
+++ box/trunk/lib/backupclient/BackupDaemonConfigVerify.cpp	2015-07-31 06:39:13 UTC (rev 3591)
@@ -82,8 +82,6 @@
 
 static const ConfigurationVerifyKey verifyrootkeys[] =
 {
-	ConfigurationVerifyKey("AccountNumber",
-		ConfigTest_Exists | ConfigTest_IsUint32),
 	ConfigurationVerifyKey("UpdateStoreInterval",
 		ConfigTest_Exists | ConfigTest_IsInt),
 	ConfigurationVerifyKey("BackupErrorDelay",
@@ -146,6 +144,8 @@
 	ConfigurationVerifyKey("StoreHostname", 0),
 	ConfigurationVerifyKey("StorePort", ConfigTest_IsInt,
 		BOX_PORT_BBSTORED),
+	ConfigurationVerifyKey("AccountNumber",
+		ConfigTest_IsUint32),
 	ConfigurationVerifyKey("CertificateFile", 0),
 	ConfigurationVerifyKey("PrivateKeyFile", 0),
 	ConfigurationVerifyKey("TrustedCAsFile", ConfigTest_LastEntry),




More information about the Boxbackup-commit mailing list