More ldapbis cleanup

[openldap] / servers / slapd / back-ldap / bind.c

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index 92018cf82370fb4a0af707cc9c689d0c765b7472..92cb4ea8c185b34ec9c80000d09e1f1c41e132a8 100644 (file)
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -1342,7 +1342,7 @@ ldap_back_cancel(
        }
 
        if ( LDAP_BACK_IGNORE( li ) ) {
-               return LDAP_SUCCESS;
+               return ldap_int_discard( lc->lc_ld, msgid );
        }
 
        if ( LDAP_BACK_CANCEL( li ) ) {
@@ -1462,7 +1462,7 @@ retry:;
                 * LDAP_COMPARE_{TRUE|FALSE}) */
                default:
                        /* only touch when activity actually took place... */
-                       if ( li->li_idle_timeout && lc ) {
+                       if ( li->li_idle_timeout ) {
                                lc->lc_time = op->o_time;
                        }