diff options
| author | Chris Wilson <chris+github@qwirx.com> | 2009-03-29 13:51:24 +0000 |
|---|---|---|
| committer | Chris Wilson <chris+github@qwirx.com> | 2009-03-29 13:51:24 +0000 |
| commit | ef3d1642c083a9c69eb48c6ab8ecc9be43dfbcfc (patch) | |
| tree | 832e4994de4e02343616b5cd4454a3bb85f61b3b /bin/bbackupd/BackupClientDirectoryRecord.cpp | |
| parent | 2b51c2d2a265957abf6b2aee9901f9bd51d07ba6 (diff) | |
Change type of BackupStoreFilename not to derive from std::string, so
it can't accidentally be used as one.
Fix use of encrypted filename in deleted file message, thanks to Kenny
Millington for reporting.
Diffstat (limited to 'bin/bbackupd/BackupClientDirectoryRecord.cpp')
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index 4ecb81d9..b8d42d47 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -1386,8 +1386,9 @@ bool BackupClientDirectoryRecord::UpdateItems( // aren't actually deleted, as the whole state will be reset anyway. BackupClientDeleteList &rdel(rContext.GetDeleteList()); + BackupStoreFilenameClear clear(en->GetName()); std::string localName = MakeFullPath(rLocalPath, - en->GetName()); + clear.GetClearFilename()); // Delete this entry -- file or directory? if((en->GetFlags() & BackupStoreDirectory::Entry::Flags_File) != 0) |