From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 27 Mar 2006 00:31:38 +0000 (+0000)
Subject: cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~104
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0a465343fb6d6d8df9091699885bf352c3b1d4b3;p=openldap

cleanup
---

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index 399278f9a0..a2051d912c 100644
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -340,7 +340,7 @@ static int
 ldap_chain_op(
 	Operation	*op,
 	SlapReply	*rs,
-	int		( *op_f )( Operation *op, SlapReply *rs ), 
+	BI_op_func	*op_f,
 	BerVarray	ref )
 {
 	slap_overinst	*on = (slap_overinst *) op->o_bd->bd_info;
@@ -446,7 +446,7 @@ Document: draft-ietf-ldapbis-protocol-27.txt
 			}
 		}
 
-		rc = ( *op_f )( op, rs );
+		rc = op_f( op, rs );
 
 cleanup:;
 		ldap_memfree( li.li_uri );
@@ -751,7 +751,7 @@ cleanup:;
 		/* FIXME: ldap_back_extended() by design 
 		 * doesn't send result; frontend is expected
 		 * to send it... */
-		/* FIXME: what aboit chaining? */
+		/* FIXME: what about chaining? */
 		if ( rc != SLAPD_ABANDON ) {
 			send_ldap_extended( op, rs );
 			rc = LDAP_SUCCESS;
@@ -771,9 +771,11 @@ cleanup:;
 	case LDAP_SUCCESS:
 	case LDAP_REFERRAL:
 		/* slapd-ldap sent response */
-		if ( !op->o_abandon ) {
+		if ( !op->o_abandon && sc2.sc_private != LDAP_CH_RES ) {
 			/* FIXME: should we send response? */
-			Debug( LDAP_DEBUG_ANY, "%s: ldap_chain_response: overlay should have sent result.\n",
+			Debug( LDAP_DEBUG_ANY,
+				"%s: ldap_chain_response: "
+				"overlay should have sent result.\n",
 				op->o_log_prefix, 0, 0 );
 		}
 		break;