From 3078cbcfd375fc684094f1c72c00c5db146b3299 Mon Sep 17 00:00:00 2001 From: Quanah Gibson-Mount Date: Wed, 3 Sep 2008 02:51:11 +0000 Subject: [PATCH] ITS#5618 --- CHANGES | 1 + servers/slapd/syncrepl.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGES b/CHANGES index 322442f6b0..890a57db73 100644 --- a/CHANGES +++ b/CHANGES @@ -9,6 +9,7 @@ OpenLDAP 2.4.12 Engineering Fixed slapd firstComponentMatch normalization (ITS#5634) Fixed slapd overlay control registration (ITS#5649) Fixed slapd socket closing on Windows (ITS#5606) + Fixed slapd syncrepl error logging (ITS#5618) Fixed slapd-ldap,slapd-meta invalid filter behavior (ITS#5614) Fixed slapd-meta quarantine behavior (ITS#5592) Fixed slapd-meta objectClass filtering (ITS#5647) 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 ); -- 2.39.5