equal
deleted
inserted
replaced
|
1 7011577 Impossible to rename a file on a ZFS filesystem when installing 146364-01 (Samba 3.5.5) |
|
2 Fix bug #7909 - map SYNCHRONIZE acl permission statically in zfs_acl vfs module. |
|
3 |
1 diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c |
4 diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c |
2 index 1913946..e2f9fe3 100644 |
5 index 1913946..e2f9fe3 100644 |
3 --- source3/modules/nfs4_acls.c |
6 --- a/source3/modules/nfs4_acls.c |
4 +++ source3/modules/nfs4_acls.c |
7 +++ b/source3/modules/nfs4_acls.c |
5 @@ -280,7 +280,9 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */ |
8 @@ -280,7 +280,9 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */ |
6 DEBUG(10, ("mapped ace flags: 0x%x => 0x%x\n", |
9 DEBUG(10, ("mapped ace flags: 0x%x => 0x%x\n", |
7 ace->aceFlags, mapped_ace_flags)); |
10 ace->aceFlags, mapped_ace_flags)); |
8 |
11 |
9 - mask = ace->aceMask; |
12 - mask = ace->aceMask; |
13 init_sec_ace(&nt_ace_list[good_aces++], &sid, |
16 init_sec_ace(&nt_ace_list[good_aces++], &sid, |
14 ace->aceType, mask, |
17 ace->aceType, mask, |
15 mapped_ace_flags); |
18 mapped_ace_flags); |
16 diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c |
19 diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c |
17 index 98c9bcf..8a2c378 100644 |
20 index 98c9bcf..8a2c378 100644 |
18 --- source3/modules/vfs_zfsacl.c |
21 --- a/source3/modules/vfs_zfsacl.c |
19 +++ source3/modules/vfs_zfsacl.c |
22 +++ b/source3/modules/vfs_zfsacl.c |
20 @@ -124,6 +124,9 @@ static bool zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) |
23 @@ -124,6 +124,9 @@ static bool zfs_process_smbacl(files_struct *fsp, SMB4ACL_T *smbacl) |
21 acebuf[i].a_type = aceprop->aceType; |
24 acebuf[i].a_type = aceprop->aceType; |
22 acebuf[i].a_flags = aceprop->aceFlags; |
25 acebuf[i].a_flags = aceprop->aceFlags; |
23 acebuf[i].a_access_mask = aceprop->aceMask; |
26 acebuf[i].a_access_mask = aceprop->aceMask; |
24 + /* SYNC on acls is a no-op on ZFS. |
27 + /* SYNC on acls is a no-op on ZFS. |