Changeset 233 for branches/samba-3.2.x/source/modules/nfs4_acls.c

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

File:

• branches/samba-3.2.x/source/modules/nfs4_acls.c (modified) (3 diffs)

branches/samba-3.2.x/source/modules/nfs4_acls.c

@@ -204 +204 @@
         DOM_SID *psid_owner, /* in */
         DOM_SID *psid_group, /* in */
+        bool is_directory, /* in */
         SEC_ACE **ppnt_ace_list, /* out */
         int *pgood_aces /* out */
@@ -262 +263 @@
                            sid_string_dbg(&sid)));
 
+                if (is_directory && (ace->aceMask & SMB_ACE4_ADD_FILE)) {
+                        ace->aceMask |= SMB_ACE4_DELETE_CHILD;
+                }
                 init_sec_access(&mask, ace->aceMask);
                 init_sec_ace(&nt_ace_list[good_aces++], &sid,
@@ -293 +297 @@
         gid_to_sid(&sid_group, sbuf->st_gid);
 
-        if (smbacl4_nfs42win(mem_ctx, acl, &sid_owner, &sid_group, &nt_ace_list, &good_aces)==False) {
+        if (smbacl4_nfs42win(mem_ctx, acl, &sid_owner, &sid_group, S_ISDIR(sbuf->st_mode),
+                                &nt_ace_list, &good_aces)==False) {
                 DEBUG(8,("smbacl4_nfs42win failed\n"));
                 return map_nt_error_from_unix(errno);