ITS#5618

diff --git a/CHANGES b/CHANGES
index 322442f6b04fad58767421d3fc24440e4009d2c7..890a57db73abf8d7d2a7cfc2b0e28406914c7cfa 100644 (file)
--- 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 7c08cb07dfbd3d190aff975031fe988c25c18ed2..4378ee9383d7880e95108fbb13a01329d1c40af3 100644 (file)
--- 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 );