Changeset 732 for branches/samba-3.5.x/source3/smbd/nttrans.c

Timestamp:

Nov 12, 2012, 4:35:55 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.12

File:

• branches/samba-3.5.x/source3/smbd/nttrans.c (modified) (3 diffs)

branches/samba-3.5.x/source3/smbd/nttrans.c

@@ -861 +861 @@
         /* Ensure we have at least one thing set. */
         if ((security_info_sent & (SECINFO_OWNER|SECINFO_GROUP|SECINFO_DACL|SECINFO_SACL)) == 0) {
+                if (security_info_sent & SECINFO_LABEL) {
+                        /* Only consider SECINFO_LABEL if no other
+                           bits are set. Just like W2K3 we don't
+                           store this. */
+                        return NT_STATUS_OK;
+                }
                 return NT_STATUS_INVALID_PARAMETER;
         }
@@ -1850 +1856 @@
         }
 
+        if (security_info_wanted & (SECINFO_DACL|SECINFO_OWNER|
+                        SECINFO_GROUP|SECINFO_SACL)) {
+                /* Don't return SECINFO_LABEL if anything else was
+                   requested. See bug #8458. */
+                security_info_wanted &= ~SECINFO_LABEL;
+        }
+
         if (!lp_nt_acl_support(SNUM(conn))) {
+                status = get_null_nt_acl(talloc_tos(), &psd);
+        } else if (security_info_wanted & SECINFO_LABEL) {
+                /* Like W2K3 return a null object. */
                 status = get_null_nt_acl(talloc_tos(), &psd);
         } else {
@@ -1882 +1898 @@
             security_info_wanted & DACL_SECURITY_INFORMATION)
                 psd->type |= SEC_DESC_DACL_PRESENT;
+
+        if (security_info_wanted & SECINFO_LABEL) {
+                /* Like W2K3 return a null object. */
+                psd->owner_sid = NULL;
+                psd->group_sid = NULL;
+                psd->dacl = NULL;
+                psd->sacl = NULL;
+                psd->type &= ~(SEC_DESC_DACL_PRESENT|SEC_DESC_SACL_PRESENT);
+        }
 
         sd_size = ndr_size_security_descriptor(psd, NULL, 0);