From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 12 Mar 2003 23:27:57 +0000 (+0000)
Subject: ITS#2363 fix from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_1_16~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=592987640eb329f9891e4f54c28a7db40c5a2820;p=openldap

ITS#2363 fix from HEAD
---

diff --git a/servers/slapd/back-ldap/modify.c b/servers/slapd/back-ldap/modify.c
index 5cb19e5175..a4de75e38c 100644
--- a/servers/slapd/back-ldap/modify.c
+++ b/servers/slapd/back-ldap/modify.c
@@ -159,15 +159,12 @@ ldap_back_modify(
 	ldap_modify_s( lc->ld, mdn.bv_val, modv );
 
 cleanup:;
-#ifdef ENABLE_REWRITE
 	if ( mdn.bv_val != dn->bv_val ) {
-#endif /* ENABLE_REWRITE */
 		free( mdn.bv_val );
-#ifdef ENABLE_REWRITE
 	}
-#endif /* ENABLE_REWRITE */
-	for (i=0; modv[i]; i++)
+	for (i=0; modv[i]; i++) {
 		ch_free(modv[i]->mod_bvalues);
+	}
 	ch_free(mods);
 	ch_free(modv);
 	return( ldap_back_op_result( lc, op ));
diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index 41b397a9da..e88503cc92 100644
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -76,10 +76,8 @@ ldap_back_search(
 	char *match = NULL, *err = NULL;
 	char *mapped_filter = NULL, **mapped_attrs = NULL;
 	struct berval mbase;
-#ifdef ENABLE_REWRITE
 	char *mmatch = NULL;
 	struct berval mfilter = { 0, NULL };
-#endif /* ENABLE_REWRITE */
 	struct slap_limits_set *limit = NULL;
 	int isroot = 0;
 	BerVarray v2refs = NULL;
@@ -389,20 +387,26 @@ fail:;
 		mmatch, err, v2refs, NULL, count );
 
 #else /* !ENABLE_REWRITE */
+	if ( match != NULL ) {
+		struct berval dn, mdn;
+
+		ber_str2bv(match, 0, 0, &dn);
+		ldap_back_dn_massage(li, &dn, &mdn, 0, 0);
+		mmatch = mdn.bv_val;
+	}
+
 	if ( v2refs ) {
 		sres = LDAP_REFERRAL;
 	}
 	send_search_result( conn, op, sres,
-		match, err, v2refs, NULL, count );
+		mmatch, err, v2refs, NULL, count );
 #endif /* !ENABLE_REWRITE */
 
 finish:;
 	if ( match ) {
-#ifdef ENABLE_REWRITE
 		if ( mmatch != match ) {
 			free( mmatch );
 		}
-#endif /* ENABLE_REWRITE */
 		LDAP_FREE(match);
 	}
 	if ( err ) {
@@ -613,6 +617,9 @@ ldap_send_entry(
 				}
 #else /* !ENABLE_REWRITE */
 				ldap_back_dn_massage( li, bv, &newval, 0, 0 );
+				if ( bv->bv_val != newval.bv_val ) {
+					LBER_FREE( bv->bv_val );
+				}
 				*bv = newval;
 #endif /* !ENABLE_REWRITE */
 			}