From: Jeremy Allison <jra@samba.org>
Date: Thu, 21 Oct 2010 00:51:13 +0000 (-0700)
Subject: Now we have SeSystemSecurity, remove the source3-only #ifdef.
X-Git-Url: http://git.samba.org/?p=abartlet%2Fsamba.git%2F.git;a=commitdiff_plain;h=94dc63056a83168c605f14a8ce47b9b75a96fa2f

Now we have SeSystemSecurity, remove the source3-only #ifdef.

Jeremy.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Oct 21 01:35:00 UTC 2010 on sn-devel-104
---

diff --git a/libcli/security/access_check.c b/libcli/security/access_check.c
index a00e42b5206..b0d4f4a1a7f 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) {