The branch, master has been updated
via da992be Fix bug 8636 - When returning an ACL without SECINFO_DACL
requested, we still set SEC_DESC_DACL_PRESENT in the type field.
from 12ce07e s4-kdc: Add hdb plugin for samba4, to allow kadmin to work
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit da992be64f39364fbb8bca26e9421c7a36c49ac6
Author: Jeremy Allison <[email protected]>
Date: Tue Nov 29 16:31:18 2011 -0800
Fix bug 8636 - When returning an ACL without SECINFO_DACL requested, we
still set SEC_DESC_DACL_PRESENT in the type field.
Autobuild-User: Jeremy Allison <[email protected]>
Autobuild-Date: Wed Nov 30 04:59:07 CET 2011 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_acl_common.c | 2 ++
source3/smbd/nttrans.c | 2 ++
2 files changed, 4 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 799de98..00ac2a1 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -426,9 +426,11 @@ static NTSTATUS get_nt_acl_internal(vfs_handle_struct
*handle,
psd->group_sid = NULL;
}
if (!(security_info & SECINFO_DACL)) {
+ psd->type &= ~SEC_DESC_DACL_PRESENT;
psd->dacl = NULL;
}
if (!(security_info & SECINFO_SACL)) {
+ psd->type &= ~SEC_DESC_SACL_PRESENT;
psd->sacl = NULL;
}
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c
index 05d42a2..ddabdda 100644
--- a/source3/smbd/nttrans.c
+++ b/source3/smbd/nttrans.c
@@ -1900,9 +1900,11 @@ NTSTATUS smbd_do_query_security_desc(connection_struct
*conn,
psd->group_sid = NULL;
}
if (!(security_info_wanted & SECINFO_DACL)) {
+ psd->type &= ~SEC_DESC_DACL_PRESENT;
psd->dacl = NULL;
}
if (!(security_info_wanted & SECINFO_SACL)) {
+ psd->type &= ~SEC_DESC_SACL_PRESENT;
psd->sacl = NULL;
}
--
Samba Shared Repository
