[SCM] Samba Shared Repository - branch master updated

[Nadezhda Ivanova]

The branch, master has been updated
       via  0abfc90... Fixed a bug in object specific access checks.
      from  b067a5e... s3: Remove debug_ctx()

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 0abfc90ac900f77aad33a748f3ee73f3b3483f7c
Author: Nadezhda Ivanova <nadezhda.ivanova at postpath.com>
Date:   Tue Nov 3 12:27:43 2009 +0200

    Fixed a bug in object specific access checks.

-----------------------------------------------------------------------

Summary of changes:
 source4/libcli/security/access_check.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/libcli/security/access_check.c b/source4/libcli/security/access_check.c
index c974a39..fb78e0a 100644
--- a/source4/libcli/security/access_check.c
+++ b/source4/libcli/security/access_check.c
@@ -22,7 +22,6 @@
 #include "includes.h"
 #include "libcli/security/security.h"
 
-
 /*
   perform a SEC_FLAG_MAXIMUM_ALLOWED access check
 */
@@ -267,8 +266,11 @@ NTSTATUS sec_access_check_ds(const struct security_descriptor *sd,
                                 if (!(node = get_object_tree_by_GUID(tree, type)))
                                         continue;
 
-                        if (ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT){
+                        if (ace->type == SEC_ACE_TYPE_ACCESS_ALLOWED_OBJECT) {
                                 object_tree_modify_access(node, ace->access_mask);
+				if (node->remaining_access == 0) {
+					return NT_STATUS_OK;
+				}
                         }
                         else {
                                 if (node->remaining_access & ace->access_mask){


-- 
Samba Shared Repository