Fix bug 8636 - When returning an ACL without SECINFO_DACL requested, we still set...

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Wed Nov 30 04:59:07 CET 2011 on sn-devel-104
(cherry picked from commit da992be64f39364fbb8bca26e9421c7a36c49ac6)
(cherry picked from commit c0ad67c1888e44be77d8f34681f12fc8b4f19f86)

diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index 4554dc82a7d89ac3b1506113393936e8b31704bd..75917b7c09e9ddaae6f8d32ebc7c8c03bceeaddd 100644 (file)
--- 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 81e850c984f8199e9686b5897909ebd46a5381fd..de508eb0cac95598380540868de0001a12aeadfa 100644 (file)
--- 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;
        }