[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  94dc630 Now we have SeSystemSecurity, remove the source3-only #ifdef.
      from  e00c2b3 Add code to implement SeSecurityPrivilege in net rpc rights, and in the open and get/set NT security descriptor code.

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


- Log -----------------------------------------------------------------
commit 94dc63056a83168c605f14a8ce47b9b75a96fa2f
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Oct 20 17:51:13 2010 -0700

    Now we have SeSystemSecurity, remove the source3-only #ifdef.
    
    Jeremy.
    
    Autobuild-User: Jeremy Allison <jra at samba.org>
    Autobuild-Date: Thu Oct 21 01:35:00 UTC 2010 on sn-devel-104

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

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


Changeset truncated at 500 lines:

diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index a00e42b..b0d4f4a 100644
--- a/libcli/security/access_check.c
+++ b/libcli/security/access_check.c
@@ -179,7 +179,6 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
 			bits_remaining));
 	}
 
-#if (_SAMBA_BUILD_ >= 4)
 	/* s3 had this with #if 0 previously. To be sure the merge
 	   doesn't change any behaviour, we have the above #if check
 	   on _SAMBA_BUILD_. */
@@ -190,7 +189,6 @@ NTSTATUS se_access_check(const struct security_descriptor *sd,
 			return NT_STATUS_PRIVILEGE_NOT_HELD;
 		}
 	}
-#endif
 
 	/* a NULL dacl allows access */
 	if ((sd->type & SEC_DESC_DACL_PRESENT) && sd->dacl == NULL) {


-- 
Samba Shared Repository