From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 12 Dec 2005 14:33:34 +0000 (+0000)
Subject: minor cleanup
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~608
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=361a97108bd1b1b7eca4a36d1802eebd7c7ddac3;p=openldap

minor cleanup
---

diff --git a/servers/slapd/back-meta/search.c b/servers/slapd/back-meta/search.c
index f1f8bc2d97..b64c92d935 100644
--- a/servers/slapd/back-meta/search.c
+++ b/servers/slapd/back-meta/search.c
@@ -566,13 +566,22 @@ really_bad:;
 					candidates[ i ].sr_type = REP_RESULT;
 				}
 
+				/* NOTE: ignores response controls
+				 * (and intermediate response controls
+				 * as well, except for those with search
+				 * references); this may not be correct,
+				 * but if they're not ignored then
+				 * back-meta would need to merge them
+				 * consistently (think of pagedResults...)
+				 */
 				if ( ldap_parse_result( msc->msc_ld,
 							res,
 							&candidates[ i ].sr_err,
 							(char **)&candidates[ i ].sr_matched,
 							NULL /* (char **)&candidates[ i ].sr_text */ ,
 							&references,
-							&candidates[ i ].sr_ctrls, 1 ) != LDAP_SUCCESS )
+							NULL /* &candidates[ i ].sr_ctrls (unused) */ ,
+							1 ) != LDAP_SUCCESS )
 				{
 					res = NULL;
 					ldap_get_option( msc->msc_ld,
diff --git a/servers/slapd/back-meta/unbind.c b/servers/slapd/back-meta/unbind.c
index ed98015e57..c9aea2de99 100644
--- a/servers/slapd/back-meta/unbind.c
+++ b/servers/slapd/back-meta/unbind.c
@@ -44,8 +44,9 @@ meta_back_conn_destroy(
 
 
 	Debug( LDAP_DEBUG_TRACE,
-		"=>meta_back_conn_destroy: fetching conn %ld\n",
-		conn->c_connid, 0, 0 );
+		"=>meta_back_conn_destroy: fetching conn=%ld DN=\"%s\"\n",
+		conn->c_connid,
+		BER_BVISNULL( &conn->c_ndn ) ? "" : conn->c_ndn.bv_val, 0 );
 	
 	mc_curr.mc_conn = conn;
 	mc_curr.mc_local_ndn = conn->c_ndn;