Fixed a problem in the computing of a missing mask value.
authorWayne Davison <wayned@samba.org>
Mon, 13 Mar 2006 01:03:51 +0000 (01:03 +0000)
committerWayne Davison <wayned@samba.org>
Mon, 13 Mar 2006 01:03:51 +0000 (01:03 +0000)
acls.diff

index 498def786d6bf9e3cc63d4f1641d2d1e14821708..e1b8bbd439fa276c5223e08136f08cbfc3a514d7 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -729,7 +729,7 @@ the file that does not need any other attribute updates.
 +
 +static void receive_rsync_acl(rsync_acl *racl, int f)
 +{
-+      uchar missing_mask_bits = 0;
++      uchar computed_mask_bits = 0;
 +      ida_list *idal = NULL;
 +      id_access *ida;
 +      size_t count;
@@ -791,7 +791,7 @@ the file that does not need any other attribute updates.
 +              ida = &idal->idas[idal->count++];
 +              ida->access = access;
 +              ida->id = read_int(f);
-+              missing_mask_bits |= access;
++              computed_mask_bits |= access;
 +      }
 +
 +      /* Ensure that these are never unset. */
@@ -813,7 +813,7 @@ the file that does not need any other attribute updates.
 +      } else
 +#endif
 +      if (racl->mask == NO_ENTRY)
-+              racl->mask = missing_mask_bits | racl->other;
++              racl->mask = computed_mask_bits | racl->group_obj;
 +}
 +
 +/* receive and build the rsync_acl_lists */