ITS#8444 Do not clear the pending operation when checkpointing

[openldap] / servers / slapd / overlays / syncprov.c

diff --git a/servers/slapd/overlays/syncprov.c b/servers/slapd/overlays/syncprov.c
index b5335692adb43613abc9aff773b6249332953774..4c2d939d456136907186ebc130dca742e2a5ed29 100644 (file)
--- a/servers/slapd/overlays/syncprov.c
+++ b/servers/slapd/overlays/syncprov.c
@@ -2,7 +2,7 @@
 /* syncprov.c - syncrepl provider */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2016 The OpenLDAP Foundation.
+ * Copyright 2004-2017 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1494,6 +1494,7 @@ syncprov_checkpoint( Operation *op, slap_overinst *on )
        opm.o_bd->bd_info = on->on_info->oi_orig;
        opm.o_managedsait = SLAP_CONTROL_NONCRITICAL;
        opm.o_no_schema_check = 1;
+       opm.o_opid = -1;
        opm.o_bd->be_modify( &opm, &rsm );
 
        if ( rsm.sr_err == LDAP_NO_SUCH_OBJECT &&
@@ -1980,6 +1981,8 @@ syncprov_op_response( Operation *op, SlapReply *rs )
                                                continue;
                                        syncprov_qresp( opc, sm->sm_op, LDAP_SYNC_DELETE );
                                }
+                               if ( opc->ssres.s_info )
+                                       free_resinfo( &opc->ssres );
                                break;
                        }
                }