From a94184e6e1c7cd776fcd150305091d7d7698e370 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 29 Nov 2011 16:31:18 -0800 Subject: [PATCH] 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 Autobuild-Date: Wed Nov 30 04:59:07 CET 2011 on sn-devel-104 (cherry picked from commit da992be64f39364fbb8bca26e9421c7a36c49ac6) --- source3/modules/vfs_acl_common.c | 2 ++ source3/smbd/nttrans.c | 2 ++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c index 4554dc8..75917b7 100644 --- a/source3/modules/vfs_acl_common.c +++ b/source3/modules/vfs_acl_common.c @@ -413,9 +413,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 81e850c..de508eb 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -1901,9 +1901,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; } -- 1.7.7.3