[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-4516-gfc06483
Jeremy Allison
jra at samba.org
Mon Nov 24 20:06:18 GMT 2008
The branch, v3-3-test has been updated
via fc064837fbf84726ad66b16ef6e1f8c67d47a1fe (commit)
from 61468186cece7370576a2d13992f9a523067e4be (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit fc064837fbf84726ad66b16ef6e1f8c67d47a1fe
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Nov 24 12:05:09 2008 -0800
Fix to allow setting of NULL DACL/SACL
This is a modification of Jeremy's 7522ef15aca2429ef57c75d8297dd8121e79c9da
commit.
If no DACL/SACL is present in the packet, the SEC_INFO field should still be
passed down as is to the VFS layer to signal the creation of a NULL DACL/SACL.
As seen in metze RAW-ACL test_nttrans_create_null_dacl(), a NULL DACL is set
regardless of the SEC_DESC_DACL_PRESENT bit being set.
-----------------------------------------------------------------------
Summary of changes:
source/smbd/nttrans.c | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index ecc0b6b..c08b5ee 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -727,21 +727,12 @@ static NTSTATUS set_sd(files_struct *fsp, uint8 *data, uint32 sd_len,
return status;
}
- if (psd->owner_sid==0) {
+ if (psd->owner_sid == NULL) {
security_info_sent &= ~OWNER_SECURITY_INFORMATION;
}
- if (psd->group_sid==0) {
+ if (psd->group_sid == NULL) {
security_info_sent &= ~GROUP_SECURITY_INFORMATION;
}
- if (psd->sacl==0) {
- security_info_sent &= ~SACL_SECURITY_INFORMATION;
- }
- if (security_info_sent & DACL_SECURITY_INFORMATION) {
- psd->type |= SEC_DESC_DACL_PRESENT;
- }
- if (psd->dacl==0) {
- security_info_sent &= ~DACL_SECURITY_INFORMATION;
- }
/* Convert all the generic bits. */
security_acl_map_generic(psd->dacl, &file_generic_mapping);
--
Samba Shared Repository
More information about the samba-cvs
mailing list