diff options
author | Ben Summers <ben@fluffy.co.uk> | 2006-01-30 20:04:53 +0000 |
---|---|---|
committer | Ben Summers <ben@fluffy.co.uk> | 2006-01-30 20:04:53 +0000 |
commit | d0418fb869e5a95022888b44fe67a31f08986d61 (patch) | |
tree | 57cc131b68cbb0685adacc7f1ac4a1ad41e11b04 /lib/backupclient/BackupDaemonConfigVerify.cpp | |
parent | 9fff72211207eda582e10f6bf5294bfa61cc40ed (diff) |
Merge chris/bb-save-state, resolving conflicts
Diffstat (limited to 'lib/backupclient/BackupDaemonConfigVerify.cpp')
-rw-r--r-- | lib/backupclient/BackupDaemonConfigVerify.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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 }; - |