The branch, master has been updated
via e99a18c Remove extraneous debug code.
via 893497ee Fix bug #8458] - IE9 on Windows 7 cannot download files to
samba 3.5.11 share
from d89bbe9 Fix bug #8474 - SMB2 create doesn't cope with an Apple
client using NULL blob in create
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e99a18cdc0e10c6d96221764e4035384ce35ac69
Author: Jeremy Allison <[email protected]>
Date: Wed Sep 21 13:47:22 2011 -0700
Remove extraneous debug code.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Thu Sep 22 00:22:12 CEST 2011 on sn-devel-104
commit 893497ee169ba5455cd70458a339e60544e171d7
Author: Jeremy Allison <[email protected]>
Date: Wed Sep 21 13:33:38 2011 -0700
Fix bug #8458] - IE9 on Windows 7 cannot download files to samba 3.5.11
share
Handle the SECINFO_LABEL flag in the same was as Win2k3.
-----------------------------------------------------------------------
Summary of changes:
libcli/smb/smb2_create_blob.c | 3 ---
librpc/idl/security.idl | 1 +
source3/smbd/nttrans.c | 25 +++++++++++++++++++++++++
3 files changed, 26 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/smb/smb2_create_blob.c b/libcli/smb/smb2_create_blob.c
index b44f28a..31c67e9 100644
--- a/libcli/smb/smb2_create_blob.c
+++ b/libcli/smb/smb2_create_blob.c
@@ -89,9 +89,6 @@ NTSTATUS smb2_create_blob_parse(TALLOC_CTX *mem_ctx, const
DATA_BLOB buffer,
data += next;
if (remaining < 16) {
- DEBUG(0,("smb2_create_blob_parse: remaining1 = %d, next
= %d\n",
- (int)remaining,
- (int)next));
return NT_STATUS_INVALID_PARAMETER;
}
}
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index 2b6efc5..5973fc5 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -600,6 +600,7 @@ interface security
SECINFO_GROUP = 0x00000002,
SECINFO_DACL = 0x00000004,
SECINFO_SACL = 0x00000008,
+ SECINFO_LABEL = 0x00000010,
SECINFO_UNPROTECTED_SACL = 0x10000000,
SECINFO_UNPROTECTED_DACL = 0x20000000,
SECINFO_PROTECTED_SACL = 0x40000000,
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 8900ec8..d24dd1e 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -868,6 +868,12 @@ NTSTATUS set_sd(files_struct *fsp, uint8_t *data, uint32_t
sd_len,
/* 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;
}
@@ -1868,8 +1874,18 @@ NTSTATUS smbd_do_query_security_desc(connection_struct
*conn,
return NT_STATUS_ACCESS_DENIED;
}
+ 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(mem_ctx, &psd);
+ } else if (security_info_wanted & SECINFO_LABEL) {
+ /* Like W2K3 return a null object. */
+ status = get_null_nt_acl(mem_ctx, &psd);
} else {
status = SMB_VFS_FGET_NT_ACL(
fsp, security_info_wanted, &psd);
@@ -1900,6 +1916,15 @@ NTSTATUS smbd_do_query_security_desc(connection_struct
*conn,
security_info_wanted & SECINFO_DACL)
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);
+ }
+
*psd_size = ndr_size_security_descriptor(psd, 0);
DEBUG(3,("smbd_do_query_security_desc: sd_size = %lu.\n",
--
Samba Shared Repository
