From d0418fb869e5a95022888b44fe67a31f08986d61 Mon Sep 17 00:00:00 2001 From: Ben Summers Date: Mon, 30 Jan 2006 20:04:53 +0000 Subject: Merge chris/bb-save-state, resolving conflicts --- lib/backupclient/BackupDaemonConfigVerify.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/backupclient/BackupDaemonConfigVerify.cpp') diff --git a/lib/backupclient/BackupDaemonConfigVerify.cpp b/lib/backupclient/BackupDaemonConfigVerify.cpp index f1d5bd16..89ad4d54 100644 --- a/lib/backupclient/BackupDaemonConfigVerify.cpp +++ b/lib/backupclient/BackupDaemonConfigVerify.cpp @@ -85,6 +85,7 @@ static const ConfigurationVerifyKey verifyrootkeys[] = {"CommandSocket", 0, 0, 0}, // not compulsory to have this {"KeepAliveTime", 0, ConfigTest_IsInt, 0}, // optional + {"StoreObjectInfoFile", 0, 0, 0}, // optional {"NotifyScript", 0, 0, 0}, // optional script to run when backup needs attention, eg store full @@ -103,4 +104,3 @@ const ConfigurationVerify BackupDaemonConfigVerify = ConfigTest_Exists | ConfigTest_LastEntry, 0 }; - -- cgit v1.2.3