From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 27 Apr 2004 11:23:40 +0000 (+0000)
Subject: import fixes from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_2_12~26
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=48f906721de70f9ca70e4875333e85bd452ce1d8;p=openldap

import fixes from HEAD
---

diff --git a/servers/slapd/saslauthz.c b/servers/slapd/saslauthz.c
index 912ede87b1..e08cdd9bd6 100644
--- a/servers/slapd/saslauthz.c
+++ b/servers/slapd/saslauthz.c
@@ -753,6 +753,7 @@ exact_match:
 	op.o_req_dn = op.o_req_ndn;
 	op.oq_search.rs_slimit = 1;
 	op.oq_search.rs_tlimit = -1;
+	op.o_sync_slog_size = -1;
 
 	op.o_bd->be_search( &op, &rs );
 
@@ -763,10 +764,10 @@ exact_match:
 	}
 
 CONCLUDED:
-	if( op.o_req_dn.bv_len ) ch_free( op.o_req_dn.bv_val );
-	if( op.o_req_ndn.bv_len ) sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx );
+	if( op.o_req_dn.bv_val && op.o_req_dn.bv_val != op.o_req_ndn.bv_val ) ch_free( op.o_req_dn.bv_val );
+	if( op.o_req_ndn.bv_val ) sl_free( op.o_req_ndn.bv_val, opx->o_tmpmemctx );
 	if( op.oq_search.rs_filter ) filter_free_x( opx, op.oq_search.rs_filter );
-	if( op.ors_filterstr.bv_len ) ch_free( op.ors_filterstr.bv_val );
+	if( op.ors_filterstr.bv_val ) ch_free( op.ors_filterstr.bv_val );
 
 #ifdef NEW_LOGGING
 	LDAP_LOG( TRANSPORT, ENTRY,