From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 10 Aug 2005 18:53:21 +0000 (+0000)
Subject: temporarily fix SLAPD_OVERLAY_ACCESS conflict
X-Git-Tag: OPENLDAP_AC_BP~21
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0db4013fb0780941e3d2f0098bd94749c862ca64;p=openldap

temporarily fix SLAPD_OVERLAY_ACCESS conflict
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 0a5934214c..63a3d00a98 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1380,8 +1380,13 @@ backend_group(
 
 	be_orig = op->o_bd;
 	op->o_bd = frontendDB;
+#ifdef SLAP_OVERLAY_ACCESS
 	rc = frontendDB->be_group( op, target, gr_ndn,
 		op_ndn, group_oc, group_at );
+#else /* ! SLAP_OVERLAY_ACCESS */
+	rc = fe_acl_group( op, target, gr_ndn,
+		op_ndn, group_oc, group_at );
+#endif /* ! SLAP_OVERLAY_ACCESS */
 	op->o_bd = be_orig;
 
 	return rc;
@@ -1509,8 +1514,13 @@ backend_attribute(
 
 	be_orig = op->o_bd;
 	op->o_bd = frontendDB;
+#ifdef SLAP_OVERLAY_ACCESS
 	rc = frontendDB->be_attribute( op, target, edn,
 		entry_at, vals, access );
+#else /* !SLAP_OVERLAY_ACCESS */
+	rc = fe_acl_attribute( op, target, edn,
+		entry_at, vals, access );
+#endif /* !SLAP_OVERLAY_ACCESS */
 	op->o_bd = be_orig;
 
 	return rc;