Fix attribute deletion

diff --git a/servers/slapd/at.c b/servers/slapd/at.c
index 715477184ded33f5dbb2528577e70d69ec98b285..4538f5b5d4c4d8f1619bf818b4b392a8916515eb 100644 (file)
--- a/servers/slapd/at.c
+++ b/servers/slapd/at.c
@@ -455,6 +455,7 @@ at_insert(
                        /* replacing a deleted definition? */
                        if ( old_sat->sat_flags & SLAP_AT_DELETED ) {
                                AttributeType tmp;
+                               AttributeDescription *ad;
                                
                                /* Keep old oid, free new oid;
                                 * Keep old ads, free new ads;
@@ -468,6 +469,14 @@ at_insert(
                                tmp.sat_ad = sat->sat_ad;
                                *sat = tmp;
 
+                               /* Check for basic ad pointing at old cname */
+                               for ( ad = old_sat->sat_ad; ad; ad=ad->ad_next ) {
+                                       if ( ad->ad_cname.bv_val == sat->sat_cname.bv_val ) {
+                                               ad->ad_cname = old_sat->sat_cname;
+                                               break;
+                                       }
+                               }
+
                                at_clean( sat );
                                at_destroy_one( air );