Merged martin/xattr at r5 to trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp
index eb4a8343..89226eef 100755
--- a/bin/bbackupd/BackupClientDirectoryRecord.cpp
+++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp
@@ -154,6 +154,10 @@ void BackupClientDirectoryRecord::SyncDirectory(BackupClientDirectoryRecord::Syn
 #ifndef PLATFORM_stat_NO_st_flags
 		currentStateChecksum.Add(&st.st_flags, sizeof(st.st_flags));
 #endif // n PLATFORM_stat_NO_st_flags
+
+		StreamableMemBlock xattr;
+		BackupClientFileAttributes::FillExtendedAttr(xattr, rLocalPath.c_str());
+		currentStateChecksum.Add(xattr.GetBuffer(), xattr.GetSize());
 	}
 	
 	// Read directory entries, building arrays of names
@@ -522,7 +526,7 @@ bool BackupClientDirectoryRecord::UpdateItems(BackupClientDirectoryRecord::SyncP
 			fileSize = st.st_size;
 			inodeNum = st.st_ino;
 			hasMultipleHardLinks = (st.st_nlink > 1);
-			attributesHash = BackupClientFileAttributes::GenerateAttributeHash(st, *f);
+			attributesHash = BackupClientFileAttributes::GenerateAttributeHash(st, filename, *f);
 		}
 
 		// See if it's in the listing (if we have one)