Changeset 620 for trunk/server/source3/smbd/open.c

Timestamp:

Aug 6, 2011, 6:50:53 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.11

File:

• trunk/server/source3/smbd/open.c (modified) (2 diffs)

trunk/server/source3/smbd/open.c

@@ -86 +86 @@
         NTSTATUS status;
         struct security_descriptor *sd = NULL;
+
+        if ((access_mask & DELETE_ACCESS) && !lp_acl_check_permissions(SNUM(conn))) {
+                *access_granted = access_mask;
+
+                DEBUG(10,("smbd_check_open_rights: not checking ACL "
+                        "on DELETE_ACCESS on file %s. Granting 0x%x\n",
+                        smb_fname_str_dbg(smb_fname),
+                        (unsigned int)*access_granted ));
+                return NT_STATUS_OK;
+        }
 
         status = SMB_VFS_GET_NT_ACL(conn, smb_fname->base_name,
@@ -2968 +2978 @@
         /* Setting FILE_SHARE_DELETE is the hint. */
 
-        if (lp_acl_check_permissions(SNUM(conn))
-            && (create_disposition != FILE_CREATE)
+        if ((create_disposition != FILE_CREATE)
             && (access_mask & DELETE_ACCESS)
             && (!(can_delete_file_in_directory(conn, smb_fname) ||