Changeset 596 for trunk/server/source3/smbd/nttrans.c

Timestamp:

Jul 2, 2011, 3:35:33 PM (14 years ago)

Author:

Herwig Bauernfeind

Message:

Samba 3.5: Update trunk to 3.5.8

File:

• trunk/server/source3/smbd/nttrans.c (modified) (4 diffs)

trunk/server/source3/smbd/nttrans.c

@@ -834 +834 @@
         NTSTATUS status;
 
-        if (sd_len == 0 || !lp_nt_acl_support(SNUM(fsp->conn))) {
+        if (sd_len == 0) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        if (!CAN_WRITE(fsp->conn)) {
+                return NT_STATUS_ACCESS_DENIED;
+        }
+
+        if (!lp_nt_acl_support(SNUM(fsp->conn))) {
                 return NT_STATUS_OK;
         }
@@ -851 +859 @@
         }
 
-        /* Convert all the generic bits. */
-        security_acl_map_generic(psd->dacl, &file_generic_mapping);
-        security_acl_map_generic(psd->sacl, &file_generic_mapping);
+        /* Ensure we have at least one thing set. */
+        if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
+                return NT_STATUS_INVALID_PARAMETER;
+        }
+
+        /* Ensure we have the rights to do this. */
+        if (security_info_sent & SECINFO_OWNER) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_OWNER)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+        }
+
+        if (security_info_sent & SECINFO_GROUP) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_OWNER)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+        }
+
+        if (security_info_sent & SECINFO_DACL) {
+                if (!(fsp->access_mask & SEC_STD_WRITE_DAC)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                /* Convert all the generic bits. */
+                if (psd->dacl) {
+                        security_acl_map_generic(psd->dacl, &file_generic_mapping);
+                }
+        }
+
+        if (security_info_sent & SECINFO_SACL) {
+                if (!(fsp->access_mask & SEC_FLAG_SYSTEM_SECURITY)) {
+                        return NT_STATUS_ACCESS_DENIED;
+                }
+                /* Convert all the generic bits. */
+                if (psd->sacl) {
+                        security_acl_map_generic(psd->sacl, &file_generic_mapping);
+                }
+        }
 
         if (DEBUGLEVEL >= 10) {
@@ -1796 +1838 @@
          */
 
+        if ((security_info_wanted & SECINFO_SACL) &&
+                        !(fsp->access_mask & SEC_FLAG_SYSTEM_SECURITY)) {
+                reply_nterror(req,  NT_STATUS_ACCESS_DENIED);
+                return;
+        }
+
+        if ((security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|SECINFO_GROUP)) &&
+                        !(fsp->access_mask & SEC_STD_READ_CONTROL)) {
+                reply_nterror(req, NT_STATUS_ACCESS_DENIED);
+                return;
+        }
+
         if (!lp_nt_acl_support(SNUM(conn))) {
                 status = get_null_nt_acl(talloc_tos(), &psd);
@@ -1805 +1859 @@
                 reply_nterror(req, status);
                 return;
+        }
+
+        if (!(security_info_wanted & SECINFO_OWNER)) {
+                psd->owner_sid = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_GROUP)) {
+                psd->group_sid = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_DACL)) {
+                psd->dacl = NULL;
+        }
+        if (!(security_info_wanted & SECINFO_SACL)) {
+                psd->sacl = NULL;
         }