From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Wed, 8 Jun 2011 18:11:58 +0000 (-0700)
Subject: Revert "More for ITS#6815, Unbind and Abandon"
X-Git-Tag: OPENLDAP_REL_ENG_2_4_26~148
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f20fe5473301d8938b640fa91d1af73450517e4b;p=openldap

Revert "More for ITS#6815, Unbind and Abandon"

This reverts commit 7a66c847833406d261660e8520cae41922d12292.
---

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 538554f1a7..957738c7e2 100644
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1807,18 +1807,8 @@ accesslog_unbind( Operation *op, SlapReply *rs )
 		SlapReply rs2 = {REP_RESULT};
 		Entry *e;
 
-		if ( !( li->li_ops & LOG_OP_UNBIND )) {
-			log_base *lb;
-			int i = 0;
-
-			for ( lb = li->li_bases; lb; lb=lb->lb_next )
-				if (( lb->lb_ops & LOG_OP_UNBIND ) && dnIsSuffix( &op->o_ndn, &lb->lb_base )) {
-					i = 1;
-					break;
-				}
-			if ( !i )
-				return SLAP_CB_CONTINUE;
-		}
+		if ( !( li->li_ops & LOG_OP_UNBIND ))
+			return SLAP_CB_CONTINUE;
 
 		e = accesslog_entry( op, rs, LOG_EN_UNBIND, &op2 );
 		op2.o_hdr = op->o_hdr;
@@ -1852,22 +1842,9 @@ accesslog_abandon( Operation *op, SlapReply *rs )
 	char buf[64];
 	struct berval bv;
 
-	if ( !op->o_time )
+	if ( !op->o_time || !( li->li_ops & LOG_OP_ABANDON ))
 		return SLAP_CB_CONTINUE;
 
-	if ( !( li->li_ops & LOG_OP_ABANDON )) {
-		log_base *lb;
-		int i = 0;
-
-		for ( lb = li->li_bases; lb; lb=lb->lb_next )
-			if (( lb->lb_ops & LOG_OP_ABANDON ) && dnIsSuffix( &op->o_ndn, &lb->lb_base )) {
-				i = 1;
-				break;
-			}
-		if ( !i )
-			return SLAP_CB_CONTINUE;
-	}
-
 	e = accesslog_entry( op, rs, LOG_EN_ABANDON, &op2 );
 	bv.bv_val = buf;
 	bv.bv_len = snprintf( buf, sizeof( buf ), "%d", op->orn_msgid );