Index: servers/slapd/back-bdb/search.c
===================================================================
RCS file: /repo/OpenLDAP/pkg/ldap/servers/slapd/back-bdb/search.c,v
retrieving revision 1.236
diff -u -2 -r1.236 search.c
--- servers/slapd/back-bdb/search.c	27 Jul 2005 07:34:05 -0000	1.236
+++ servers/slapd/back-bdb/search.c	27 Jul 2005 11:31:57 -0000
@@ -376,5 +376,5 @@
 	case LDAP_BUSY:
 		send_ldap_error( op, rs, LDAP_BUSY, "ldap server busy" );
-		if ( !opinfo )
+		if ( !ltid )
 			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		return LDAP_BUSY;
@@ -384,5 +384,5 @@
 	default:
 		send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-		if ( !opinfo )
+		if ( !ltid )
 			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		return rs->sr_err;
@@ -446,5 +446,5 @@
 		send_ldap_result( op, rs );
 
-		if ( !opinfo )
+		if ( !ltid )
 			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		if ( rs->sr_ref ) {
@@ -478,4 +478,6 @@
 		}
 		send_ldap_result( op, rs );
+		if ( !ltid )
+			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		return 1;
 	}
@@ -515,5 +517,5 @@
 		send_ldap_result( op, rs );
 
-		if ( !opinfo ) {
+		if ( !ltid ) {
 			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		}
@@ -536,4 +538,6 @@
 		}
 		send_ldap_result( op, rs );
+		if ( !ltid )
+			LOCK_ID_FREE (bdb->bi_dbenv, locker );
 		return 1;
 	}
@@ -921,5 +925,5 @@
 
 done:
-	if ( !opinfo )
+	if ( !ltid )
 		LOCK_ID_FREE( bdb->bi_dbenv, locker );