ITS#5783,ITS#5795

diff --git a/CHANGES b/CHANGES
index cea5e0bf4434b0f45023275fea52b6e92e16244d..76359cdac9c24769eaef3f1a03924ad5dd504ba4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,7 @@ OpenLDAP 2.4.13 Engineering
        Fixed slapd statslog printing of released entry (ITS#5775)
        Added slapd support for certificateListExactMatch (ITS#5700)
        Fixed slapd syncrepl MOD of attrs with no EQ rule (ITS#5781)
+       Fixed slapd undef promote (ITS#5783,ITS#5795)
        Added slapd What failed? control (ITS#5784)
        Fixed slapd-bdb/hdb invalid db crash (ITS#5698)
        Added slapd-bdb/hdb dbpagesize keyword

diff --git a/servers/slapd/ad.c b/servers/slapd/ad.c
index e17aecb9e897cf1a42eef9120c3ad7eb4fd35c57..b43df86ca6dd77341e7b643b7a1511e3449370a5 100644 (file)
--- a/servers/slapd/ad.c
+++ b/servers/slapd/ad.c
@@ -817,7 +817,10 @@ undef_promote(
 
                        *u_ad = (*u_ad)->ad_next;
 
+                       tmp->ad_type = nat;
                        tmp->ad_next = NULL;
+                       /* ad_cname was contiguous, no leak here */
+                       tmp->ad_cname = nat->sat_cname;
                        *n_ad = tmp;
                        n_ad = &tmp->ad_next;
                } else {