Browse Source

lib/model: Set platform data for new folders w/ ignorePerms (ref #8883) (#8907)

* Platform data (ownership, xattrs, etc.) is now set correctly for newly-received folders, even if the received folder has the NoPermissions flag.

* Call setPlatformData on receivers that have ignorePerms set to true.
Anthony Goeckner 2 years ago
parent
commit
405cdedcd3
1 changed files with 2 additions and 2 deletions
  1. 2 2
      lib/model/folder_sendrecv.go

+ 2 - 2
lib/model/folder_sendrecv.go

@@ -622,7 +622,7 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, snap *db.Snapshot,
 		// not MkdirAll because the parent should already exist.
 		mkdir := func(path string) error {
 			err = f.mtimefs.Mkdir(path, mode)
-			if err != nil || f.IgnorePerms {
+			if err != nil {
 				return err
 			}
 
@@ -631,7 +631,7 @@ func (f *sendReceiveFolder) handleDir(file protocol.FileInfo, snap *db.Snapshot,
 				return err
 			}
 
-			if file.NoPermissions {
+			if f.IgnorePerms || file.NoPermissions {
 				return nil
 			}