From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 31 Jan 2005 00:14:00 +0000 (+0000)
Subject: make frontend-generated attrs available to backend's hook
X-Git-Tag: OPENLDAP_REL_ENG_2_3_BP~204
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d503b5a5b706694e9485c71e71c666dfe64581d5;p=openldap

make frontend-generated attrs available to backend's hook
---

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 546b74984d..daaf245439 100644
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -1809,18 +1809,7 @@ int backend_operational(
 	if (( SLAP_OPATTRS( rs->sr_attr_flags ) || rs->sr_attrs ) &&
 		op->o_bd && op->o_bd->be_operational != NULL )
 	{
-		Attribute	*a;
-		
-		a = rs->sr_operational_attrs;
-		rs->sr_operational_attrs = NULL;
 		rc = op->o_bd->be_operational( op, rs );
-		*ap = rs->sr_operational_attrs;
-		if ( a != NULL ) {
-			rs->sr_operational_attrs = a;
-		}
-
-		for ( ; *ap; ap = &(*ap)->a_next )
-			/* just count them */ ;
 	}
 	op->o_bd = be_orig;
 
diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 10aeea9736..00227172c6 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -1033,9 +1033,11 @@ rwm_send_entry( Operation *op, SlapReply *rs )
 	 * to return, and remap them accordingly */
 	(void)rwm_attrs( op, rs, &e->e_attrs, 1 );
 
+#if 0
 	if ( rs->sr_operational_attrs ) {
 		(void)rwm_attrs( op, rs, &rs->sr_operational_attrs, 0 );
 	}
+#endif
 
 	rs->sr_entry = e;
 	rs->sr_flags = flags;