From 41d31b2d2f7a827d6fbaea4db04c10be5175e090 Mon Sep 17 00:00:00 2001
From: Luke Howard <lukeh@openldap.org>
Date: Fri, 2 Jan 2004 02:45:39 +0000
Subject: [PATCH] Sync ACL plugin security fix with HEAD

---
 servers/slapd/acl.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 7ad1aaabff..95492f54cf 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2003 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -201,10 +201,12 @@ access_allowed(
 	}
 
 #ifdef LDAP_SLAPI
-	if ( op->o_pb && 
-		!slapi_int_access_allowed( op, e, desc, val, access, state )) {
-		/* ACL plugin denied access */
-		goto done;
+	if ( op->o_pb != NULL ) {
+		ret = slapi_int_access_allowed( op, e, desc, val, access, state );
+		if ( ret == 0 ) {
+			/* ACL plugin denied access */
+			goto done;
+		}
 	}
 #endif /* LDAP_SLAPI */
 
-- 
2.39.5