scriptis/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge "libstore: restore mode after changing xattrs" into main

Browse source
This commit is contained in:
Dusk Banks 2024-10-30 14:56:43 +00:00 committed by Gerrit Code Review
parent 9c22a4d31b 60b89c63db
commit 8b2f8d538b
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/libstore/local-store.cc
View file

@ -691,13 +691,20 @@ static void canonicalisePathMetaData_(
if ((eaSize = llistxattr(path.c_str(), eaBuf.data(), eaBuf.size())) < 0) if ((eaSize = llistxattr(path.c_str(), eaBuf.data(), eaBuf.size())) < 0)
throw SysError("querying extended attributes of '%s'", path); throw SysError("querying extended attributes of '%s'", path);
if (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) bool resetMode = false;
if ((S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)) && !(st.st_mode & S_IWUSR)) {
resetMode = true;
chmod(path.c_str(), st.st_mode | S_IWUSR); chmod(path.c_str(), st.st_mode | S_IWUSR);
}
for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) { for (auto & eaName: tokenizeString<Strings>(std::string(eaBuf.data(), eaSize), std::string("\000", 1))) {
if (settings.ignoredAcls.get().count(eaName)) continue; if (settings.ignoredAcls.get().count(eaName)) continue;
if (lremovexattr(path.c_str(), eaName.c_str()) == -1) if (lremovexattr(path.c_str(), eaName.c_str()) == -1)
throw SysError("removing extended attribute '%s' from '%s'", eaName, path); throw SysError("removing extended attribute '%s' from '%s'", eaName, path);
} }
if (resetMode) {
chmod(path.c_str(), st.st_mode);
resetMode = false;
}
} }
#endif #endif