back out previous two commits

diff --git a/servers/slapd/syncrepl.c b/servers/slapd/syncrepl.c
index c400741ae9b46bf4cfc370c3dfcbe251c00a9ae1..d0893a31446f6348e8ec647e372e6467d4e5076a 100644 (file)
--- a/servers/slapd/syncrepl.c
+++ b/servers/slapd/syncrepl.c
@@ -1644,7 +1644,7 @@ syncrepl_message_to_entry(
 {
        Entry           *e = NULL;
        BerElement      *ber = NULL;
-       Modifications   tmp = { 0 };
+       Modifications   tmp;
        Modifications   *mod;
        Modifications   **modtail = modlist;
 
@@ -1709,7 +1709,6 @@ syncrepl_message_to_entry(
                 */
                if ( is_ctx && !strcasecmp( tmp.sml_type.bv_val,
                        slap_schema.si_ad_contextCSN->ad_cname.bv_val )) {
-                       if ( tmp.sml_nvalues ) ber_bvarray_free( tmp.sml_nvalues );
                        ber_bvarray_free( tmp.sml_values );
                        continue;
                }