From: Howard Chu <hyc@openldap.org>
Date: Fri, 11 Dec 2009 05:52:22 +0000 (+0000)
Subject: Fix typos in prev commit
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a97fa056ee84b586feca58f97db62ed0e0036fd3;p=thirdparty%2Fopenldap.git

Fix typos in prev commit
---

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 558d10218e..698090d8ad 100644
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -1958,9 +1958,9 @@ acl_check_modlist(
 			break;
 
 		case LDAP_MOD_DELETE:
+			ak.ak_access = ( mlist->sml_flags & SLAP_MOD_MANAGING ) ? ACL_MANAGE : ACL_WDEL;
 			if ( mlist->sml_values == NULL ) {
 				ak.ak_val = NULL;
-				ak.ak_access = ( mlist->sml_flags & SLAP_MOD_MANAGING ) ? ACL_MANAGE : ACL_WDEL;
 				if ( ! access_allowed( op, &ak ))
 				{
 					ret = 0;
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 6a67f3851d..9bbab98e74 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -6041,7 +6041,7 @@ config_back_search( Operation *op, SlapReply *rs )
 	ak.ak_val = NULL;
 	ak.ak_access = ACL_SEARCH;
 	ak.ak_state = NULL;
-	if ( !access_allowed_mask( op, &ak ))
+	if ( !access_allowed( op, &ak ))
 	{
 		if ( !ACL_GRANT( ak.ak_mask, ACL_DISCLOSE )) {
 			rs->sr_err = LDAP_NO_SUCH_OBJECT;