From: Howard Chu <hyc@openldap.org>
Date: Sat, 9 Aug 2008 13:15:54 +0000 (+0000)
Subject: ITS#5618 log Search result errors, force Deref to Never
X-Git-Tag: LOCKER_IDS~3
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d4216935d767c4f738fb2879592c72408963fcbd;p=openldap

ITS#5618 log Search result errors, force Deref to Never
---

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index 7c08cb07df..4378ee9383 100644
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -579,6 +579,9 @@ do_syncrep1(
 
 	ldap_set_option( si->si_ld, LDAP_OPT_TIMELIMIT, &si->si_tlimit );
 
+	rc = LDAP_DEREF_NEVER;	/* actually could allow DEREF_FINDING */
+	ldap_set_option( si->si_ld, LDAP_OPT_DEREF, &rc );
+
 	si->si_syncCookie.rid = si->si_rid;
 
 	/* whenever there are multiple data sources possible, advertise sid */
@@ -911,6 +914,11 @@ do_syncrep2(
 				rc = err;
 				goto done;
 			}
+			if ( err ) {
+				Debug( LDAP_DEBUG_ANY,
+					"do_syncrep2: %s LDAP_RES_SEARCH_RESULT (%d) %s\n",
+					si->si_ridtxt, err, ldap_err2string( err ) );
+			}
 			if ( rctrls ) {
 				rctrlp = *rctrls;
 				ber_init2( ber, &rctrlp->ldctl_value, LBER_USE_DER );